Merge branch 'devel'v0.2.0

1 files changed, 56 insertions, 13 deletions

diff --git a/src/cz/crcs/ectester/reader/ec/EC_Params.java b/src/cz/crcs/ectester/common/ec/EC_Params.java
index 6fb164b..1c066e7 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Params.java
+++ b/src/cz/crcs/ectester/common/ec/EC_Params.java
@@ -1,7 +1,7 @@
-package cz.crcs.ectester.reader.ec;
+package cz.crcs.ectester.common.ec;
 
 import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.reader.Util;
+import cz.crcs.ectester.common.util.ByteUtil;
 
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
@@ -44,6 +44,49 @@ public class EC_Params extends EC_Data {
         return params;
     }
 
+    public byte[][] getParam(short param) {
+        if (!hasParam(param)) {
+            return null;
+        }
+        if (Integer.bitCount(param) != 1) {
+            return null;
+        }
+        short paramMask = EC_Consts.PARAMETER_FP;
+        byte[][] result = null;
+        int i = 0;
+        while (paramMask <= EC_Consts.PARAMETER_S) {
+            short masked = (short) (this.params & param & paramMask);
+            short shallow = (short) (this.params & paramMask);
+            if (masked != 0) {
+                if (masked == EC_Consts.PARAMETER_F2M) {
+                    result = new byte[4][];
+                    result[0] = data[i].clone();
+                    result[1] = data[i+1].clone();
+                    result[2] = data[i+2].clone();
+                    result[3] = data[i+3].clone();
+                    break;
+                }
+                if (masked == EC_Consts.PARAMETER_G || masked == EC_Consts.PARAMETER_W) {
+                    result = new byte[2][];
+                    result[0] = data[i].clone();
+                    result[1] = data[i+1].clone();
+                    break;
+                }
+                result = new byte[1][];
+                result[0] = data[i].clone();
+            }
+            if (shallow == EC_Consts.PARAMETER_F2M) {
+                i += 4;
+            } else if (shallow == EC_Consts.PARAMETER_G || shallow == EC_Consts.PARAMETER_W) {
+                i += 2;
+            } else if (shallow != 0) {
+                i++;
+            }
+            paramMask = (short) (paramMask << 1);
+        }
+        return result;
+    }
+
     public boolean hasParam(short param) {
         return (params & param) != 0;
     }
@@ -82,12 +125,12 @@ public class EC_Params extends EC_Data {
                 byte[] param = data[i];
                 if (masked == EC_Consts.PARAMETER_F2M) {
                     //add m, e_1, e_2, e_3
-                    param = Util.concatenate(param, data[i + 1]);
-                    if (!Util.allValue(data[i + 2], (byte) 0)) {
-                        param = Util.concatenate(param, data[i + 2]);
+                    param = ByteUtil.concatenate(param, data[i + 1]);
+                    if (!ByteUtil.allValue(data[i + 2], (byte) 0)) {
+                        param = ByteUtil.concatenate(param, data[i + 2]);
                     }
-                    if (!Util.allValue(data[i + 3], (byte) 0)) {
-                        param = Util.concatenate(param, data[i + 3]);
+                    if (!ByteUtil.allValue(data[i + 3], (byte) 0)) {
+                        param = ByteUtil.concatenate(param, data[i + 3]);
                     }
                     if (!(param.length == 4 || param.length == 8))
                         throw new RuntimeException("PARAMETER_F2M length is not 8.(should be)");
@@ -95,14 +138,14 @@ public class EC_Params extends EC_Data {
                 if (masked == EC_Consts.PARAMETER_G || masked == EC_Consts.PARAMETER_W) {
                     //read another param (the y coord) and put into X962 format.
                     byte[] y = data[i + 1];
-                    param = Util.concatenate(new byte[]{4}, param, y); //<- ugly but works!
+                    param = ByteUtil.concatenate(new byte[]{4}, param, y); //<- ugly but works!
                 }
                 if (param.length == 0)
                     throw new RuntimeException("Empty parameter read?");
 
                 //write length
                 byte[] length = new byte[2];
-                Util.setShort(length, 0, (short) param.length);
+                ByteUtil.setShort(length, 0, (short) param.length);
                 out.write(length, 0, 2);
                 //write data
                 out.write(param, 0, param.length);
@@ -132,15 +175,15 @@ public class EC_Params extends EC_Data {
                 byte[] param = data[index];
                 if (masked == EC_Consts.PARAMETER_F2M) {
                     for (int i = 0; i < 4; ++i) {
-                        out.add(Util.bytesToHex(data[index + i], false));
+                        out.add(ByteUtil.bytesToHex(data[index + i], false));
                     }
                     index += 4;
                 } else if (masked == EC_Consts.PARAMETER_G || masked == EC_Consts.PARAMETER_W) {
-                    out.add(Util.bytesToHex(param, false));
-                    out.add(Util.bytesToHex(data[index + 1], false));
+                    out.add(ByteUtil.bytesToHex(param, false));
+                    out.add(ByteUtil.bytesToHex(data[index + 1], false));
                     index += 2;
                 } else {
-                    out.add(Util.bytesToHex(param, false));
+                    out.add(ByteUtil.bytesToHex(param, false));
                     index++;
                 }
             }