PKCS#12 code fixes: initialize and cleanup digests and ciphers

properly.

diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index e0bbe4cff70731fef0a5b6e4ef41a32bf35d7f6c..394af368f4d46ab0793bdadbb5eab49e228b4cb6 100644 (file)
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -76,28 +76,32 @@ unsigned char * PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
        int outlen, i;
        EVP_CIPHER_CTX ctx;
 
+       EVP_CIPHER_CTX_init(&ctx);
        /* Decrypt data */
-        if (!EVP_PBE_CipherInit (algor->algorithm, pass, passlen,
+        if (!EVP_PBE_CipherInit(algor->algorithm, pass, passlen,
                                         algor->parameter, &ctx, en_de)) {
                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR);
                return NULL;
        }
 
-       if(!(out = OPENSSL_malloc (inlen + EVP_CIPHER_CTX_block_size(&ctx)))) {
+       if(!(out = OPENSSL_malloc(inlen + EVP_CIPHER_CTX_block_size(&ctx)))) {
                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,ERR_R_MALLOC_FAILURE);
-               return NULL;
+               goto err;
        }
 
-       EVP_CipherUpdate (&ctx, out, &i, in, inlen);
+       EVP_CipherUpdate(&ctx, out, &i, in, inlen);
        outlen = i;
-       if(!EVP_CipherFinal_ex (&ctx, out + i, &i)) {
-               OPENSSL_free (out);
+       if(!EVP_CipherFinal_ex(&ctx, out + i, &i)) {
+               OPENSSL_free(out);
+               out = NULL;
                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,PKCS12_R_PKCS12_CIPHERFINAL_ERROR);
-               return NULL;
+               goto err;
        }
        outlen += i;
        if (datalen) *datalen = outlen;
        if (data) *data = out;
+       err:
+       EVP_CIPHER_CTX_cleanup(&ctx);
        return out;
 
 }

diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index 1a405676f8742de66571dbf9de5a717aa4f90576..0d39ebde8c8ec67da8a47beb9bee9a805c5dfcd6 100644 (file)
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -165,6 +165,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                        OPENSSL_free (I);
                        BN_free (Ij);
                        BN_free (Bpl1);
+                       EVP_MD_CTX_cleanup(&ctx);
 #ifdef DEBUG_KEYGEN
                        fprintf(stderr, "Output KEY (length %d)\n", tmpn);
                        h__dump(tmpout, tmpn);
@@ -195,7 +196,6 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                        } else BN_bn2bin (Ij, I + j);
                }
        }
-       EVP_MD_CTX_cleanup(&ctx);
 }
 #ifdef DEBUG_KEYGEN
 void h__dump (unsigned char *p, int len)