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_add.c | |
| parent | Submitted by: (diff) | |
| download | openssl-61f5b6f33807306d09bccbc2dcad474d1d04ca40.tar.xz openssl-61f5b6f33807306d09bccbc2dcad474d1d04ca40.zip | |
Work with -pedantic!
Diffstat (limited to 'crypto/pkcs12/p12_add.c')
| -rw-r--r-- | crypto/pkcs12/p12_add.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c index 58f4d1f4be..60304ed443 100644 --- a/crypto/pkcs12/p12_add.c +++ b/crypto/pkcs12/p12_add.c @@ -101,8 +101,9 @@ PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG (PKCS8_PRIV_KEY_INFO *p8) /* Turn PKCS8 object into a shrouded keybag */ -PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG (pbe_nid, pass, passlen, salt, saltlen, iter, p8)int pbe_nid; -unsigned char *pass; +PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG (pbe_nid, pass, passlen, salt, saltlen, iter, p8) +int pbe_nid; +const char *pass; int passlen; unsigned char *salt; int saltlen; @@ -151,7 +152,7 @@ PKCS7 *PKCS12_pack_p7data (STACK *sk) /* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */ -PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, unsigned char *pass, int passlen, +PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, const char *pass, int passlen, unsigned char *salt, int saltlen, int iter, STACK *bags) { PKCS7 *p7; @@ -184,7 +185,7 @@ PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, unsigned char *pass, int passlen, return p7; } -X509_SIG *PKCS8_encrypt (int pbe_nid, unsigned char *pass, int passlen, +X509_SIG *PKCS8_encrypt (int pbe_nid, const char *pass, int passlen, unsigned char *salt, int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8inf) { |