summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine/engine.h
diff options
context:
space:
mode:
authortb <>2023-07-28 09:08:31 +0000
committertb <>2023-07-28 09:08:31 +0000
commit5fdc6aff8969f405877cb212f681afded1f948e6 (patch)
tree9fbfcaf47aa3e6f663d8128e3944ef1c5715ad5f /src/lib/libcrypto/engine/engine.h
parent4b0019a4c482019d6ceec85774d0379f5d4f7009 (diff)
downloadopenbsd-5fdc6aff8969f405877cb212f681afded1f948e6.tar.gz
openbsd-5fdc6aff8969f405877cb212f681afded1f948e6.tar.bz2
openbsd-5fdc6aff8969f405877cb212f681afded1f948e6.zip
Remove ECDSA_METHOD
After smtpd (in base) and libtls finally switched from ECDSA_METHOD to EC_KEY_METHOD, much of the ECDSA_METHOD code was neutered. Remove the remaining public API as well as numerous tentacles into ENGINE. ok jsing
Diffstat (limited to 'src/lib/libcrypto/engine/engine.h')
-rw-r--r--src/lib/libcrypto/engine/engine.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index 156c2f856c..dbc3718dca 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: engine.h,v 1.39 2023/07/21 09:04:23 tb Exp $ */ 1/* $OpenBSD: engine.h,v 1.40 2023/07/28 09:08:31 tb Exp $ */
2/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL 2/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -79,9 +79,6 @@
79#ifndef OPENSSL_NO_ECDH 79#ifndef OPENSSL_NO_ECDH
80#include <openssl/ecdh.h> 80#include <openssl/ecdh.h>
81#endif 81#endif
82#ifndef OPENSSL_NO_ECDSA
83#include <openssl/ecdsa.h>
84#endif
85#include <openssl/err.h> 82#include <openssl/err.h>
86#ifndef OPENSSL_NO_RSA 83#ifndef OPENSSL_NO_RSA
87#include <openssl/rsa.h> 84#include <openssl/rsa.h>
@@ -102,7 +99,6 @@ extern "C" {
102#define ENGINE_METHOD_DH (unsigned int)0x0004 99#define ENGINE_METHOD_DH (unsigned int)0x0004
103#define ENGINE_METHOD_RAND (unsigned int)0x0008 100#define ENGINE_METHOD_RAND (unsigned int)0x0008
104#define ENGINE_METHOD_ECDH (unsigned int)0x0010 101#define ENGINE_METHOD_ECDH (unsigned int)0x0010
105#define ENGINE_METHOD_ECDSA (unsigned int)0x0020
106#define ENGINE_METHOD_CIPHERS (unsigned int)0x0040 102#define ENGINE_METHOD_CIPHERS (unsigned int)0x0040
107#define ENGINE_METHOD_DIGESTS (unsigned int)0x0080 103#define ENGINE_METHOD_DIGESTS (unsigned int)0x0080
108#define ENGINE_METHOD_STORE (unsigned int)0x0100 104#define ENGINE_METHOD_STORE (unsigned int)0x0100
@@ -383,10 +379,6 @@ int ENGINE_register_ECDH(ENGINE *e);
383void ENGINE_unregister_ECDH(ENGINE *e); 379void ENGINE_unregister_ECDH(ENGINE *e);
384void ENGINE_register_all_ECDH(void); 380void ENGINE_register_all_ECDH(void);
385 381
386int ENGINE_register_ECDSA(ENGINE *e);
387void ENGINE_unregister_ECDSA(ENGINE *e);
388void ENGINE_register_all_ECDSA(void);
389
390int ENGINE_register_EC(ENGINE *e); 382int ENGINE_register_EC(ENGINE *e);
391void ENGINE_unregister_EC(ENGINE *e); 383void ENGINE_unregister_EC(ENGINE *e);
392void ENGINE_register_all_EC(void); 384void ENGINE_register_all_EC(void);
@@ -484,7 +476,6 @@ int ENGINE_set_name(ENGINE *e, const char *name);
484int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth); 476int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
485int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth); 477int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
486int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth); 478int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth);
487int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth);
488int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ec_meth); 479int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ec_meth);
489int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth); 480int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
490int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth); 481int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
@@ -524,7 +515,6 @@ const char *ENGINE_get_name(const ENGINE *e);
524const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e); 515const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);
525const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e); 516const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e);
526const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e); 517const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e);
527const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e);
528const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e); 518const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e);
529const DH_METHOD *ENGINE_get_DH(const ENGINE *e); 519const DH_METHOD *ENGINE_get_DH(const ENGINE *e);
530const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e); 520const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e);
@@ -592,7 +582,6 @@ ENGINE *ENGINE_get_default_RSA(void);
592/* Same for the other "methods" */ 582/* Same for the other "methods" */
593ENGINE *ENGINE_get_default_DSA(void); 583ENGINE *ENGINE_get_default_DSA(void);
594ENGINE *ENGINE_get_default_ECDH(void); 584ENGINE *ENGINE_get_default_ECDH(void);
595ENGINE *ENGINE_get_default_ECDSA(void);
596ENGINE *ENGINE_get_default_EC(void); 585ENGINE *ENGINE_get_default_EC(void);
597ENGINE *ENGINE_get_default_DH(void); 586ENGINE *ENGINE_get_default_DH(void);
598ENGINE *ENGINE_get_default_RAND(void); 587ENGINE *ENGINE_get_default_RAND(void);
@@ -612,7 +601,6 @@ int ENGINE_set_default_string(ENGINE *e, const char *def_list);
612/* Same for the other "methods" */ 601/* Same for the other "methods" */
613int ENGINE_set_default_DSA(ENGINE *e); 602int ENGINE_set_default_DSA(ENGINE *e);
614int ENGINE_set_default_ECDH(ENGINE *e); 603int ENGINE_set_default_ECDH(ENGINE *e);
615int ENGINE_set_default_ECDSA(ENGINE *e);
616int ENGINE_set_default_EC(ENGINE *e); 604int ENGINE_set_default_EC(ENGINE *e);
617int ENGINE_set_default_DH(ENGINE *e); 605int ENGINE_set_default_DH(ENGINE *e);
618int ENGINE_set_default_RAND(ENGINE *e); 606int ENGINE_set_default_RAND(ENGINE *e);