From: tb Date: Sat, 31 Aug 2024 10:04:50 +0000 (+0000) Subject: Remove X509V3_get_string/X509V3_string_free X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1193e1ec3669063d35a629e862c353ebcb396293;p=openbsd Remove X509V3_get_string/X509V3_string_free These have always been unused, but the db_meth abstraction hid that very well. Bye. ok beck jsing --- diff --git a/lib/libcrypto/x509/x509_conf.c b/lib/libcrypto/x509/x509_conf.c index c8917f7ef7d..51f92d43e49 100644 --- a/lib/libcrypto/x509/x509_conf.c +++ b/lib/libcrypto/x509/x509_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_conf.c,v 1.26 2024/08/31 10:03:03 tb Exp $ */ +/* $OpenBSD: x509_conf.c,v 1.27 2024/08/31 10:04:50 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -404,14 +404,6 @@ X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section, } LCRYPTO_ALIAS(X509V3_EXT_REQ_add_nconf); -/* XXX - remove in next bump. */ -char * -X509V3_get_string(X509V3_CTX *ctx, const char *name, const char *section) -{ - X509V3error(ERR_R_DISABLED); - return NULL; -} - STACK_OF(CONF_VALUE) * X509V3_get_section(X509V3_CTX *ctx, const char *section) { @@ -422,13 +414,6 @@ X509V3_get_section(X509V3_CTX *ctx, const char *section) return NCONF_get_section(ctx->db, section); } -/* XXX - remove in next bump. */ -void -X509V3_string_free(X509V3_CTX *ctx, char *str) -{ - return; -} - void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section) { diff --git a/lib/libcrypto/x509/x509_local.h b/lib/libcrypto/x509/x509_local.h index d232a54a213..b5a02b11464 100644 --- a/lib/libcrypto/x509/x509_local.h +++ b/lib/libcrypto/x509/x509_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_local.h,v 1.27 2024/08/31 10:03:03 tb Exp $ */ +/* $OpenBSD: x509_local.h,v 1.28 2024/08/31 10:04:50 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2013. */ @@ -430,9 +430,7 @@ int X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint, int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool); int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint); -char *X509V3_get_string(X509V3_CTX *ctx, const char *name, const char *section); STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, const char *section); -void X509V3_string_free(X509V3_CTX *ctx, char *str); void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section); const X509V3_EXT_METHOD *x509v3_ext_method_authority_key_identifier(void);