diff options
author | beck <> | 2000-03-19 11:13:58 +0000 |
---|---|---|
committer | beck <> | 2000-03-19 11:13:58 +0000 |
commit | 796d609550df3a33fc11468741c5d2f6d3df4c11 (patch) | |
tree | 6c6d539061caa20372dad0ac4ddb1dfae2fbe7fe /src/lib/libcrypto/x509v3/v3_akey.c | |
parent | 5be3114c1fd7e0dfea1e38d3abb4cbba75244419 (diff) | |
download | openbsd-796d609550df3a33fc11468741c5d2f6d3df4c11.tar.gz openbsd-796d609550df3a33fc11468741c5d2f6d3df4c11.tar.bz2 openbsd-796d609550df3a33fc11468741c5d2f6d3df4c11.zip |
OpenSSL 0.9.5 merge
*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_akey.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_akey.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c index 4099e6019e..96c04fe4f5 100644 --- a/src/lib/libcrypto/x509v3/v3_akey.c +++ b/src/lib/libcrypto/x509v3/v3_akey.c | |||
@@ -129,10 +129,10 @@ AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(AUTHORITY_KEYID **a, unsigned char **pp, | |||
129 | void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a) | 129 | void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a) |
130 | { | 130 | { |
131 | if (a == NULL) return; | 131 | if (a == NULL) return; |
132 | ASN1_OCTET_STRING_free(a->keyid); | 132 | M_ASN1_OCTET_STRING_free(a->keyid); |
133 | sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free); | 133 | sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free); |
134 | ASN1_INTEGER_free (a->serial); | 134 | M_ASN1_INTEGER_free (a->serial); |
135 | Free ((char *)a); | 135 | Free (a); |
136 | } | 136 | } |
137 | 137 | ||
138 | static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | 138 | static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, |
@@ -214,7 +214,7 @@ if(keyid) { | |||
214 | 214 | ||
215 | if((issuer && !ikeyid) || (issuer == 2)) { | 215 | if((issuer && !ikeyid) || (issuer == 2)) { |
216 | isname = X509_NAME_dup(X509_get_issuer_name(cert)); | 216 | isname = X509_NAME_dup(X509_get_issuer_name(cert)); |
217 | serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert)); | 217 | serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert)); |
218 | if(!isname || !serial) { | 218 | if(!isname || !serial) { |
219 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS); | 219 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS); |
220 | goto err; | 220 | goto err; |
@@ -241,8 +241,8 @@ return akeyid; | |||
241 | 241 | ||
242 | err: | 242 | err: |
243 | X509_NAME_free(isname); | 243 | X509_NAME_free(isname); |
244 | ASN1_INTEGER_free(serial); | 244 | M_ASN1_INTEGER_free(serial); |
245 | ASN1_OCTET_STRING_free(ikeyid); | 245 | M_ASN1_OCTET_STRING_free(ikeyid); |
246 | return NULL; | 246 | return NULL; |
247 | 247 | ||
248 | } | 248 | } |