Remove ECDH errors

Much like the ECDSA errors, the ECDH errors have been unused for a
while. Garbage collect them.

ok jsing

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 5e6cd43..030efb1 100644 (file)
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.141 2023/07/28 09:08:31 tb Exp $
+# $OpenBSD: Makefile,v 1.142 2023/07/28 09:19:58 tb Exp $
 
 LIB=   crypto
 LIBREBUILD=y
@@ -353,7 +353,6 @@ SRCS+= ecx_methods.c
 
 # ecdh/
 SRCS+= ecdh.c
-SRCS+= ech_err.c
 SRCS+= ech_lib.c
 
 # ecdsa/

diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 5aed850..b9338fe 100644 (file)
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -1332,7 +1332,6 @@ ERR_load_CRYPTO_strings
 ERR_load_DH_strings
 ERR_load_DSA_strings
 ERR_load_DSO_strings
-ERR_load_ECDH_strings
 ERR_load_EC_strings
 ERR_load_ENGINE_strings
 ERR_load_ERR_strings

diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace
index d57a725..9ad2aa2 100644 (file)
--- a/lib/libcrypto/Symbols.namespace
+++ b/lib/libcrypto/Symbols.namespace
@@ -1645,7 +1645,6 @@ _libre_ECDH_compute_key
 _libre_ECDH_get_ex_new_index
 _libre_ECDH_set_ex_data
 _libre_ECDH_get_ex_data
-_libre_ERR_load_ECDH_strings
 _libre_PEM_get_EVP_CIPHER_INFO
 _libre_PEM_do_header
 _libre_PEM_read_bio

diff --git a/lib/libcrypto/ecdh/ecdh.h b/lib/libcrypto/ecdh/ecdh.h
index 98cc222..a5e32be 100644 (file)
--- a/lib/libcrypto/ecdh/ecdh.h
+++ b/lib/libcrypto/ecdh/ecdh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdh.h,v 1.7 2023/04/18 08:33:43 tb Exp $ */
+/* $OpenBSD: ecdh.h,v 1.8 2023/07/28 09:19:59 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -99,23 +99,6 @@ int    ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new
 int      ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
 void     *ECDH_get_ex_data(EC_KEY *d, int idx);
 
-
-void ERR_load_ECDH_strings(void);
-
-/* Error codes for the ECDH functions. */
-
-/* Function codes. */
-#define ECDH_F_ECDH_CHECK                               102
-#define ECDH_F_ECDH_COMPUTE_KEY                                 100
-#define ECDH_F_ECDH_DATA_NEW_METHOD                     101
-
-/* Reason codes. */
-#define ECDH_R_KDF_FAILED                               102
-#define ECDH_R_KEY_TRUNCATION                           104
-#define ECDH_R_NON_FIPS_METHOD                          103
-#define ECDH_R_NO_PRIVATE_VALUE                                 100
-#define ECDH_R_POINT_ARITHMETIC_FAILURE                         101
-
 #ifdef  __cplusplus
 }
 #endif

diff --git a/lib/libcrypto/ecdh/ech_err.c b/lib/libcrypto/ecdh/ech_err.c
deleted file mode 100644 (file)
index 1b194fe..0000000
--- a/lib/libcrypto/ecdh/ech_err.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $OpenBSD: ech_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/err.h>
-#include <openssl/ecdh.h>
-
-#ifndef OPENSSL_NO_ERR
-
-#define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDH,func,0)
-#define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDH,0,reason)
-
-static ERR_STRING_DATA ECDH_str_functs[]= {
-       {ERR_FUNC(0xfff), "CRYPTO_internal"},
-       {0, NULL}
-};
-
-static ERR_STRING_DATA ECDH_str_reasons[]= {
-       {ERR_REASON(ECDH_R_KDF_FAILED)           , "KDF failed"},
-       {ERR_REASON(ECDH_R_KEY_TRUNCATION), "key would be truncated"},
-       {ERR_REASON(ECDH_R_NON_FIPS_METHOD)      , "non fips method"},
-       {ERR_REASON(ECDH_R_NO_PRIVATE_VALUE)     , "no private value"},
-       {ERR_REASON(ECDH_R_POINT_ARITHMETIC_FAILURE), "point arithmetic failure"},
-       {0, NULL}
-};
-
-#endif
-
-void
-ERR_load_ECDH_strings(void)
-{
-#ifndef OPENSSL_NO_ERR
-       if (ERR_func_error_string(ECDH_str_functs[0].error) == NULL) {
-               ERR_load_strings(0, ECDH_str_functs);
-               ERR_load_strings(0, ECDH_str_reasons);
-       }
-#endif
-}
-LCRYPTO_ALIAS(ERR_load_ECDH_strings);

diff --git a/lib/libcrypto/err/err_all.c b/lib/libcrypto/err/err_all.c
index b251b20..01c58f3 100644 (file)
--- a/lib/libcrypto/err/err_all.c
+++ b/lib/libcrypto/err/err_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err_all.c,v 1.30 2023/07/28 09:01:25 tb Exp $ */
+/* $OpenBSD: err_all.c,v 1.31 2023/07/28 09:19:59 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -92,9 +92,6 @@
 #ifndef OPENSSL_NO_EC
 #include <openssl/ec.h>
 #endif
-#ifndef OPENSSL_NO_ECDH
-#include <openssl/ecdh.h>
-#endif
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
@@ -132,9 +129,6 @@ ERR_load_crypto_strings_internal(void)
        ERR_load_DSA_strings();
 #endif
        ERR_load_DSO_strings();
-#ifndef OPENSSL_NO_ECDH
-       ERR_load_ECDH_strings();
-#endif
 #ifndef OPENSSL_NO_EC
        ERR_load_EC_strings();
 #endif