Replace the macros in asn1.h with function equivalents. Also make UTF8Strings
tolerated in certificates.
This commit is contained in:
@@ -69,11 +69,11 @@ PKCS12 *PKCS12_init (int mode)
|
||||
PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
}
|
||||
if (!(pkcs12->version = ASN1_INTEGER_new ())) {
|
||||
if (!(pkcs12->version = M_ASN1_INTEGER_new ())) {
|
||||
PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
}
|
||||
ASN1_INTEGER_set (pkcs12->version, 3);
|
||||
ASN1_INTEGER_set(pkcs12->version, 3);
|
||||
if (!(pkcs12->authsafes = PKCS7_new())) {
|
||||
PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
@@ -82,7 +82,7 @@ PKCS12 *PKCS12_init (int mode)
|
||||
switch (mode) {
|
||||
case NID_pkcs7_data:
|
||||
if (!(pkcs12->authsafes->d.data =
|
||||
ASN1_OCTET_STRING_new())) {
|
||||
M_ASN1_OCTET_STRING_new())) {
|
||||
PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user