summaryrefslogtreecommitdiffstats
path: root/crypto/x509v3/v3_akey.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-10-20 01:50:23 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-10-20 01:50:23 +0000
commit08e9c1af6c26f74ef7f7524be4b89241ff232a8c (patch)
tree7fe3f66fdfb1f20a5bfcbbf98369032374f3a79b /crypto/x509v3/v3_akey.c
parent023c8d0b0aec445b680ef5aea2bd2154adb59974 (diff)
Replace the macros in asn1.h with function equivalents. Also make UTF8Strings
tolerated in certificates.
Diffstat (limited to 'crypto/x509v3/v3_akey.c')
-rw-r--r--crypto/x509v3/v3_akey.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c
index 4099e6019e..de2a577ac1 100644
--- a/crypto/x509v3/v3_akey.c
+++ b/crypto/x509v3/v3_akey.c
@@ -129,9 +129,9 @@ AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(AUTHORITY_KEYID **a, unsigned char **pp,
void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a)
{
if (a == NULL) return;
- ASN1_OCTET_STRING_free(a->keyid);
+ M_ASN1_OCTET_STRING_free(a->keyid);
sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free);
- ASN1_INTEGER_free (a->serial);
+ M_ASN1_INTEGER_free (a->serial);
Free ((char *)a);
}
@@ -214,7 +214,7 @@ if(keyid) {
if((issuer && !ikeyid) || (issuer == 2)) {
isname = X509_NAME_dup(X509_get_issuer_name(cert));
- serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert));
+ serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert));
if(!isname || !serial) {
X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
goto err;
@@ -241,8 +241,8 @@ return akeyid;
err:
X509_NAME_free(isname);
-ASN1_INTEGER_free(serial);
-ASN1_OCTET_STRING_free(ikeyid);
+M_ASN1_INTEGER_free(serial);
+M_ASN1_OCTET_STRING_free(ikeyid);
return NULL;
}