diff options
author | jsing <> | 2015-09-30 17:30:16 +0000 |
---|---|---|
committer | jsing <> | 2015-09-30 17:30:16 +0000 |
commit | 1c7e31c2bbb07475f068a459f144cb492d148ec2 (patch) | |
tree | bd42964b2b7e65328abe72ae9a01fed5d43e31bd /src/lib/libcrypto/x509v3/v3_akey.c | |
parent | 91af0933b080d8e84e238dd366f91808c0cdaae3 (diff) | |
download | openbsd-1c7e31c2bbb07475f068a459f144cb492d148ec2.tar.gz openbsd-1c7e31c2bbb07475f068a459f144cb492d148ec2.tar.bz2 openbsd-1c7e31c2bbb07475f068a459f144cb492d148ec2.zip |
Replace M_ASN1_INTEGER_(new|free) with ASN1_INTEGER_(new|free) - this is
different from the macro expansion, but the result is the same. Also
replace some ASN1_STRING_dup() with ASN1_INTEGER_dup().
ok beck@ doug@
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_akey.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_akey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c index 2a5c65ea39..2b652deee8 100644 --- a/src/lib/libcrypto/x509v3/v3_akey.c +++ b/src/lib/libcrypto/x509v3/v3_akey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_akey.c,v 1.15 2015/07/29 16:13:48 jsing Exp $ */ | 1 | /* $OpenBSD: v3_akey.c,v 1.16 2015/09/30 17:30:16 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -175,7 +175,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | |||
175 | 175 | ||
176 | if ((issuer && !ikeyid) || (issuer == 2)) { | 176 | if ((issuer && !ikeyid) || (issuer == 2)) { |
177 | isname = X509_NAME_dup(X509_get_issuer_name(cert)); | 177 | isname = X509_NAME_dup(X509_get_issuer_name(cert)); |
178 | serial = ASN1_STRING_dup(X509_get_serialNumber(cert)); | 178 | serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert)); |
179 | if (!isname || !serial) { | 179 | if (!isname || !serial) { |
180 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, | 180 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, |
181 | X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS); | 181 | X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS); |
@@ -209,7 +209,7 @@ err: | |||
209 | GENERAL_NAME_free(gen); | 209 | GENERAL_NAME_free(gen); |
210 | sk_GENERAL_NAME_free(gens); | 210 | sk_GENERAL_NAME_free(gens); |
211 | X509_NAME_free(isname); | 211 | X509_NAME_free(isname); |
212 | M_ASN1_INTEGER_free(serial); | 212 | ASN1_INTEGER_free(serial); |
213 | M_ASN1_OCTET_STRING_free(ikeyid); | 213 | M_ASN1_OCTET_STRING_free(ikeyid); |
214 | return NULL; | 214 | return NULL; |
215 | } | 215 | } |