diff options
| author | Bodo Möller <bodo@openssl.org> | 2005-05-11 05:45:39 +0200 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2005-05-11 05:45:39 +0200 |
| commit | 8afca8d9c60c3d7db6f9bc94a97c77f016fc139d (patch) | |
| tree | df6c0046c8ebb68825940173c750ae0fb37f0f0c /crypto/pkcs12/p12_crpt.c | |
| parent | use 'p' as conversion specifier for printf to avoid truncation of (diff) | |
| download | openssl-8afca8d9c60c3d7db6f9bc94a97c77f016fc139d.tar.xz openssl-8afca8d9c60c3d7db6f9bc94a97c77f016fc139d.zip | |
Fix more error codes.
(Also improve util/ck_errf.pl script, and occasionally
fix source code formatting.)
Diffstat (limited to 'crypto/pkcs12/p12_crpt.c')
| -rw-r--r-- | crypto/pkcs12/p12_crpt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c index d407be39ca..bbc13e50dd 100644 --- a/crypto/pkcs12/p12_crpt.c +++ b/crypto/pkcs12/p12_crpt.c @@ -84,7 +84,7 @@ 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; @@ -97,7 +97,7 @@ int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 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; } |