diff options
| author | tb <> | 2026-09-02 07:09:48 +0000 |
|---|---|---|
| committer | tb <> | 2026-09-02 07:09:48 +0000 |
| commit | 62ac7c7e0f7e0999c4900d052da38ef7438bbc38 (patch) | |
| tree | 6a10c09b1493552d0f586fcb0d1946c21a131965 /src/lib/libcrypto | |
| parent | b5b8cb6169521cf1c75580c5beb54a0b73232716 (diff) | |
| download | openbsd-62ac7c7e0f7e0999c4900d052da38ef7438bbc38.tar.gz openbsd-62ac7c7e0f7e0999c4900d052da38ef7438bbc38.tar.bz2 openbsd-62ac7c7e0f7e0999c4900d052da38ef7438bbc38.zip | |
asn_multi: rename bad label to err
Diffstat (limited to 'src/lib/libcrypto')
| -rw-r--r-- | src/lib/libcrypto/asn1/asn1_gen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/asn1/asn1_gen.c b/src/lib/libcrypto/asn1/asn1_gen.c index a8b91d3b3d..5088af86d7 100644 --- a/src/lib/libcrypto/asn1/asn1_gen.c +++ b/src/lib/libcrypto/asn1/asn1_gen.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: asn1_gen.c,v 1.31 2026/09/02 07:08:36 tb Exp $ */ | 1 | /* $OpenBSD: asn1_gen.c,v 1.32 2026/09/02 07:09:48 tb 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 2002. | 3 | * project 2002. |
| 4 | */ | 4 | */ |
| @@ -445,20 +445,20 @@ asn1_multi(int utype, const char *section, X509V3_CTX *cnf) | |||
| 445 | int i; | 445 | int i; |
| 446 | sk = sk_ASN1_TYPE_new_null(); | 446 | sk = sk_ASN1_TYPE_new_null(); |
| 447 | if (!sk) | 447 | if (!sk) |
| 448 | goto bad; | 448 | goto err; |
| 449 | if (section) { | 449 | if (section) { |
| 450 | if (!cnf) | 450 | if (!cnf) |
| 451 | goto bad; | 451 | goto err; |
| 452 | sect = X509V3_get0_section(cnf, section); | 452 | sect = X509V3_get0_section(cnf, section); |
| 453 | if (!sect) | 453 | if (!sect) |
| 454 | goto bad; | 454 | goto err; |
| 455 | for (i = 0; i < sk_CONF_VALUE_num(sect); i++) { | 455 | for (i = 0; i < sk_CONF_VALUE_num(sect); i++) { |
| 456 | CONF_VALUE *val = sk_CONF_VALUE_value(sect, i); | 456 | CONF_VALUE *val = sk_CONF_VALUE_value(sect, i); |
| 457 | 457 | ||
| 458 | if ((typ = ASN1_generate_v3(val->value, cnf)) == NULL) | 458 | if ((typ = ASN1_generate_v3(val->value, cnf)) == NULL) |
| 459 | goto bad; | 459 | goto err; |
| 460 | if (sk_ASN1_TYPE_push(sk, typ) <= 0) | 460 | if (sk_ASN1_TYPE_push(sk, typ) <= 0) |
| 461 | goto bad; | 461 | goto err; |
| 462 | typ = NULL; | 462 | typ = NULL; |
| 463 | } | 463 | } |
| 464 | } | 464 | } |
| @@ -470,23 +470,23 @@ asn1_multi(int utype, const char *section, X509V3_CTX *cnf) | |||
| 470 | derlen = i2d_ASN1_SEQUENCE_ANY(sk, &der); | 470 | derlen = i2d_ASN1_SEQUENCE_ANY(sk, &der); |
| 471 | 471 | ||
| 472 | if (derlen < 0) | 472 | if (derlen < 0) |
| 473 | goto bad; | 473 | goto err; |
| 474 | 474 | ||
| 475 | if ((astr = ASN1_STRING_type_new(utype)) == NULL) | 475 | if ((astr = ASN1_STRING_type_new(utype)) == NULL) |
| 476 | goto bad; | 476 | goto err; |
| 477 | ASN1_STRING_set0(astr, der, derlen); | 477 | ASN1_STRING_set0(astr, der, derlen); |
| 478 | der = NULL; | 478 | der = NULL; |
| 479 | derlen = 0; | 479 | derlen = 0; |
| 480 | 480 | ||
| 481 | if ((typ = ASN1_TYPE_new()) == NULL) | 481 | if ((typ = ASN1_TYPE_new()) == NULL) |
| 482 | goto bad; | 482 | goto err; |
| 483 | ASN1_TYPE_set(typ, utype, astr); | 483 | ASN1_TYPE_set(typ, utype, astr); |
| 484 | astr = NULL; | 484 | astr = NULL; |
| 485 | 485 | ||
| 486 | ret = typ; | 486 | ret = typ; |
| 487 | typ = NULL; | 487 | typ = NULL; |
| 488 | 488 | ||
| 489 | bad: | 489 | err: |
| 490 | free(der); | 490 | free(der); |
| 491 | sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free); | 491 | sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free); |
| 492 | ASN1_TYPE_free(typ); | 492 | ASN1_TYPE_free(typ); |
