diff options
author | tb <> | 2023-07-28 09:08:31 +0000 |
---|---|---|
committer | tb <> | 2023-07-28 09:08:31 +0000 |
commit | 5fdc6aff8969f405877cb212f681afded1f948e6 (patch) | |
tree | 9fbfcaf47aa3e6f663d8128e3944ef1c5715ad5f /src/lib/libcrypto/engine/engine.h | |
parent | 4b0019a4c482019d6ceec85774d0379f5d4f7009 (diff) | |
download | openbsd-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.h | 14 |
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); | |||
383 | void ENGINE_unregister_ECDH(ENGINE *e); | 379 | void ENGINE_unregister_ECDH(ENGINE *e); |
384 | void ENGINE_register_all_ECDH(void); | 380 | void ENGINE_register_all_ECDH(void); |
385 | 381 | ||
386 | int ENGINE_register_ECDSA(ENGINE *e); | ||
387 | void ENGINE_unregister_ECDSA(ENGINE *e); | ||
388 | void ENGINE_register_all_ECDSA(void); | ||
389 | |||
390 | int ENGINE_register_EC(ENGINE *e); | 382 | int ENGINE_register_EC(ENGINE *e); |
391 | void ENGINE_unregister_EC(ENGINE *e); | 383 | void ENGINE_unregister_EC(ENGINE *e); |
392 | void ENGINE_register_all_EC(void); | 384 | void ENGINE_register_all_EC(void); |
@@ -484,7 +476,6 @@ int ENGINE_set_name(ENGINE *e, const char *name); | |||
484 | int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth); | 476 | int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth); |
485 | int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth); | 477 | int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth); |
486 | int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth); | 478 | int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth); |
487 | int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth); | ||
488 | int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ec_meth); | 479 | int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ec_meth); |
489 | int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth); | 480 | int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth); |
490 | int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth); | 481 | int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth); |
@@ -524,7 +515,6 @@ const char *ENGINE_get_name(const ENGINE *e); | |||
524 | const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e); | 515 | const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e); |
525 | const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e); | 516 | const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e); |
526 | const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e); | 517 | const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e); |
527 | const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e); | ||
528 | const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e); | 518 | const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e); |
529 | const DH_METHOD *ENGINE_get_DH(const ENGINE *e); | 519 | const DH_METHOD *ENGINE_get_DH(const ENGINE *e); |
530 | const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e); | 520 | const 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" */ |
593 | ENGINE *ENGINE_get_default_DSA(void); | 583 | ENGINE *ENGINE_get_default_DSA(void); |
594 | ENGINE *ENGINE_get_default_ECDH(void); | 584 | ENGINE *ENGINE_get_default_ECDH(void); |
595 | ENGINE *ENGINE_get_default_ECDSA(void); | ||
596 | ENGINE *ENGINE_get_default_EC(void); | 585 | ENGINE *ENGINE_get_default_EC(void); |
597 | ENGINE *ENGINE_get_default_DH(void); | 586 | ENGINE *ENGINE_get_default_DH(void); |
598 | ENGINE *ENGINE_get_default_RAND(void); | 587 | ENGINE *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" */ |
613 | int ENGINE_set_default_DSA(ENGINE *e); | 602 | int ENGINE_set_default_DSA(ENGINE *e); |
614 | int ENGINE_set_default_ECDH(ENGINE *e); | 603 | int ENGINE_set_default_ECDH(ENGINE *e); |
615 | int ENGINE_set_default_ECDSA(ENGINE *e); | ||
616 | int ENGINE_set_default_EC(ENGINE *e); | 604 | int ENGINE_set_default_EC(ENGINE *e); |
617 | int ENGINE_set_default_DH(ENGINE *e); | 605 | int ENGINE_set_default_DH(ENGINE *e); |
618 | int ENGINE_set_default_RAND(ENGINE *e); | 606 | int ENGINE_set_default_RAND(ENGINE *e); |