diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-07-17 16:33:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-07-17 16:33:31 +0000 |
| commit | 5c95c2ac23dd30f3c458e2738598383d2ca58181 (patch) | |
| tree | 181e8b7d0663eeed579bbe7f97760f0ddad52157 /crypto/asn1/p5_pbev2.c | |
| parent | 454dbbc593cd8d9ddd7969e94c6118fc64c57f7b (diff) | |
| download | openssl-5c95c2ac23dd30f3c458e2738598383d2ca58181.tar.gz | |
Fix various error codes to match functions.
Diffstat (limited to 'crypto/asn1/p5_pbev2.c')
| -rw-r--r-- | crypto/asn1/p5_pbev2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index dac66d8c4f..3c1db8afcc 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -101,7 +101,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, alg_nid = EVP_CIPHER_type(cipher); if(alg_nid == NID_undef) { - ASN1err(ASN1_F_PKCS5_PBE2_SET, + ASN1err(ASN1_F_PKCS5_PBE2_SET_IV, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER); goto err; } @@ -129,7 +129,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, /* Dummy cipherinit to just setup the IV, and PRF */ EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, iv, 0); if(EVP_CIPHER_param_to_asn1(&ctx, scheme->parameter) < 0) { - ASN1err(ASN1_F_PKCS5_PBE2_SET, + ASN1err(ASN1_F_PKCS5_PBE2_SET_IV, ASN1_R_ERROR_SETTING_CIPHER_PARAMS); EVP_CIPHER_CTX_cleanup(&ctx); goto err; @@ -214,7 +214,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, return ret; merr: - ASN1err(ASN1_F_PKCS5_PBE2_SET,ERR_R_MALLOC_FAILURE); + ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,ERR_R_MALLOC_FAILURE); err: PBE2PARAM_free(pbe2); |