diff options
| -rw-r--r-- | lib/libcrypto/Symbols.list | 1 | ||||
| -rw-r--r-- | lib/libcrypto/Symbols.namespace | 1 | ||||
| -rw-r--r-- | lib/libcrypto/asn1/asn1.h | 4 | ||||
| -rw-r--r-- | lib/libcrypto/asn1/asn_moid.c | 3 | ||||
| -rw-r--r-- | lib/libcrypto/conf/conf_mall.c | 10 | ||||
| -rw-r--r-- | lib/libcrypto/hidden/openssl/asn1.h | 3 |
6 files changed, 5 insertions, 17 deletions
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index e23944d189b..0e0a2eefa17 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -173,7 +173,6 @@ ASN1_UTF8STRING_new ASN1_VISIBLESTRING_free ASN1_VISIBLESTRING_it ASN1_VISIBLESTRING_new -ASN1_add_oid_module ASN1_d2i_bio ASN1_d2i_fp ASN1_dup diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace index d99d58bddc1..611165ec174 100644 --- a/lib/libcrypto/Symbols.namespace +++ b/lib/libcrypto/Symbols.namespace @@ -1097,7 +1097,6 @@ _libre_ASN1_item_new _libre_ASN1_item_free _libre_ASN1_item_d2i _libre_ASN1_item_i2d -_libre_ASN1_add_oid_module _libre_ASN1_generate_nconf _libre_ASN1_generate_v3 _libre_ASN1_item_print diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h index 15b0e3995a7..c44f85113b1 100644 --- a/lib/libcrypto/asn1/asn1.h +++ b/lib/libcrypto/asn1/asn1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1.h,v 1.88 2024/03/02 09:00:07 tb Exp $ */ +/* $OpenBSD: asn1.h,v 1.89 2024/03/02 09:02:04 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -840,8 +840,6 @@ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in, long len, const ASN1_ITEM *it); int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it); -void ASN1_add_oid_module(void); - ASN1_TYPE *ASN1_generate_nconf(const char *str, CONF *nconf); ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf); diff --git a/lib/libcrypto/asn1/asn_moid.c b/lib/libcrypto/asn1/asn_moid.c index 4da35c0e06c..68749804632 100644 --- a/lib/libcrypto/asn1/asn_moid.c +++ b/lib/libcrypto/asn1/asn_moid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn_moid.c,v 1.16 2023/07/05 21:23:36 beck Exp $ */ +/* $OpenBSD: asn_moid.c,v 1.17 2024/03/02 09:02:04 tb Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -105,7 +105,6 @@ ASN1_add_oid_module(void) { CONF_module_add("oid_section", oid_module_init, oid_module_finish); } -LCRYPTO_ALIAS(ASN1_add_oid_module); /* Create an OID based on a name value pair. Accept two formats. * shortname = 1.2.3.4 diff --git a/lib/libcrypto/conf/conf_mall.c b/lib/libcrypto/conf/conf_mall.c index e2a1d2db076..141c0abefdc 100644 --- a/lib/libcrypto/conf/conf_mall.c +++ b/lib/libcrypto/conf/conf_mall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_mall.c,v 1.10 2023/11/19 15:46:09 tb Exp $ */ +/* $OpenBSD: conf_mall.c,v 1.11 2024/03/02 09:02:04 tb Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -56,16 +56,10 @@ * */ -#include <stdio.h> - -#include <openssl/opensslconf.h> - -#include <openssl/asn1.h> #include <openssl/conf.h> -#include <openssl/crypto.h> -#include <openssl/x509.h> /* Load all OpenSSL builtin modules */ +void ASN1_add_oid_module(void); void OPENSSL_load_builtin_modules(void) diff --git a/lib/libcrypto/hidden/openssl/asn1.h b/lib/libcrypto/hidden/openssl/asn1.h index 39cb9ec6856..34790e31faa 100644 --- a/lib/libcrypto/hidden/openssl/asn1.h +++ b/lib/libcrypto/hidden/openssl/asn1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1.h,v 1.9 2024/03/02 08:54:02 tb Exp $ */ +/* $OpenBSD: asn1.h,v 1.10 2024/03/02 09:02:04 tb Exp $ */ /* * Copyright (c) 2023 Bob Beck <beck@openbsd.org> * @@ -226,7 +226,6 @@ LCRYPTO_USED(ASN1_item_new); LCRYPTO_USED(ASN1_item_free); LCRYPTO_USED(ASN1_item_d2i); LCRYPTO_USED(ASN1_item_i2d); -LCRYPTO_USED(ASN1_add_oid_module); LCRYPTO_USED(ASN1_generate_nconf); LCRYPTO_USED(ASN1_generate_v3); LCRYPTO_USED(ASN1_item_print); |