From e6ec7919f70f22021fc29a98f165fd18d5a7ccd0 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Fri, 28 Jul 2023 09:16:17 +0000
Subject: Merge ecdsa.h into ec.h

Move the remaining ECDSA API into ec.h to match OpenSSL 1.1's interface
better.  In particular, the EC_KEY sign and verify method accessors are
moved to the right header. Whether the rest of the ECDSA stuff belongs
there is debatable, but that was upstream's choice.

ok jsing
---
 src/lib/libcrypto/hidden/openssl/ec.h    | 19 ++++++++++++-
 src/lib/libcrypto/hidden/openssl/ecdsa.h | 46 --------------------------------
 2 files changed, 18 insertions(+), 47 deletions(-)
 delete mode 100644 src/lib/libcrypto/hidden/openssl/ecdsa.h

(limited to 'src/lib/libcrypto/hidden/openssl')

diff --git a/src/lib/libcrypto/hidden/openssl/ec.h b/src/lib/libcrypto/hidden/openssl/ec.h
index 5e4121eac3..d2d65945e5 100644
--- a/src/lib/libcrypto/hidden/openssl/ec.h
+++ b/src/lib/libcrypto/hidden/openssl/ec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.h,v 1.2 2023/07/07 19:37:54 beck Exp $ */
+/* $OpenBSD: ec.h,v 1.3 2023/07/28 09:16:17 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -132,14 +132,31 @@ LCRYPTO_USED(EC_KEY_set_default_method);
 LCRYPTO_USED(EC_KEY_get_method);
 LCRYPTO_USED(EC_KEY_set_method);
 LCRYPTO_USED(EC_KEY_new_method);
+LCRYPTO_USED(ECDSA_SIG_new);
+LCRYPTO_USED(ECDSA_SIG_free);
+LCRYPTO_USED(i2d_ECDSA_SIG);
+LCRYPTO_USED(d2i_ECDSA_SIG);
+LCRYPTO_USED(ECDSA_SIG_get0_r);
+LCRYPTO_USED(ECDSA_SIG_get0_s);
+LCRYPTO_USED(ECDSA_SIG_get0);
+LCRYPTO_USED(ECDSA_SIG_set0);
+LCRYPTO_USED(ECDSA_size);
+LCRYPTO_USED(ECDSA_do_sign);
+LCRYPTO_USED(ECDSA_do_verify);
+LCRYPTO_USED(ECDSA_sign);
+LCRYPTO_USED(ECDSA_verify);
 LCRYPTO_USED(EC_KEY_METHOD_new);
 LCRYPTO_USED(EC_KEY_METHOD_free);
 LCRYPTO_USED(EC_KEY_METHOD_set_init);
 LCRYPTO_USED(EC_KEY_METHOD_set_keygen);
 LCRYPTO_USED(EC_KEY_METHOD_set_compute_key);
+LCRYPTO_USED(EC_KEY_METHOD_set_sign);
+LCRYPTO_USED(EC_KEY_METHOD_set_verify);
 LCRYPTO_USED(EC_KEY_METHOD_get_init);
 LCRYPTO_USED(EC_KEY_METHOD_get_keygen);
 LCRYPTO_USED(EC_KEY_METHOD_get_compute_key);
+LCRYPTO_USED(EC_KEY_METHOD_get_sign);
+LCRYPTO_USED(EC_KEY_METHOD_get_verify);
 LCRYPTO_USED(ECParameters_dup);
 LCRYPTO_USED(ERR_load_EC_strings);
 
diff --git a/src/lib/libcrypto/hidden/openssl/ecdsa.h b/src/lib/libcrypto/hidden/openssl/ecdsa.h
deleted file mode 100644
index 5846906be9..0000000000
--- a/src/lib/libcrypto/hidden/openssl/ecdsa.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $OpenBSD: ecdsa.h,v 1.5 2023/07/28 09:08:31 tb Exp $ */
-/*
- * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _LIBCRYPTO_ECDSA_H
-#define _LIBCRYPTO_ECDSA_H
-
-#ifndef _MSC_VER
-#include_next <openssl/ecdsa.h>
-#else
-#include "../include/openssl/ecdsa.h"
-#endif
-#include "crypto_namespace.h"
-
-LCRYPTO_USED(ECDSA_SIG_new);
-LCRYPTO_USED(ECDSA_SIG_free);
-LCRYPTO_USED(i2d_ECDSA_SIG);
-LCRYPTO_USED(d2i_ECDSA_SIG);
-LCRYPTO_USED(ECDSA_SIG_get0);
-LCRYPTO_USED(ECDSA_SIG_get0_r);
-LCRYPTO_USED(ECDSA_SIG_get0_s);
-LCRYPTO_USED(ECDSA_SIG_set0);
-LCRYPTO_USED(ECDSA_do_sign);
-LCRYPTO_USED(ECDSA_do_verify);
-LCRYPTO_USED(ECDSA_size);
-LCRYPTO_USED(ECDSA_sign);
-LCRYPTO_USED(ECDSA_verify);
-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);
-
-#endif /* _LIBCRYPTO_ECDSA_H */
-- 
cgit v1.2.3-55-g6feb