summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/crypto/pkcs12/p12_decr.c
diff options
context:
space:
mode:
Diffstat (limited to 'deps/openssl/openssl/crypto/pkcs12/p12_decr.c')
-rw-r--r--deps/openssl/openssl/crypto/pkcs12/p12_decr.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_decr.c b/deps/openssl/openssl/crypto/pkcs12/p12_decr.c
index 9d3557e8d7..ba77dbbe32 100644
--- a/deps/openssl/openssl/crypto/pkcs12/p12_decr.c
+++ b/deps/openssl/openssl/crypto/pkcs12/p12_decr.c
@@ -89,14 +89,7 @@ unsigned char * PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
goto err;
}
- if (!EVP_CipherUpdate(&ctx, out, &i, in, inlen))
- {
- OPENSSL_free(out);
- out = NULL;
- PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,ERR_R_EVP_LIB);
- goto err;
- }
-
+ EVP_CipherUpdate(&ctx, out, &i, in, inlen);
outlen = i;
if(!EVP_CipherFinal_ex(&ctx, out + i, &i)) {
OPENSSL_free(out);