support INTL fw

onlykey/okcore.cpp

@@ -180,6 +180,10 @@ uint8_t CRYPTO_AUTH = 0;
 /*************************************/
 float temperaturev; 
 /*************************************/
+/*************************************/
+//RNG Assignments
+/*************************************/
+size_t length = 48; // First block should wait for the pool to fill up.
 
 void recvmsg() {
   int n;
@@ -4244,9 +4248,11 @@ bool wipebuffersafter5sec(Task* me) {
 	if (configmode==false) {
 	packet_buffer_offset = 0;
 	memset(packet_buffer, 0, sizeof(packet_buffer));
+	#ifdef US_VERSION
 	extern int large_resp_buffer_offset;
 	large_resp_buffer_offset = 0;
 	memset(large_resp_buffer, 0, sizeof(large_resp_buffer));
+	#endif
 	CRYPTO_AUTH = 0;
 	Challenge_button1 = 0;
 	Challenge_button2 = 0;
@@ -5300,3 +5306,21 @@ void temp_voltage () {
 	#endif
 }
 
+int RNG2(uint8_t *dest, unsigned size) {
+	// Generate output whenever 32 bytes of entropy have been accumulated.
+    // The first time through, we wait for 48 bytes for a full entropy pool.
+    while (!RNG.available(length)) {
+      //Serial.println("waiting for random number");
+	  rngloop(); //Gather entropy
+    }
+    RNG.rand(dest, size);
+    length = 32;
+#ifdef DEBUG
+	Serial.println();
+	Serial.print("Generating random number of size = ");
+	Serial.print(size);
+	byteprint(dest, size);
+#endif
+    return 1;
+}
+

onlykey/okcore.h

@@ -197,6 +197,7 @@ extern void SETECCPRIV (uint8_t *buffer);
 extern void RESTORE (uint8_t *buffer);
 extern void process_packets (uint8_t *buffer);
 extern void temp_voltage ();
+extern int RNG2(uint8_t *dest, unsigned size);
 
 #ifdef __cplusplus
 }

onlykey/okcrypto.cpp

@@ -70,10 +70,6 @@
 
 #ifdef US_VERSION
 
-/*************************************/
-//RNG Assignments
-/*************************************/
-size_t length = 48; // First block should wait for the pool to fill up.
 /*************************************/
 //RSA assignments
 /*************************************/
@@ -1110,24 +1106,6 @@ int mbedtls_rand( void *rng_state, unsigned char *output, size_t len )
     return( 0 );
 }
 
-int RNG2(uint8_t *dest, unsigned size) {
-	// Generate output whenever 32 bytes of entropy have been accumulated.
-    // The first time through, we wait for 48 bytes for a full entropy pool.
-    while (!RNG.available(length)) {
-      //Serial.println("waiting for random number");
-	  rngloop(); //Gather entropy
-    }
-    RNG.rand(dest, size);
-    length = 32;
-#ifdef DEBUG
-	Serial.println();
-	Serial.print("Generating random number of size = ");
-	Serial.print(size);
-	byteprint(dest, size);
-#endif
-    return 1;
-}
-
 void newhope_test ()
 {
 	int i;

onlykey/okcrypto.h

@@ -87,7 +87,6 @@ extern int rsa_sign (int mlen, const uint8_t *msg, uint8_t *out);
 extern void rsa_getpub (uint8_t type);
 extern bool is_bit_set(unsigned char byte, int index);
 extern int mbedtls_rand( void *rng_state, unsigned char *output, size_t len);
-extern int RNG2(uint8_t *dest, unsigned size);
 extern int rsa_encrypt (int len, const uint8_t *in, uint8_t *out);
 extern int shared_secret (uint8_t *pub, uint8_t *secret);
 extern void aes_crypto_box (uint8_t *buffer, int len, bool open);

onlykey/onlykey.h

@@ -54,7 +54,7 @@
 #define ONLYKEY_H
 
 #define DEBUG //Enable Serial Monitor 
-#define US_VERSION //Define for US Version Firmare
+//#define US_VERSION //Define for US Version Firmare
 //#define OK_Color //Color Version 
 
 #ifndef OKCORE_H