diff options
author | tb <> | 2023-07-28 09:22:26 +0000 |
---|---|---|
committer | tb <> | 2023-07-28 09:22:26 +0000 |
commit | f15cd04d37436407bfd863b507fcd73ca66e3976 (patch) | |
tree | 4eb57ae2fdd0f6dff20d00655e0d117dcf61415d /src/lib/libcrypto/engine/eng_fat.c | |
parent | e5c3cb1fc9513740908e7dc235cee9871623b942 (diff) | |
download | openbsd-f15cd04d37436407bfd863b507fcd73ca66e3976.tar.gz openbsd-f15cd04d37436407bfd863b507fcd73ca66e3976.tar.bz2 openbsd-f15cd04d37436407bfd863b507fcd73ca66e3976.zip |
Excise ECDH_METHOD
Unlike ECDSA_METHOD, this has been unused forever but kind of needed to
stay for symmetry with ECDSA_METHOD. Now we can finally take it behind
the barn and remove its tendrils 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 cf49c99bb4..f0b57722ff 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.18 2023/07/28 09:08:31 tb Exp $ */ | 1 | /* $OpenBSD: eng_fat.c,v 1.19 2023/07/28 09:22:26 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 | * |
@@ -85,10 +85,6 @@ ENGINE_set_default(ENGINE *e, unsigned int flags) | |||
85 | if ((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e)) | 85 | if ((flags & ENGINE_METHOD_DH) && !ENGINE_set_default_DH(e)) |
86 | return 0; | 86 | return 0; |
87 | #endif | 87 | #endif |
88 | #ifndef OPENSSL_NO_ECDH | ||
89 | if ((flags & ENGINE_METHOD_ECDH) && !ENGINE_set_default_ECDH(e)) | ||
90 | return 0; | ||
91 | #endif | ||
92 | #ifndef OPENSSL_NO_EC | 88 | #ifndef OPENSSL_NO_EC |
93 | if ((flags & ENGINE_METHOD_EC) && !ENGINE_set_default_EC(e)) | 89 | if ((flags & ENGINE_METHOD_EC) && !ENGINE_set_default_EC(e)) |
94 | return 0; | 90 | return 0; |
@@ -117,8 +113,6 @@ int_def_cb(const char *alg, int len, void *arg) | |||
117 | *pflags |= ENGINE_METHOD_RSA; | 113 | *pflags |= ENGINE_METHOD_RSA; |
118 | else if (!strncmp(alg, "DSA", len)) | 114 | else if (!strncmp(alg, "DSA", len)) |
119 | *pflags |= ENGINE_METHOD_DSA; | 115 | *pflags |= ENGINE_METHOD_DSA; |
120 | else if (!strncmp(alg, "ECDH", len)) | ||
121 | *pflags |= ENGINE_METHOD_ECDH; | ||
122 | else if (!strncmp(alg, "DH", len)) | 116 | else if (!strncmp(alg, "DH", len)) |
123 | *pflags |= ENGINE_METHOD_DH; | 117 | *pflags |= ENGINE_METHOD_DH; |
124 | else if (strncmp(alg, "EC", len) == 0) | 118 | else if (strncmp(alg, "EC", len) == 0) |
@@ -168,9 +162,6 @@ ENGINE_register_complete(ENGINE *e) | |||
168 | #ifndef OPENSSL_NO_DH | 162 | #ifndef OPENSSL_NO_DH |
169 | ENGINE_register_DH(e); | 163 | ENGINE_register_DH(e); |
170 | #endif | 164 | #endif |
171 | #ifndef OPENSSL_NO_ECDH | ||
172 | ENGINE_register_ECDH(e); | ||
173 | #endif | ||
174 | #ifndef OPENSSL_NO_EC | 165 | #ifndef OPENSSL_NO_EC |
175 | ENGINE_register_EC(e); | 166 | ENGINE_register_EC(e); |
176 | #endif | 167 | #endif |