diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/x_name.c')
-rw-r--r-- | src/lib/libcrypto/asn1/x_name.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c index 4563a51348..4c698ac2f0 100644 --- a/src/lib/libcrypto/asn1/x_name.c +++ b/src/lib/libcrypto/asn1/x_name.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_name.c,v 1.36 2021/11/01 20:53:08 tb Exp $ */ | 1 | /* $OpenBSD: x_name.c,v 1.37 2021/12/25 13:17:48 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -257,7 +257,7 @@ x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it) | |||
257 | *val = (ASN1_VALUE *)ret; | 257 | *val = (ASN1_VALUE *)ret; |
258 | return 1; | 258 | return 1; |
259 | 259 | ||
260 | memerr: | 260 | memerr: |
261 | ASN1error(ERR_R_MALLOC_FAILURE); | 261 | ASN1error(ERR_R_MALLOC_FAILURE); |
262 | if (ret) { | 262 | if (ret) { |
263 | if (ret->entries) | 263 | if (ret->entries) |
@@ -337,7 +337,7 @@ x509_name_ex_d2i(ASN1_VALUE **val, const unsigned char **in, long len, | |||
337 | *in = p; | 337 | *in = p; |
338 | return ret; | 338 | return ret; |
339 | 339 | ||
340 | err: | 340 | err: |
341 | if (nm.x != NULL) | 341 | if (nm.x != NULL) |
342 | X509_NAME_free(nm.x); | 342 | X509_NAME_free(nm.x); |
343 | ASN1error(ERR_R_NESTED_ASN1_ERROR); | 343 | ASN1error(ERR_R_NESTED_ASN1_ERROR); |
@@ -422,7 +422,7 @@ x509_name_encode(X509_NAME *a) | |||
422 | a->modified = 0; | 422 | a->modified = 0; |
423 | return len; | 423 | return len; |
424 | 424 | ||
425 | memerr: | 425 | memerr: |
426 | sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s, | 426 | sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s, |
427 | local_sk_X509_NAME_ENTRY_free); | 427 | local_sk_X509_NAME_ENTRY_free); |
428 | ASN1error(ERR_R_MALLOC_FAILURE); | 428 | ASN1error(ERR_R_MALLOC_FAILURE); |
@@ -512,7 +512,7 @@ x509_name_canon(X509_NAME *a) | |||
512 | i2d_name_canon(intname, &p); | 512 | i2d_name_canon(intname, &p); |
513 | ret = 1; | 513 | ret = 1; |
514 | 514 | ||
515 | err: | 515 | err: |
516 | if (tmpentry) | 516 | if (tmpentry) |
517 | X509_NAME_ENTRY_free(tmpentry); | 517 | X509_NAME_ENTRY_free(tmpentry); |
518 | if (intname) | 518 | if (intname) |