From ae6fe9397c5d9ed1763cc5609e33b6bd15d7f268 Mon Sep 17 00:00:00 2001
From: Chris Conlon <chris@wolfssl.com>
Date: Thu, 5 Jun 2014 17:07:19 -0600
Subject: [PATCH] check NTRU DRBG uninstantiate ret value in test.c

---
 ctaocrypt/test/test.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/ctaocrypt/test/test.c b/ctaocrypt/test/test.c
index 07363f5fa..c2c5d7f4e 100644
--- a/ctaocrypt/test/test.c
+++ b/ctaocrypt/test/test.c
@@ -2858,8 +2858,8 @@ int rsa_test(void)
         int    pemSz = 0;
         RsaKey derIn;
         RsaKey genKey;
-        FILE* keyFile;
-        FILE* pemFile;
+        FILE*  keyFile;
+        FILE*  pemFile;
 
         ret = InitRsaKey(&genKey, 0);
         if (ret != 0)
@@ -3053,7 +3053,7 @@ int rsa_test(void)
         int         pemSz;
         size_t      bytes3;
         word32      idx3 = 0;
-			  FILE* file3 ;
+        FILE*       file3 ;
 #ifdef CYASSL_TEST_CERT
         DecodedCert decode;
 #endif
@@ -3359,7 +3359,7 @@ int rsa_test(void)
         if (rc != DRBG_OK) {
             free(derCert);
             free(pem);
-            return -450;
+            return -448;
         }
 
         rc = ntru_crypto_ntru_encrypt_keygen(drbg, NTRU_EES401EP2,
@@ -3368,18 +3368,24 @@ int rsa_test(void)
         if (rc != NTRU_OK) {
             free(derCert);
             free(pem);
-            return -451;
+            return -449;
         }
 
         rc = ntru_crypto_ntru_encrypt_keygen(drbg, NTRU_EES401EP2,
                                              &public_key_len, public_key,
                                              &private_key_len, private_key);
-        ntru_crypto_drbg_uninstantiate(drbg);
+        if (rc != NTRU_OK) {
+            free(derCert);
+            free(pem);
+            return -450;
+        }
+
+        rc = ntru_crypto_drbg_uninstantiate(drbg);
 
         if (rc != NTRU_OK) {
             free(derCert);
             free(pem);
-            return -452;
+            return -451;
         }
 
         caFile = fopen(caKeyFile, "rb");
@@ -3387,7 +3393,7 @@ int rsa_test(void)
         if (!caFile) {
             free(derCert);
             free(pem);
-            return -453;
+            return -452;
         }
 
         bytes = fread(tmp, 1, FOURK_BUF, caFile);
@@ -3397,7 +3403,7 @@ int rsa_test(void)
         if (ret != 0) {
             free(derCert);
             free(pem);
-            return -459;
+            return -453;
         }
         ret = RsaPrivateKeyDecode(tmp, &idx3, &caKey, (word32)bytes);
         if (ret != 0) {