diff options
| author | tb <> | 2023-07-28 09:08:31 +0000 |
|---|---|---|
| committer | tb <> | 2023-07-28 09:08:31 +0000 |
| commit | 8a9904a7f31aeb68336f4a9f6ba9e8ab8ecc7f11 (patch) | |
| tree | 9fbfcaf47aa3e6f663d8128e3944ef1c5715ad5f /src/lib/libcrypto/engine/eng_fat.c | |
| parent | 92f3766713986fcccdc079df784442dcfde4921c (diff) | |
| download | openbsd-8a9904a7f31aeb68336f4a9f6ba9e8ab8ecc7f11.tar.gz openbsd-8a9904a7f31aeb68336f4a9f6ba9e8ab8ecc7f11.tar.bz2 openbsd-8a9904a7f31aeb68336f4a9f6ba9e8ab8ecc7f11.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/eng_fat.c')
| -rw-r--r-- | src/lib/libcrypto/engine/eng_fat.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c index baf1a54883..cf49c99bb4 100644 --- a/src/lib/libcrypto/engine/eng_fat.c +++ b/src/lib/libcrypto/engine/eng_fat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: eng_fat.c,v 1.17 2019/01/19 01:07:00 tb Exp $ */ | 1 | /* $OpenBSD: eng_fat.c,v 1.18 2023/07/28 09:08:31 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -89,10 +89,6 @@ ENGINE_set_default(ENGINE *e, unsigned int flags) | |||
| 89 | if ((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e)) | 89 | if ((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e)) |
| 90 | return 0; | 90 | return 0; |
| 91 | #endif | 91 | #endif |
| 92 | #ifndef OPENSSL_NO_ECDSA | ||
| 93 | if ((flags & ENGINE_METHOD_ECDSA) && !ENGINE_set_default_ECDSA(e)) | ||
| 94 | return 0; | ||
| 95 | #endif | ||
| 96 | #ifndef OPENSSL_NO_EC | 92 | #ifndef OPENSSL_NO_EC |
| 97 | if ((flags & ENGINE_METHOD_EC) && !ENGINE_set_default_EC(e)) | 93 | if ((flags & ENGINE_METHOD_EC) && !ENGINE_set_default_EC(e)) |
| 98 | return 0; | 94 | return 0; |
| @@ -123,8 +119,6 @@ int_def_cb(const char *alg, int len, void *arg) | |||
| 123 | *pflags |= ENGINE_METHOD_DSA; | 119 | *pflags |= ENGINE_METHOD_DSA; |
| 124 | else if (!strncmp(alg, "ECDH", len)) | 120 | else if (!strncmp(alg, "ECDH", len)) |
| 125 | *pflags |= ENGINE_METHOD_ECDH; | 121 | *pflags |= ENGINE_METHOD_ECDH; |
| 126 | else if (!strncmp(alg, "ECDSA", len)) | ||
| 127 | *pflags |= ENGINE_METHOD_ECDSA; | ||
| 128 | else if (!strncmp(alg, "DH", len)) | 122 | else if (!strncmp(alg, "DH", len)) |
| 129 | *pflags |= ENGINE_METHOD_DH; | 123 | *pflags |= ENGINE_METHOD_DH; |
| 130 | else if (strncmp(alg, "EC", len) == 0) | 124 | else if (strncmp(alg, "EC", len) == 0) |
| @@ -177,9 +171,6 @@ ENGINE_register_complete(ENGINE *e) | |||
| 177 | #ifndef OPENSSL_NO_ECDH | 171 | #ifndef OPENSSL_NO_ECDH |
| 178 | ENGINE_register_ECDH(e); | 172 | ENGINE_register_ECDH(e); |
| 179 | #endif | 173 | #endif |
| 180 | #ifndef OPENSSL_NO_ECDSA | ||
| 181 | ENGINE_register_ECDSA(e); | ||
| 182 | #endif | ||
| 183 | #ifndef OPENSSL_NO_EC | 174 | #ifndef OPENSSL_NO_EC |
| 184 | ENGINE_register_EC(e); | 175 | ENGINE_register_EC(e); |
| 185 | #endif | 176 | #endif |
