7 files changed, 4 insertions, 132 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index b9cb2eddce..64bdb97eef 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.139 2023/07/21 09:04:23 tb Exp $
+# $OpenBSD: Makefile,v 1.140 2023/07/28 09:01:25 tb Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -357,7 +357,6 @@ SRCS+= ech_err.c
 SRCS+= ech_lib.c
 
 # ecdsa/
-SRCS+= ecs_err.c
 SRCS+= ecs_lib.c
 SRCS+= ecdsa.c
 
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 00d9cfa65e..3cb83777ce 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1347,7 +1347,6 @@ ERR_load_DH_strings
 ERR_load_DSA_strings
 ERR_load_DSO_strings
 ERR_load_ECDH_strings
-ERR_load_ECDSA_strings
 ERR_load_EC_strings
 ERR_load_ENGINE_strings
 ERR_load_ERR_strings
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index 186e065ba2..ede2752b88 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -1444,7 +1444,6 @@ _libre_EC_KEY_METHOD_set_sign
 _libre_EC_KEY_METHOD_set_verify
 _libre_EC_KEY_METHOD_get_sign
 _libre_EC_KEY_METHOD_get_verify
-_libre_ERR_load_ECDSA_strings
 _libre_HKDF
 _libre_HKDF_extract
 _libre_HKDF_expand
diff --git a/src/lib/libcrypto/ecdsa/ecdsa.h b/src/lib/libcrypto/ecdsa/ecdsa.h
index 9960a4b1ea..122b0eb000 100644
--- a/src/lib/libcrypto/ecdsa/ecdsa.h
+++ b/src/lib/libcrypto/ecdsa/ecdsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdsa.h,v 1.17 2023/07/28 08:49:43 tb Exp $ */
+/* $OpenBSD: ecdsa.h,v 1.18 2023/07/28 09:01:25 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -157,27 +157,6 @@ void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
     int (**pverify_sig)(const unsigned char *dgst, int dgst_len,
         const ECDSA_SIG *sig, EC_KEY *eckey));
 
-void ERR_load_ECDSA_strings(void);
-
-/* Error codes for the ECDSA functions. */
-
-/* Function codes. */
-#define ECDSA_F_ECDSA_CHECK                              104
-#define ECDSA_F_ECDSA_DATA_NEW_METHOD                    100
-#define ECDSA_F_ECDSA_DO_SIGN                            101
-#define ECDSA_F_ECDSA_DO_VERIFY                          102
-#define ECDSA_F_ECDSA_SIGN_SETUP                         103
-
-/* Reason codes. */
-#define ECDSA_R_BAD_SIGNATURE                            100
-#define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE              101
-#define ECDSA_R_ERR_EC_LIB                               102
-#define ECDSA_R_MISSING_PARAMETERS                       103
-#define ECDSA_R_NEED_NEW_SETUP_VALUES                    106
-#define ECDSA_R_NON_FIPS_METHOD                          107
-#define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED          104
-#define ECDSA_R_SIGNATURE_MALLOC_FAILED                  105
-
 #ifdef  __cplusplus
 }
 #endif
diff --git a/src/lib/libcrypto/ecdsa/ecs_err.c b/src/lib/libcrypto/ecdsa/ecs_err.c
deleted file mode 100644
index 54d2f3f6ef..0000000000
--- a/src/lib/libcrypto/ecdsa/ecs_err.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $OpenBSD: ecs_err.c,v 1.8 2023/07/07 13:54:45 beck Exp $ */
-/* ====================================================================
- * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-
-#include <openssl/opensslconf.h>
-
-#include <openssl/ecdsa.h>
-#include <openssl/err.h>
-
-#ifndef OPENSSL_NO_ERR
-
-#define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDSA,func,0)
-#define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDSA,0,reason)
-
-static ERR_STRING_DATA ECDSA_str_functs[]= {
-        {ERR_FUNC(0xfff), "CRYPTO_internal"},
-        {0, NULL}
-};
-
-static ERR_STRING_DATA ECDSA_str_reasons[]= {
-        {ERR_REASON(ECDSA_R_BAD_SIGNATURE)       , "bad signature"},
-        {ERR_REASON(ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE), "data too large for key size"},
-        {ERR_REASON(ECDSA_R_ERR_EC_LIB)          , "err ec lib"},
-        {ERR_REASON(ECDSA_R_MISSING_PARAMETERS)  , "missing parameters"},
-        {ERR_REASON(ECDSA_R_NEED_NEW_SETUP_VALUES), "need new setup values"},
-        {ERR_REASON(ECDSA_R_NON_FIPS_METHOD)     , "non fips method"},
-        {ERR_REASON(ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED), "random number generation failed"},
-        {ERR_REASON(ECDSA_R_SIGNATURE_MALLOC_FAILED), "signature malloc failed"},
-        {0, NULL}
-};
-
-#endif
-
-void
-ERR_load_ECDSA_strings(void)
-{
-#ifndef OPENSSL_NO_ERR
-        if (ERR_func_error_string(ECDSA_str_functs[0].error) == NULL) {
-                ERR_load_strings(0, ECDSA_str_functs);
-                ERR_load_strings(0, ECDSA_str_reasons);
-        }
-#endif
-}
-LCRYPTO_ALIAS(ERR_load_ECDSA_strings);
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index 12a0fcd329..b251b205f1 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err_all.c,v 1.29 2023/07/07 13:54:45 beck Exp $ */
+/* $OpenBSD: err_all.c,v 1.30 2023/07/28 09:01:25 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -95,9 +95,6 @@
 #ifndef OPENSSL_NO_ECDH
 #include <openssl/ecdh.h>
 #endif
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
@@ -138,9 +135,6 @@ ERR_load_crypto_strings_internal(void)
 #ifndef OPENSSL_NO_ECDH
         ERR_load_ECDH_strings();
 #endif
-#ifndef OPENSSL_NO_ECDSA
-        ERR_load_ECDSA_strings();
-#endif
 #ifndef OPENSSL_NO_EC
         ERR_load_EC_strings();
 #endif
diff --git a/src/lib/libcrypto/hidden/openssl/ecdsa.h b/src/lib/libcrypto/hidden/openssl/ecdsa.h
index b2563ed37d..90860bf16d 100644
--- a/src/lib/libcrypto/hidden/openssl/ecdsa.h
+++ b/src/lib/libcrypto/hidden/openssl/ecdsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdsa.h,v 1.3 2023/07/28 08:49:43 tb Exp $ */
+/* $OpenBSD: ecdsa.h,v 1.4 2023/07/28 09:01:25 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -49,6 +49,5 @@ LCRYPTO_USED(EC_KEY_METHOD_set_sign);
 LCRYPTO_USED(EC_KEY_METHOD_set_verify);
 LCRYPTO_USED(EC_KEY_METHOD_get_sign);
 LCRYPTO_USED(EC_KEY_METHOD_get_verify);
-LCRYPTO_USED(ERR_load_ECDSA_strings);
 
 #endif /* _LIBCRYPTO_ECDSA_H */