Redo Mscng key storage.

1 files changed, 17 insertions, 2 deletions

diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java
index 76786fe..4cd4a9d 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java
+++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java
@@ -86,23 +86,38 @@ public abstract class NativeECPrivateKey implements ECPrivateKey {
     }
 
     public static class Mscng extends Raw {
+        // 0 -> implicit (meta = curveName UTF16, header = full);
+        // 1 -> explicit (meta = null, header = full);
+        // 2 -> nist (meta = null, header = full)
+        private int flag;
+        private byte[] meta = null;
         private byte[] header;
         private byte[] x;
         private byte[] y;
 
-        public Mscng(byte[] header, byte[] x, byte[] y, byte[] keyData, ECParameterSpec params) {
+        public Mscng(int flag, byte[] meta, byte[] header, byte[] x, byte[] y, byte[] keyData, ECParameterSpec params) {
             super(keyData, params);
+            this.flag = flag;
+            this.meta = Arrays.clone(meta);
             this.header = Arrays.clone(header);
             this.x = Arrays.clone(x);
             this.y = Arrays.clone(y);
         }
 
+        public int getFlag() {
+            return flag;
+        }
+
+        public byte[] getMeta() {
+            return Arrays.clone(meta);
+        }
+
         public byte[] getHeader() {
             return Arrays.clone(header);
         }
 
         public byte[] getBlob() {
-			return ByteUtil.concatenate(header, x, y, keyData);
+            return ByteUtil.concatenate(header, x, y, keyData);
         }
 
         @Override