Merge pull request #177 from iot-dsa-v2/develop

0.73.2

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.73.1'
+    version '0.73.2'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

dslink-v2-api/src/main/java/org/iot/dsa/node/DSStatus.java

@@ -43,13 +43,14 @@
 public class DSStatus extends DSValue implements DSIStatus, DSIStorable {
 
     ///////////////////////////////////////////////////////////////////////////
-    // Constants
+    // Class Fields
     ///////////////////////////////////////////////////////////////////////////
 
     private static final int UNCERTAIN_MASK = 0x0000FF00;
     private static final int BAD_MASK = 0x00FF0000;
     private static final int HIS_MASK = 0xFF000000; //for history flags
     private static final int NOT_GOOD_MASK = 0x00FFFF00;
+
     /**
      * Good, no other status applies. Always implied when not present.
      */
@@ -155,11 +156,13 @@ public class DSStatus extends DSValue implements DSIStatus, DSIStorable {
     public static final DSStatus remoteUnknown = valueOf(REMOTE_UNKNOWN);
     public static final DSStatus start = valueOf(START);
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
     private static ConcurrentHashMap<String, Integer> stringCache =
             new ConcurrentHashMap<>();
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Instance Fields
+    ///////////////////////////////////////////////////////////////////////////
+
     private int bits;
 
     ///////////////////////////////////////////////////////////////////////////

dslink-v2-api/src/main/java/org/iot/dsa/security/DSKeys.java

@@ -97,7 +97,7 @@ public static DSKeys decodeKeys(String arg) {
      */
     public static ECPrivateKey decodePrivate(byte[] bytes) {
         try {
-            BigInteger s = new BigInteger(bytes);
+            BigInteger s = new BigInteger(1, bytes);
             ECPrivateKeySpec spec = new ECPrivateKeySpec(s, getParameters());
             KeyFactory fac = KeyFactory.getInstance("EC");
             return (ECPrivateKey) fac.generatePrivate(spec);
@@ -115,8 +115,8 @@ public static ECPublicKey decodePublic(byte[] bytes) {
             if (bytes[0] != 0x04) {
                 throw new IllegalArgumentException("Invalid public key");
             }
-            BigInteger x = new BigInteger(Arrays.copyOfRange(bytes, 1, 33));
-            BigInteger y = new BigInteger(Arrays.copyOfRange(bytes, 33, 65));
+            BigInteger x = new BigInteger(1, Arrays.copyOfRange(bytes, 1, 33));
+            BigInteger y = new BigInteger(1, Arrays.copyOfRange(bytes, 33, 65));
             ECPoint point = new ECPoint(x, y);
             ECPublicKeySpec spec = new ECPublicKeySpec(point, getParameters());
             KeyFactory fac = KeyFactory.getInstance("EC");