summaryrefslogtreecommitdiff
path: root/crypto/pkcs12/p12_decr.c
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>1999-04-19 21:31:43 +0000
committerUlf Möller <ulf@openssl.org>1999-04-19 21:31:43 +0000
commit6b691a5c85ddc4e407e32781841fee5c029506cd (patch)
tree436f1127406e1cacfe83dfcbfff824d89c47d834 /crypto/pkcs12/p12_decr.c
parent3edd7ed15de229230f74c79c3d71e7c9c674cf4f (diff)
downloadopenssl-new-6b691a5c85ddc4e407e32781841fee5c029506cd.tar.gz
Change functions to ANSI C.
Diffstat (limited to 'crypto/pkcs12/p12_decr.c')
-rw-r--r--crypto/pkcs12/p12_decr.c33
1 files changed, 8 insertions, 25 deletions
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index 5dee184c7b..b96f119b7a 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -68,16 +68,9 @@
* Malloc'ed buffer
*/
-unsigned char * PKCS12_pbe_crypt (algor, pass, passlen, in, inlen,
- data, datalen, en_de)
-X509_ALGOR *algor;
-unsigned char *pass;
-int passlen;
-unsigned char *in;
-int inlen;
-unsigned char **data;
-int *datalen;
-int en_de;
+unsigned char * PKCS12_pbe_crypt (X509_ALGOR *algor, unsigned char *pass,
+ int passlen, unsigned char *in, int inlen, unsigned char **data,
+ int *datalen, int en_de)
{
unsigned char *out;
int outlen, i;
@@ -113,14 +106,9 @@ int en_de;
* as a sequence.
*/
-char * PKCS12_decrypt_d2i (algor, d2i, free_func, pass, passlen, oct, seq)
-X509_ALGOR *algor;
-char * (*d2i)();
-void (*free_func)();
-unsigned char *pass;
-int passlen;
-ASN1_OCTET_STRING *oct;
-int seq;
+char * PKCS12_decrypt_d2i (X509_ALGOR *algor, char * (*d2i)(),
+ void (*free_func)(), unsigned char *pass, int passlen,
+ ASN1_OCTET_STRING *oct, int seq)
{
unsigned char *out, *p;
char *ret;
@@ -158,13 +146,8 @@ int seq;
* as a sequence
*/
-ASN1_OCTET_STRING *PKCS12_i2d_encrypt (algor, i2d, pass, passlen, obj, seq)
-X509_ALGOR *algor;
-int (*i2d)();
-unsigned char *pass;
-int passlen;
-char *obj;
-int seq;
+ASN1_OCTET_STRING *PKCS12_i2d_encrypt (X509_ALGOR *algor, int (*i2d)(),
+ unsigned char *pass, int passlen, char *obj, int seq)
{
ASN1_OCTET_STRING *oct;
unsigned char *in, *p;