fix set but unused warnings

[openssl.git] / fips / aes / fips_gcmtest.c

diff --git a/fips/aes/fips_gcmtest.c b/fips/aes/fips_gcmtest.c
index a7c787368ae6d7af93da01595622b3be7324afb3..9f50857fb9075ed4cd67021d78dd2601af43655e 100644 (file)
--- a/fips/aes/fips_gcmtest.c
+++ b/fips/aes/fips_gcmtest.c
@@ -261,6 +261,7 @@ static void gcmtest(FILE *in, FILE *out, int encrypt)
                        iv = aad = ct = pt = key = tag = NULL;
                        }
                }
+       FIPS_cipher_ctx_cleanup(&ctx);  
        }
 
 static void xtstest(FILE *in, FILE *out)
@@ -270,7 +271,6 @@ static void xtstest(FILE *in, FILE *out)
        char *keyword, *value;
        int inlen = 0;
        int encrypt = 0;
-       int rv;
        long l;
        unsigned char *key = NULL, *iv = NULL;
        unsigned char *inbuf = NULL, *outbuf = NULL;
@@ -326,7 +326,7 @@ static void xtstest(FILE *in, FILE *out)
                        {
                        FIPS_cipherinit(&ctx, xts, key, iv, encrypt);
                        outbuf = OPENSSL_malloc(inlen);
-                       rv = FIPS_cipher(&ctx, outbuf, inbuf, inlen);
+                       FIPS_cipher(&ctx, outbuf, inbuf, inlen);
                        OutputValue(encrypt ? "CT":"PT", outbuf, inlen, out, 0);
                        OPENSSL_free(inbuf);
                        OPENSSL_free(outbuf);
@@ -335,6 +335,7 @@ static void xtstest(FILE *in, FILE *out)
                        iv = key = inbuf = outbuf = NULL;
                        }       
                }
+       FIPS_cipher_ctx_cleanup(&ctx);  
        }
 
 static void ccmtest(FILE *in, FILE *out)
@@ -428,6 +429,8 @@ static void ccmtest(FILE *in, FILE *out)
                        }
                else if (!strcmp(keyword,"Adata"))
                        {
+                       if (Adata)
+                               OPENSSL_free(Adata);
                        Adata = hex2bin_m(value, &l);
                        if (Alen && l != Alen)
                                {
@@ -493,6 +496,8 @@ static void ccmtest(FILE *in, FILE *out)
                OPENSSL_free(Key);
        if (Nonce)
                OPENSSL_free(Nonce);
+       if (Adata)
+               OPENSSL_free(Adata);
        FIPS_cipher_ctx_cleanup(&ctx);
        }