diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ec_key.c')
-rw-r--r-- | src/lib/libcrypto/ec/ec_key.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c index d9ddd5d797..2716db6dd0 100644 --- a/src/lib/libcrypto/ec/ec_key.c +++ b/src/lib/libcrypto/ec/ec_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_key.c,v 1.37 2023/08/03 18:53:56 tb Exp $ */ | 1 | /* $OpenBSD: ec_key.c,v 1.38 2023/11/19 15:46:09 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -65,9 +65,6 @@ | |||
65 | 65 | ||
66 | #include <openssl/opensslconf.h> | 66 | #include <openssl/opensslconf.h> |
67 | 67 | ||
68 | #ifndef OPENSSL_NO_ENGINE | ||
69 | #include <openssl/engine.h> | ||
70 | #endif | ||
71 | #include <openssl/err.h> | 68 | #include <openssl/err.h> |
72 | 69 | ||
73 | #include "bn_local.h" | 70 | #include "bn_local.h" |
@@ -115,9 +112,6 @@ EC_KEY_free(EC_KEY *r) | |||
115 | if (r->meth != NULL && r->meth->finish != NULL) | 112 | if (r->meth != NULL && r->meth->finish != NULL) |
116 | r->meth->finish(r); | 113 | r->meth->finish(r); |
117 | 114 | ||
118 | #ifndef OPENSSL_NO_ENGINE | ||
119 | ENGINE_finish(r->engine); | ||
120 | #endif | ||
121 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_EC_KEY, r, &r->ex_data); | 115 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_EC_KEY, r, &r->ex_data); |
122 | 116 | ||
123 | EC_GROUP_free(r->group); | 117 | EC_GROUP_free(r->group); |
@@ -138,11 +132,6 @@ EC_KEY_copy(EC_KEY *dest, const EC_KEY *src) | |||
138 | if (src->meth != dest->meth) { | 132 | if (src->meth != dest->meth) { |
139 | if (dest->meth != NULL && dest->meth->finish != NULL) | 133 | if (dest->meth != NULL && dest->meth->finish != NULL) |
140 | dest->meth->finish(dest); | 134 | dest->meth->finish(dest); |
141 | #ifndef OPENSSL_NO_ENGINE | ||
142 | if (ENGINE_finish(dest->engine) == 0) | ||
143 | return 0; | ||
144 | dest->engine = NULL; | ||
145 | #endif | ||
146 | } | 135 | } |
147 | /* copy the parameters */ | 136 | /* copy the parameters */ |
148 | if (src->group) { | 137 | if (src->group) { |
@@ -186,11 +175,6 @@ EC_KEY_copy(EC_KEY *dest, const EC_KEY *src) | |||
186 | return NULL; | 175 | return NULL; |
187 | 176 | ||
188 | if (src->meth != dest->meth) { | 177 | if (src->meth != dest->meth) { |
189 | #ifndef OPENSSL_NO_ENGINE | ||
190 | if (src->engine != NULL && ENGINE_init(src->engine) == 0) | ||
191 | return 0; | ||
192 | dest->engine = src->engine; | ||
193 | #endif | ||
194 | dest->meth = src->meth; | 178 | dest->meth = src->meth; |
195 | } | 179 | } |
196 | 180 | ||