Merge pull request #24 from open-quantum-safe/sw-remove-nist-drbg

Remove NIST DRBG from API

Author: SWilson4

examples/RandExample.java

@@ -3,14 +3,6 @@
 public class RandExample {
 
     public static void main(String[] args) {
-        Rand.randombytes_switch_algorithm("NIST-KAT");
-        byte[] entropy_seed = new byte[48];
-        entropy_seed[0] = (byte) 100;
-        entropy_seed[20] = (byte) 200;
-        entropy_seed[47] = (byte) 150;
-        Rand.randombytes_nist_kat_init(entropy_seed);
-        System.out.println("NIST-KAT:\t\t" + Common.to_hex(Rand.randombytes(32)));
-
         String os = System.getProperty("os.name");
         if (!os.equals("Windows")) { // OQS note: Windows not yet supported, but leaving this here for when we do
             Rand.randombytes_switch_algorithm("OpenSSL");

src/main/c/Rand.c

@@ -41,24 +41,3 @@ JNIEXPORT jint JNICALL Java_org_openquantumsafe_Rand_randombytes_1switch_1algori
     (*env)->ReleaseStringUTFChars(env, jstr, alg_name_native);
     return (rv_ == OQS_SUCCESS) ? 0 : -1;
 }
-
-/*
- * Class:     org_openquantumsafe_Rand
- * Method:    randombytes_nist_kat_init
- * Signature: ([B[BJ)V
- */
-JNIEXPORT void JNICALL Java_org_openquantumsafe_Rand_randombytes_1nist_1kat_1init
-  (JNIEnv *env, jclass cls, jbyteArray jentropy_input, jbyteArray jpers_str, jlong pers_str_len)
-{
-    jbyte *entropy_input_native = (*env)->GetByteArrayElements(env, jentropy_input, 0);
-
-    if (pers_str_len == 0) {
-        OQS_randombytes_nist_kat_init_256bit((uint8_t*) entropy_input_native, NULL);
-    } else {
-        jbyte *pers_str_native = (*env)->GetByteArrayElements(env, jpers_str, 0);
-        OQS_randombytes_nist_kat_init_256bit((uint8_t*) entropy_input_native, (uint8_t*) pers_str_native);
-        (*env)->ReleaseByteArrayElements(env, jpers_str, pers_str_native, JNI_ABORT);
-    }
-
-    (*env)->ReleaseByteArrayElements(env, jentropy_input, entropy_input_native, JNI_ABORT);
-}

src/main/c/Rand.h

@@ -36,39 +36,4 @@ public static void randombytes_switch_algorithm(String alg_name)
             throw new RuntimeException("Cannot switch rand algorithm");
         }
     }
-
-    /**
-    * \brief Wrapper for OQS_API void OQS_randombytes_nist_kat_init(
-    *                                   const uint8_t *entropy_input,
-    *                                   const uint8_t *personalization_string,
-    *                                   int security_strength);
-    *
-    * \param Entropy input seed, must be exactly 48 bytes long
-    * \param Entropy seed length
-    * \param Optional personalization string, which, if non-empty, must be at
-    * least 48 byte[] long
-    * \param personalization string length
-    */
-    private static native void randombytes_nist_kat_init(byte[] entropy_input,
-                                            byte[] personalization_string,
-                                            long personalization_string_len);
-
-    public static void randombytes_nist_kat_init(byte[] entropy_input) {
-        randombytes_nist_kat_init(entropy_input, null);
-    }
-
-    public static void randombytes_nist_kat_init(byte[] entropy_input,
-                                            byte[] personalization_string) {
-        if (entropy_input.length != 48) {
-            throw new RuntimeException("The entropy source must be exactly 48 byte[] long");
-        }
-        if (personalization_string == null) {
-            randombytes_nist_kat_init(entropy_input, null, 0);
-            return;
-        }
-        if (personalization_string.length < 48) {
-            throw new RuntimeException("The personalization string must be either empty or at least 48 byte[] long");
-        }
-        randombytes_nist_kat_init(entropy_input, personalization_string, personalization_string.length);
-    }
 }