summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509v3
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/x509v3')
-rw-r--r--src/lib/libcrypto/x509v3/v3_akey.c6
-rw-r--r--src/lib/libcrypto/x509v3/v3_sxnet.c14
2 files changed, 10 insertions, 10 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}
diff --git a/src/lib/libcrypto/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c
index c10feed0ef..29976b1d68 100644
--- a/src/lib/libcrypto/x509v3/v3_sxnet.c
+++ b/src/lib/libcrypto/x509v3/v3_sxnet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_sxnet.c,v 1.16 2015/07/29 16:13:49 jsing Exp $ */ 1/* $OpenBSD: v3_sxnet.c,v 1.17 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 */
@@ -272,10 +272,10 @@ SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen)
272{ 272{
273 ASN1_INTEGER *izone = NULL; 273 ASN1_INTEGER *izone = NULL;
274 274
275 if (!(izone = M_ASN1_INTEGER_new()) || 275 if (!(izone = ASN1_INTEGER_new()) ||
276 !ASN1_INTEGER_set(izone, lzone)) { 276 !ASN1_INTEGER_set(izone, lzone)) {
277 X509V3err(X509V3_F_SXNET_ADD_ID_ULONG, ERR_R_MALLOC_FAILURE); 277 X509V3err(X509V3_F_SXNET_ADD_ID_ULONG, ERR_R_MALLOC_FAILURE);
278 M_ASN1_INTEGER_free(izone); 278 ASN1_INTEGER_free(izone);
279 return 0; 279 return 0;
280 } 280 }
281 return SXNET_add_id_INTEGER(psx, izone, user, userlen); 281 return SXNET_add_id_INTEGER(psx, izone, user, userlen);
@@ -350,7 +350,7 @@ SXNET_get_id_asc(SXNET *sx, char *zone)
350 return NULL; 350 return NULL;
351 } 351 }
352 oct = SXNET_get_id_INTEGER(sx, izone); 352 oct = SXNET_get_id_INTEGER(sx, izone);
353 M_ASN1_INTEGER_free(izone); 353 ASN1_INTEGER_free(izone);
354 return oct; 354 return oct;
355} 355}
356 356
@@ -360,14 +360,14 @@ SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
360 ASN1_INTEGER *izone = NULL; 360 ASN1_INTEGER *izone = NULL;
361 ASN1_OCTET_STRING *oct; 361 ASN1_OCTET_STRING *oct;
362 362
363 if (!(izone = M_ASN1_INTEGER_new()) || 363 if (!(izone = ASN1_INTEGER_new()) ||
364 !ASN1_INTEGER_set(izone, lzone)) { 364 !ASN1_INTEGER_set(izone, lzone)) {
365 X509V3err(X509V3_F_SXNET_GET_ID_ULONG, ERR_R_MALLOC_FAILURE); 365 X509V3err(X509V3_F_SXNET_GET_ID_ULONG, ERR_R_MALLOC_FAILURE);
366 M_ASN1_INTEGER_free(izone); 366 ASN1_INTEGER_free(izone);
367 return NULL; 367 return NULL;
368 } 368 }
369 oct = SXNET_get_id_INTEGER(sx, izone); 369 oct = SXNET_get_id_INTEGER(sx, izone);
370 M_ASN1_INTEGER_free(izone); 370 ASN1_INTEGER_free(izone);
371 return oct; 371 return oct;
372} 372}
373 373