generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Oops!

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-08-05 15:32:10 +00:00
parent f10f4447da
commit bc32dbbea9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/pkcs12/pkcs12.h
View File

@ -230,11 +230,8 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
const EVP_MD *md_type); const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
int saltlen, const EVP_MD *md_type); int saltlen, const EVP_MD *md_type);
<<<<<<< pkcs12.h
=======
unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen); unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
char *OPENSSL_uni2asc(unsigned char *uni, int unilen); char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
>>>>>>> 1.44
DECLARE_ASN1_FUNCTIONS(PKCS12) DECLARE_ASN1_FUNCTIONS(PKCS12)
DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA) DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)