Check return code of EVP_CipherInit() in PKCS#12 code.
authorDr. Stephen Henson <steve@openssl.org>
Wed, 24 Nov 2004 01:21:03 +0000 (01:21 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 24 Nov 2004 01:21:03 +0000 (01:21 +0000)
crypto/pkcs12/p12_crpt.c

index 654d15c..d407be3 100644 (file)
@@ -88,7 +88,7 @@ int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de)
 {
        PBEPARAM *pbe;
                ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de)
 {
        PBEPARAM *pbe;
-       int saltlen, iter;
+       int saltlen, iter, ret;
        unsigned char *salt;
        const unsigned char *pbuf;
        unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
        unsigned char *salt;
        const unsigned char *pbuf;
        unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
@@ -118,8 +118,8 @@ int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                return 0;
        }
        PBEPARAM_free(pbe);
                return 0;
        }
        PBEPARAM_free(pbe);
-       EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, en_de);
+       ret = EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, en_de);
        OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
        OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
        OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
        OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
-       return 1;
+       return ret;
 }
 }