diff options
author | David von Oheimb <David.von.Oheimb@siemens.com> | 2018-05-10 21:14:12 +0200 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2018-06-18 10:45:35 +0100 |
commit | 49c9c1b3d05782fe76bef2eef8c5224baf843240 (patch) | |
tree | b46b18ca01a027ae1960e6986c408134394538aa /crypto/asn1/p5_pbev2.c | |
parent | f2950a46a6217110a7f77b5acfe558a6fb4dfeeb (diff) | |
download | openssl-49c9c1b3d05782fe76bef2eef8c5224baf843240.zip openssl-49c9c1b3d05782fe76bef2eef8c5224baf843240.tar.gz openssl-49c9c1b3d05782fe76bef2eef8c5224baf843240.tar.bz2 |
add 'unsupported cipher mode' diagnostics to evp_lib.c and genpkey.c
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6217)
Diffstat (limited to 'crypto/asn1/p5_pbev2.c')
-rw-r--r-- | crypto/asn1/p5_pbev2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 14e8700..5b65adc 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -78,7 +78,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, /* Dummy cipherinit to just setup the IV, and PRF */ if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, iv, 0)) goto err; - if (EVP_CIPHER_param_to_asn1(ctx, scheme->parameter) < 0) { + if (EVP_CIPHER_param_to_asn1(ctx, scheme->parameter) <= 0) { ASN1err(ASN1_F_PKCS5_PBE2_SET_IV, ASN1_R_ERROR_SETTING_CIPHER_PARAMS); goto err; } |