sync with OpenBSD -current

This commit is contained in:
purplerain 2023-11-29 19:53:16 +00:00
parent 8b84d503c1
commit ed26f93d8c
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
33 changed files with 305 additions and 301 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: ec_key.c,v 1.38 2023/11/19 15:46:09 tb Exp $ */
/* $OpenBSD: ec_key.c,v 1.39 2023/11/29 21:35:57 tb Exp $ */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
@ -191,7 +191,7 @@ EC_KEY_dup(const EC_KEY *ec_key)
{
EC_KEY *ret;
if ((ret = EC_KEY_new_method(ec_key->engine)) == NULL)
if ((ret = EC_KEY_new_method(NULL)) == NULL)
return NULL;
if (EC_KEY_copy(ret, ec_key) == NULL) {
EC_KEY_free(ret);

View file

@ -1,4 +1,4 @@
/* $OpenBSD: ec_local.h,v 1.26 2023/07/28 15:50:33 tb Exp $ */
/* $OpenBSD: ec_local.h,v 1.27 2023/11/29 21:35:57 tb Exp $ */
/*
* Originally written by Bodo Moeller for the OpenSSL project.
*/
@ -223,7 +223,6 @@ struct ec_group_st {
struct ec_key_st {
const EC_KEY_METHOD *meth;
ENGINE *engine;
int version;