projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'unsupported cipher mode' diagnostics to evp_lib.c and genpkey.c
[openssl.git]
/
crypto
/
asn1
/
p5_scrypt.c
diff --git
a/crypto/asn1/p5_scrypt.c
b/crypto/asn1/p5_scrypt.c
index 21d74da5b151da2c078a2450ce53eecbe2ade9e8..1491d96ec8d389c17ee3dd4d5368d28f4e6c47e4 100644
(file)
--- a/
crypto/asn1/p5_scrypt.c
+++ b/
crypto/asn1/p5_scrypt.c
@@
-93,7
+93,7
@@
X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
/* Dummy cipherinit to just setup the IV */
if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, iv, 0) == 0)
goto err;
/* Dummy cipherinit to just setup the IV */
if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, iv, 0) == 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_SCRYPT,
ASN1_R_ERROR_SETTING_CIPHER_PARAMS);
goto err;
ASN1err(ASN1_F_PKCS5_PBE2_SET_SCRYPT,
ASN1_R_ERROR_SETTING_CIPHER_PARAMS);
goto err;