diff options
| author | Ben Laurie <ben@openssl.org> | 1999-04-17 21:25:43 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 1999-04-17 21:25:43 +0000 |
| commit | e778802f53c8d47e96a6e4cbc776eb6e1d4c461a (patch) | |
| tree | 719d4dd0fc69b355c6d8329af1f90b2c4f603548 /crypto/pkcs12 | |
| parent | d77b3054cd87c2b13fa0169931f74b8e0dac5252 (diff) | |
| download | openssl-e778802f53c8d47e96a6e4cbc776eb6e1d4c461a.tar.gz | |
Massive constification.
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_key.c | 4 | ||||
| -rw-r--r-- | crypto/pkcs12/p12_mutl.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs12/pkcs12.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index ec357860d1..3bef1fa38a 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -77,7 +77,7 @@ void h__dump (unsigned char *p, int len); 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; -EVP_MD *md_type; +const EVP_MD *md_type; { int ret; unsigned char *unipass; @@ -96,7 +96,7 @@ EVP_MD *md_type; 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; -EVP_MD *md_type; +const EVP_MD *md_type; { unsigned char *B, *D, *I, *p, *Ai; int Slen, Plen, Ilen; diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index 9acd6ce316..d860c21b52 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -70,7 +70,7 @@ int passlen; unsigned char *mac; unsigned int *maclen; { - EVP_MD *md_type; + const EVP_MD *md_type; HMAC_CTX hmac; unsigned char key[PKCS12_MAC_KEY_LENGTH], *salt; int saltlen, iter; diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 6e9ee78bd3..98a5d1cb35 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -206,8 +206,8 @@ unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, unsigned char *pass, int pass char *PKCS12_decrypt_d2i(X509_ALGOR *algor, char *(*d2i)(), void (*free_func)(), unsigned char *pass, int passlen, ASN1_STRING *oct, int seq); ASN1_STRING *PKCS12_i2d_encrypt(X509_ALGOR *algor, int (*i2d)(), unsigned char *pass, int passlen, char *obj, int seq); PKCS12 *PKCS12_init(int mode); -int PKCS12_key_gen_asc(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, 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, 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 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); int PKCS12_PBE_keyivgen(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_CIPHER *cipher, EVP_MD *md_type, unsigned char *key, unsigned char *iv); int PKCS12_gen_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *mac, unsigned int *maclen); int PKCS12_gen_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *mac, unsigned int *maclen); |