diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-04-19 21:31:43 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-04-19 21:31:43 +0000 |
| commit | 6b691a5c85ddc4e407e32781841fee5c029506cd (patch) | |
| tree | 436f1127406e1cacfe83dfcbfff824d89c47d834 /crypto/pkcs12/p12_add.c | |
| parent | 3edd7ed15de229230f74c79c3d71e7c9c674cf4f (diff) | |
| download | openssl-6b691a5c85ddc4e407e32781841fee5c029506cd.tar.gz | |
Change functions to ANSI C.
Diffstat (limited to 'crypto/pkcs12/p12_add.c')
| -rw-r--r-- | crypto/pkcs12/p12_add.c | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c index 1a8eadd011..58f4d1f4be 100644 --- a/crypto/pkcs12/p12_add.c +++ b/crypto/pkcs12/p12_add.c @@ -62,12 +62,8 @@ /* Pack an object into an OCTET STRING and turn into a safebag */ -PKCS12_SAFEBAG *PKCS12_pack_safebag (obj, i2d, nid1, nid2) -char *obj; -int (*i2d)(); -int nid1; -int nid2; - +PKCS12_SAFEBAG *PKCS12_pack_safebag (char *obj, int (*i2d)(), int nid1, + int nid2) { PKCS12_BAGS *bag; PKCS12_SAFEBAG *safebag; @@ -91,8 +87,7 @@ int nid2; /* Turn PKCS8 object into a keybag */ -PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG (p8) -PKCS8_PRIV_KEY_INFO *p8; +PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG (PKCS8_PRIV_KEY_INFO *p8) { PKCS12_SAFEBAG *bag; if (!(bag = PKCS12_SAFEBAG_new())) { @@ -106,8 +101,7 @@ 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; +PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG (pbe_nid, pass, passlen, salt, saltlen, iter, p8)int pbe_nid; unsigned char *pass; int passlen; unsigned char *salt; @@ -134,8 +128,7 @@ PKCS8_PRIV_KEY_INFO *p8; } /* Turn a stack of SAFEBAGS into a PKCS#7 data Contentinfo */ -PKCS7 *PKCS12_pack_p7data (sk) -STACK *sk; +PKCS7 *PKCS12_pack_p7data (STACK *sk) { PKCS7 *p7; if (!(p7 = PKCS7_new())) { @@ -158,15 +151,8 @@ STACK *sk; /* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */ -PKCS7 *PKCS12_pack_p7encdata (pbe_nid, pass, passlen, salt, saltlen, iter, - bags) -int pbe_nid; -unsigned char *pass; -int passlen; -unsigned char *salt; -int saltlen; -int iter; -STACK *bags; +PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, unsigned char *pass, int passlen, + unsigned char *salt, int saltlen, int iter, STACK *bags) { PKCS7 *p7; X509_ALGOR *pbe; @@ -198,14 +184,9 @@ STACK *bags; return p7; } -X509_SIG *PKCS8_encrypt (pbe_nid, pass, passlen, salt, saltlen, iter, p8inf) -int pbe_nid; -unsigned char *pass; -int passlen; -unsigned char *salt; -int saltlen; -int iter; -PKCS8_PRIV_KEY_INFO *p8inf; +X509_SIG *PKCS8_encrypt (int pbe_nid, unsigned char *pass, int passlen, + unsigned char *salt, int saltlen, int iter, + PKCS8_PRIV_KEY_INFO *p8inf) { X509_SIG *p8; X509_ALGOR *pbe; |