diff options
| author | tb <> | 2024-06-18 09:41:33 +0000 |
|---|---|---|
| committer | tb <> | 2024-06-18 09:41:33 +0000 |
| commit | b16993b68ead4bf2467c39ab91fc6770abb3f186 (patch) | |
| tree | 788638bfa9d1092371fb0e573d86082eb68bd730 /src | |
| parent | 9a14209f7db4774aac0f2bca8ead52c3a89304a6 (diff) | |
| download | openbsd-b16993b68ead4bf2467c39ab91fc6770abb3f186.tar.gz openbsd-b16993b68ead4bf2467c39ab91fc6770abb3f186.tar.bz2 openbsd-b16993b68ead4bf2467c39ab91fc6770abb3f186.zip | |
v3_generic_extension() rename the X509_EXTENSION
now that ext is free, we can use it like everywhere else
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_conf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c index 3b87035d3a..31cff79e62 100644 --- a/src/lib/libcrypto/x509/x509_conf.c +++ b/src/lib/libcrypto/x509/x509_conf.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_conf.c,v 1.15 2024/06/18 09:35:09 tb Exp $ */ | 1 | /* $OpenBSD: x509_conf.c,v 1.16 2024/06/18 09:41:33 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 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -291,7 +291,7 @@ v3_generic_extension(const char *name, const char *value, int crit, int gen_type | |||
| 291 | long ext_len = 0; | 291 | long ext_len = 0; |
| 292 | ASN1_OBJECT *obj = NULL; | 292 | ASN1_OBJECT *obj = NULL; |
| 293 | ASN1_OCTET_STRING *oct = NULL; | 293 | ASN1_OCTET_STRING *oct = NULL; |
| 294 | X509_EXTENSION *extension = NULL; | 294 | X509_EXTENSION *ext = NULL; |
| 295 | 295 | ||
| 296 | if ((obj = OBJ_txt2obj(name, 0)) == NULL) { | 296 | if ((obj = OBJ_txt2obj(name, 0)) == NULL) { |
| 297 | X509V3error(X509V3_R_EXTENSION_NAME_ERROR); | 297 | X509V3error(X509V3_R_EXTENSION_NAME_ERROR); |
| @@ -323,13 +323,14 @@ v3_generic_extension(const char *name, const char *value, int crit, int gen_type | |||
| 323 | oct->length = ext_len; | 323 | oct->length = ext_len; |
| 324 | ext_der = NULL; | 324 | ext_der = NULL; |
| 325 | 325 | ||
| 326 | extension = X509_EXTENSION_create_by_OBJ(NULL, obj, crit, oct); | 326 | ext = X509_EXTENSION_create_by_OBJ(NULL, obj, crit, oct); |
| 327 | 327 | ||
| 328 | err: | 328 | err: |
| 329 | ASN1_OBJECT_free(obj); | 329 | ASN1_OBJECT_free(obj); |
| 330 | ASN1_OCTET_STRING_free(oct); | 330 | ASN1_OCTET_STRING_free(oct); |
| 331 | free(ext_der); | 331 | free(ext_der); |
| 332 | return extension; | 332 | |
| 333 | return ext; | ||
| 333 | } | 334 | } |
| 334 | 335 | ||
| 335 | static unsigned char * | 336 | static unsigned char * |
