summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-08-31 10:04:50 +0000
committertb <>2024-08-31 10:04:50 +0000
commitcf990729bb0ca39b29eb14c7b0d0c21e13a23da1 (patch)
tree3684a0944d780e456a172e4d5e95ab411cb5d4cf
parentd4f7c9504448480d32c75f0a1361436d34de97dc (diff)
downloadopenbsd-cf990729bb0ca39b29eb14c7b0d0c21e13a23da1.tar.gz
openbsd-cf990729bb0ca39b29eb14c7b0d0c21e13a23da1.tar.bz2
openbsd-cf990729bb0ca39b29eb14c7b0d0c21e13a23da1.zip
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
-rw-r--r--src/lib/libcrypto/x509/x509_conf.c17
-rw-r--r--src/lib/libcrypto/x509/x509_local.h4
2 files changed, 2 insertions, 19 deletions
diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c
index c8917f7ef7..51f92d43e4 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.26 2024/08/31 10:03:03 tb Exp $ */ 1/* $OpenBSD: x509_conf.c,v 1.27 2024/08/31 10:04:50 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 */
@@ -404,14 +404,6 @@ X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
404} 404}
405LCRYPTO_ALIAS(X509V3_EXT_REQ_add_nconf); 405LCRYPTO_ALIAS(X509V3_EXT_REQ_add_nconf);
406 406
407/* XXX - remove in next bump. */
408char *
409X509V3_get_string(X509V3_CTX *ctx, const char *name, const char *section)
410{
411 X509V3error(ERR_R_DISABLED);
412 return NULL;
413}
414
415STACK_OF(CONF_VALUE) * 407STACK_OF(CONF_VALUE) *
416X509V3_get_section(X509V3_CTX *ctx, const char *section) 408X509V3_get_section(X509V3_CTX *ctx, const char *section)
417{ 409{
@@ -422,13 +414,6 @@ X509V3_get_section(X509V3_CTX *ctx, const char *section)
422 return NCONF_get_section(ctx->db, section); 414 return NCONF_get_section(ctx->db, section);
423} 415}
424 416
425/* XXX - remove in next bump. */
426void
427X509V3_string_free(X509V3_CTX *ctx, char *str)
428{
429 return;
430}
431
432void 417void
433X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section) 418X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section)
434{ 419{
diff --git a/src/lib/libcrypto/x509/x509_local.h b/src/lib/libcrypto/x509/x509_local.h
index d232a54a21..b5a02b1146 100644
--- a/src/lib/libcrypto/x509/x509_local.h
+++ b/src/lib/libcrypto/x509/x509_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_local.h,v 1.27 2024/08/31 10:03:03 tb Exp $ */ 1/* $OpenBSD: x509_local.h,v 1.28 2024/08/31 10:04:50 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 2013. 3 * project 2013.
4 */ 4 */
@@ -430,9 +430,7 @@ int X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
430int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool); 430int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool);
431int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint); 431int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint);
432 432
433char *X509V3_get_string(X509V3_CTX *ctx, const char *name, const char *section);
434STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, const char *section); 433STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, const char *section);
435void X509V3_string_free(X509V3_CTX *ctx, char *str);
436void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section); 434void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
437 435
438const X509V3_EXT_METHOD *x509v3_ext_method_authority_key_identifier(void); 436const X509V3_EXT_METHOD *x509v3_ext_method_authority_key_identifier(void);