Check PKCS7 structures in PKCS#12 files are of type data.

[openssl.git] / crypto / pkcs12 / p12_crpt.c

diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index 97be6a5fb538ad5b31bdff1759f8caac7ac54630..bbc13e50dd9f068cf008ee6c72932e1851159faa 100644 (file)
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -84,19 +84,20 @@ EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC2_CBC, EVP_rc2_40_cbc(),
 #endif
 }
 
-int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
+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;
-       int saltlen, iter;
-       unsigned char *salt, *pbuf;
+       int saltlen, iter, ret;
+       unsigned char *salt;
+       const unsigned char *pbuf;
        unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
 
        /* Extract useful info from parameter */
        pbuf = param->value.sequence->data;
        if (!param || (param->type != V_ASN1_SEQUENCE) ||
           !(pbe = d2i_PBEPARAM (NULL, &pbuf, param->value.sequence->length))) {
-               EVPerr(PKCS12_F_PKCS12_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
+               PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN,PKCS12_R_DECODE_ERROR);
                return 0;
        }
 
@@ -117,8 +118,8 @@ int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                return 0;
        }
        PBEPARAM_free(pbe);
-       EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, en_de);
-       memset(key, 0, EVP_MAX_KEY_LENGTH);
-       memset(iv, 0, EVP_MAX_IV_LENGTH);
-       return 1;
+       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);
+       return ret;
 }