diff options
| author | Ben Laurie <ben@openssl.org> | 1999-04-23 17:01:15 +0200 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-04-23 17:01:15 +0200 |
| commit | 61f5b6f33807306d09bccbc2dcad474d1d04ca40 (patch) | |
| tree | 1680fa648df5f730df11ec433a512a1fadf0facd /crypto/pkcs12/p12_crpt.c | |
| parent | Submitted by: (diff) | |
| download | openssl-61f5b6f33807306d09bccbc2dcad474d1d04ca40.tar.xz openssl-61f5b6f33807306d09bccbc2dcad474d1d04ca40.zip | |
Work with -pedantic!
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 8623cde6c4..8a6fedaeab 100644 --- a/crypto/pkcs12/p12_crpt.c +++ b/crypto/pkcs12/p12_crpt.c @@ -78,12 +78,12 @@ EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC2_CBC, EVP_rc2_40_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen); } -int PKCS12_PBE_keyivgen (unsigned char *pass, int passlen, unsigned char *salt, +int PKCS12_PBE_keyivgen (const char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_CIPHER *cipher, EVP_MD *md, unsigned char *key, unsigned char *iv) { if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_KEY_ID, - iter, EVP_CIPHER_key_length(cipher), key, md)) { + iter, EVP_CIPHER_key_length(cipher), key, md)) { PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN,PKCS12_R_KEY_GEN_ERROR); return 0; } |