Added explicit test for signing key-pair generation.

Author: ianopolous

Makefile

@@ -31,7 +31,7 @@ jni: compile
 	javah -jni -classpath build -d jni org.peergos.crypto.JniTweetNacl
 	gcc -Wimplicit-function-declaration -fPIC -std=c11 -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -Inative -Ijni -shared -o libtweetnacl.so jni/org_peergos_crypto_JniTweetNacl.c
 
-.PHONY: jni_test
+.PHONY: jni_tests
 jni_tests: def 
 	java -Djava.library.path=. -cp "Test.jar:lib/*" test.TestRunner
 

src/test/NativeTest.java

@@ -23,6 +23,33 @@ private static byte[] copy(byte[] of) {
         return Arrays.copyOf(of, of.length);
     }
 
+    private static void cryptoSignKeyPairTest(int nRound) {
+        for (int iRound = 0; iRound < nRound; iRound++) {
+            byte[] javaPublicKey = new byte[32];
+            byte[] javaSecretKey = new byte[64];
+            byte[] cPublicKey = new byte[32];
+            byte[] cSecretKey = new byte[64];
+
+            boolean isSeeded = true;
+            prng.nextBytes(javaSecretKey);
+            System.arraycopy(javaSecretKey, 0, cSecretKey, 0, javaSecretKey.length);
+
+            TweetNaCl.crypto_sign_keypair(javaPublicKey, javaSecretKey, isSeeded);
+
+            int jniRc = JniTweetNacl.crypto_sign_keypair(cPublicKey, cSecretKey);
+            if (jniRc != 0)
+                throw new IllegalStateException("non-zero jni return code " + jniRc);
+
+            if (!Arrays.equals(javaSecretKey, cSecretKey))
+                throw new IllegalStateException("Java secret key != C secret key!");
+
+            if (!Arrays.equals(javaPublicKey, cPublicKey))
+                throw new IllegalStateException("JNI unsign != original!");
+
+            assertTrue("crypto sign-keypair round " + iRound, Arrays.equals(javaSecretKey, cSecretKey));
+        }
+    }
+
     private static void cryptoSignOpenTest(int nRound, int messageLength) {
         byte[] publicKey = new byte[32];
         byte[] secretKey = new byte[64];
@@ -183,6 +210,7 @@ private static void cryptoBoxOpenTest(int nRound, int messageLength) {
             int size = (int) Math.pow(2, exp);
             size += prng.nextInt(size);
 
+            cryptoSignKeyPairTest(N_ROUND);
             cryptoBoxTest(N_ROUND, size);
             cryptoBoxOpenTest(N_ROUND, size);
             cryptoSignTest(N_ROUND, size);