aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/pkcs12.h
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>1999-04-19 16:30:06 +0000
committerUlf Möller <ulf@openssl.org>1999-04-19 16:30:06 +0000
commit0ae645db10bdd05aa66ded0cb68048a860d5ea5d (patch)
tree51a053f92ddf58ddd884cc10d2e3ea454fa54af5 /crypto/pkcs12/pkcs12.h
parent434c5dd37caacbd2436eaf8f32f4be5b9e769ce4 (diff)
downloadopenssl-0ae645db10bdd05aa66ded0cb68048a860d5ea5d.tar.gz
Clean up prototypes (prepare for removing NOPROTO).
Diffstat (limited to 'crypto/pkcs12/pkcs12.h')
-rw-r--r--crypto/pkcs12/pkcs12.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 98a5d1cb35..8f7a5b5ce6 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -210,7 +210,6 @@ int PKCS12_key_gen_asc(unsigned char *pass, int passlen, unsigned char *salt, in
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);
int PKCS12_verify_mac(PKCS12 *p12, unsigned char *pass, int passlen);
int PKCS12_set_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, EVP_MD *md_type);