diff options
Diffstat (limited to 'src/lib/libcrypto/evp/pmeth_lib.c')
-rw-r--r-- | src/lib/libcrypto/evp/pmeth_lib.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c index 7ebf273415..cf27862488 100644 --- a/src/lib/libcrypto/evp/pmeth_lib.c +++ b/src/lib/libcrypto/evp/pmeth_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pmeth_lib.c,v 1.34 2023/11/19 15:43:52 tb Exp $ */ | 1 | /* $OpenBSD: pmeth_lib.c,v 1.35 2023/11/29 21:35:57 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -147,7 +147,7 @@ EVP_PKEY_meth_find(int type) | |||
147 | } | 147 | } |
148 | 148 | ||
149 | static EVP_PKEY_CTX * | 149 | static EVP_PKEY_CTX * |
150 | evp_pkey_ctx_new(EVP_PKEY *pkey, ENGINE *engine, int id) | 150 | evp_pkey_ctx_new(EVP_PKEY *pkey, int id) |
151 | { | 151 | { |
152 | EVP_PKEY_CTX *pkey_ctx = NULL; | 152 | EVP_PKEY_CTX *pkey_ctx = NULL; |
153 | const EVP_PKEY_METHOD *pmeth; | 153 | const EVP_PKEY_METHOD *pmeth; |
@@ -167,8 +167,6 @@ evp_pkey_ctx_new(EVP_PKEY *pkey, ENGINE *engine, int id) | |||
167 | EVPerror(ERR_R_MALLOC_FAILURE); | 167 | EVPerror(ERR_R_MALLOC_FAILURE); |
168 | goto err; | 168 | goto err; |
169 | } | 169 | } |
170 | pkey_ctx->engine = engine; | ||
171 | engine = NULL; | ||
172 | pkey_ctx->pmeth = pmeth; | 170 | pkey_ctx->pmeth = pmeth; |
173 | pkey_ctx->operation = EVP_PKEY_OP_UNDEFINED; | 171 | pkey_ctx->operation = EVP_PKEY_OP_UNDEFINED; |
174 | if ((pkey_ctx->pkey = pkey) != NULL) | 172 | if ((pkey_ctx->pkey = pkey) != NULL) |
@@ -234,13 +232,13 @@ EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth) | |||
234 | EVP_PKEY_CTX * | 232 | EVP_PKEY_CTX * |
235 | EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *engine) | 233 | EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *engine) |
236 | { | 234 | { |
237 | return evp_pkey_ctx_new(pkey, engine, -1); | 235 | return evp_pkey_ctx_new(pkey, -1); |
238 | } | 236 | } |
239 | 237 | ||
240 | EVP_PKEY_CTX * | 238 | EVP_PKEY_CTX * |
241 | EVP_PKEY_CTX_new_id(int id, ENGINE *engine) | 239 | EVP_PKEY_CTX_new_id(int id, ENGINE *engine) |
242 | { | 240 | { |
243 | return evp_pkey_ctx_new(NULL, engine, id); | 241 | return evp_pkey_ctx_new(NULL, id); |
244 | } | 242 | } |
245 | 243 | ||
246 | EVP_PKEY_CTX * | 244 | EVP_PKEY_CTX * |