PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-27 09:59:04 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade the included Windows OpenSSL to version 1.0.0a.

Browse Source
This commit is contained in:
david
2010-09-16 03:49:43 +00:00
parent 1ff33d9d50
commit 745a49d24a
81 changed files with 6225 additions and 2120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mswin32/OpenSSL/include/openssl/pkcs12.h
View File

@@ -108,8 +108,6 @@ PKCS12_MAC_DATA *mac;
PKCS7 *authsafes;
} PKCS12;
PREDECLARE_STACK_OF(PKCS12_SAFEBAG)
typedef struct {
ASN1_OBJECT *type;
union {
@@ -232,8 +230,8 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
int saltlen, const EVP_MD *md_type);
unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
char *uni2asc(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);
DECLARE_ASN1_FUNCTIONS(PKCS12)
DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)