Check wc_InitRng and key init in examples

Author: JeremiahM37

native/com_wolfssl_WolfCryptECC.c

@@ -93,6 +93,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptECC_doSign
    jlongArray outSz, jobject keyDer, jlong keySz)
 {
     int     ret;
+    int     rngInit = 0;
+    int     keyInit = 0;
     WC_RNG  rng;
     ecc_key myKey;
     unsigned int tmpOut;
@@ -130,8 +132,20 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptECC_doSign
     (*jenv)->GetLongArrayRegion(jenv, outSz, 0, 1, &tmp);
     tmpOut = (unsigned int)tmp;
 
-    wc_InitRng(&rng);
-    wc_ecc_init(&myKey);
+    ret = wc_InitRng(&rng);
+    if (ret != 0) {
+        printf("wc_InitRng failed, ret = %d\n", ret);
+        return ret;
+    }
+    rngInit = 1;
+
+    ret = wc_ecc_init(&myKey);
+    if (ret != 0) {
+        printf("wc_ecc_init failed, ret = %d\n", ret);
+        wc_FreeRng(&rng);
+        return ret;
+    }
+    keyInit = 1;
 
     ret = wc_EccPrivateKeyDecode(keyBuf, &idx, &myKey, (long)keySz);
     if (ret == 0) {
@@ -144,8 +158,12 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptECC_doSign
         printf("wc_EccPrivateKeyDecode failed, ret = %d\n", ret);
     }
 
-    wc_ecc_free(&myKey);
-    wc_FreeRng(&rng);
+    if (keyInit) {
+        wc_ecc_free(&myKey);
+    }
+    if (rngInit) {
+        wc_FreeRng(&rng);
+    }
 
     if (ret == 0) {
         tmp = (jlong)tmpOut;

native/com_wolfssl_WolfCryptRSA.c

@@ -36,6 +36,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptRSA_doSign
    jintArray outSz, jobject keyDer, jlong keySz)
 {
     int     ret;
+    int     rngInit = 0;
+    int     keyInit = 0;
     WC_RNG  rng;
     RsaKey  myKey;
     unsigned int idx;
@@ -72,8 +74,20 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptRSA_doSign
     /* get output buffer size */
     (*jenv)->GetIntArrayRegion(jenv, outSz, 0, 1, (jint*)&tmpOut);
 
-    wc_InitRng(&rng);
-    wc_InitRsaKey(&myKey, NULL);
+    ret = wc_InitRng(&rng);
+    if (ret != 0) {
+        printf("wc_InitRng failed, ret = %d\n", ret);
+        return ret;
+    }
+    rngInit = 1;
+
+    ret = wc_InitRsaKey(&myKey, NULL);
+    if (ret != 0) {
+        printf("wc_InitRsaKey failed, ret = %d\n", ret);
+        wc_FreeRng(&rng);
+        return ret;
+    }
+    keyInit = 1;
 
     idx = 0;
 
@@ -91,8 +105,12 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptRSA_doSign
         printf("wc_RsaPrivateKeyDecode failed, ret = %d\n", ret);
     }
 
-    wc_FreeRsaKey(&myKey);
-    wc_FreeRng(&rng);
+    if (keyInit) {
+        wc_FreeRsaKey(&myKey);
+    }
+    if (rngInit) {
+        wc_FreeRng(&rng);
+    }
 
     return ret;
 }
@@ -157,6 +175,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptRSA_doEnc
    jintArray outSz, jobject keyDer, jlong keySz)
 {
     int     ret;
+    int     rngInit = 0;
+    int     keyInit = 0;
     RsaKey  myKey;
     WC_RNG  rng;
     unsigned int idx;
@@ -193,8 +213,20 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptRSA_doEnc
     /* get output buffer size */
     (*jenv)->GetIntArrayRegion(jenv, outSz, 0, 1, (jint*)&tmpOut);
 
-    wc_InitRng(&rng);
-    wc_InitRsaKey(&myKey, NULL);
+    ret = wc_InitRng(&rng);
+    if (ret != 0) {
+        printf("wc_InitRng failed, ret = %d\n", ret);
+        return ret;
+    }
+    rngInit = 1;
+
+    ret = wc_InitRsaKey(&myKey, NULL);
+    if (ret != 0) {
+        printf("wc_InitRsaKey failed, ret = %d\n", ret);
+        wc_FreeRng(&rng);
+        return ret;
+    }
+    keyInit = 1;
 
     idx = 0;
 
@@ -211,8 +243,12 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfCryptRSA_doEnc
         printf("wc_RsaPublicKeyDecode failed, ret = %d\n", ret);
     }
 
-    wc_FreeRsaKey(&myKey);
-    wc_FreeRng(&rng);
+    if (keyInit) {
+        wc_FreeRsaKey(&myKey);
+    }
+    if (rngInit) {
+        wc_FreeRng(&rng);
+    }
 
     return ret;
 }