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_key.c | |
parent | 3edd7ed15de229230f74c79c3d71e7c9c674cf4f (diff) |
Change functions to ANSI C.
Diffstat (limited to 'crypto/pkcs12/p12_key.c')
-rw-r--r-- | crypto/pkcs12/p12_key.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index 3bef1fa38a..eb774e45f0 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -74,10 +74,9 @@ void h__dump (unsigned char *p, int len); #define min(a,b) ((a) < (b) ? (a) : (b)) #endif -int PKCS12_key_gen_asc (pass, passlen, salt, saltlen, id, iter, n, out, md_type) -unsigned char *pass, *salt, *out; -int passlen, saltlen, id, iter, n; -const EVP_MD *md_type; +int PKCS12_key_gen_asc (unsigned char *pass, int passlen, unsigned char *salt, + int saltlen, int id, int iter, int n, unsigned char *out, + const EVP_MD *md_type) { int ret; unsigned char *unipass; @@ -93,10 +92,9 @@ const EVP_MD *md_type; return ret; } -int PKCS12_key_gen_uni (pass, passlen, salt, saltlen, id, iter, n, out, md_type) -unsigned char *pass, *salt, *out; -int passlen, saltlen, id, iter, n; -const EVP_MD *md_type; +int PKCS12_key_gen_uni (unsigned char *pass, int passlen, unsigned char *salt, + int saltlen, int id, int iter, int n, unsigned char *out, + const EVP_MD *md_type) { unsigned char *B, *D, *I, *p, *Ai; int Slen, Plen, Ilen; @@ -177,9 +175,7 @@ const EVP_MD *md_type; return 0; /* This can't happen */ } #ifdef DEBUG_KEYGEN -void h__dump (p, len) -unsigned char *p; -int len; +void h__dump (unsigned char *p, int len) { for (; len --; p++) BIO_printf (bio_err, "%02X", *p); BIO_printf (bio_err, "\n"); |