sync with OpenBSD -current
This commit is contained in:
parent
8b84d503c1
commit
ed26f93d8c
GPG key ID:
F42C07F07E2E35B7
33 changed files with 305 additions and 301 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: digest.c,v 1.39 2023/11/19 15:46:09 tb Exp $ */
|
||||
/* $OpenBSD: digest.c,v 1.40 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -271,7 +271,7 @@ EVP_Digest(const void *data, size_t count,
|
|||
|
||||
EVP_MD_CTX_init(&ctx);
|
||||
EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_ONESHOT);
|
||||
ret = EVP_DigestInit_ex(&ctx, type, impl) &&
|
||||
ret = EVP_DigestInit_ex(&ctx, type, NULL) &&
|
||||
EVP_DigestUpdate(&ctx, data, count) &&
|
||||
EVP_DigestFinal_ex(&ctx, md, size);
|
||||
EVP_MD_CTX_cleanup(&ctx);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: evp_enc.c,v 1.55 2023/11/19 15:46:09 tb Exp $ */
|
||||
/* $OpenBSD: evp_enc.c,v 1.56 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -93,7 +93,7 @@ EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
|
|||
if (cipher) {
|
||||
/* Ensure a context left lying around from last time is cleared
|
||||
* (the previous check attempted to avoid this if the same
|
||||
* ENGINE and EVP_CIPHER could be used). */
|
||||
* EVP_CIPHER could be used). */
|
||||
if (ctx->cipher) {
|
||||
unsigned long flags = ctx->flags;
|
||||
EVP_CIPHER_CTX_cleanup(ctx);
|
||||
|
|
@ -236,7 +236,7 @@ int
|
|||
EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
|
||||
const unsigned char *key, const unsigned char *iv)
|
||||
{
|
||||
return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 1);
|
||||
return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, 1);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -250,7 +250,7 @@ int
|
|||
EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
|
||||
const unsigned char *key, const unsigned char *iv)
|
||||
{
|
||||
return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 0);
|
||||
return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, 0);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: evp_local.h,v 1.5 2023/09/28 11:29:10 tb Exp $ */
|
||||
/* $OpenBSD: evp_local.h,v 1.6 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2000.
|
||||
*/
|
||||
|
|
@ -97,7 +97,6 @@ struct evp_pkey_st {
|
|||
int save_type;
|
||||
int references;
|
||||
const EVP_PKEY_ASN1_METHOD *ameth;
|
||||
ENGINE *engine;
|
||||
union {
|
||||
void *ptr;
|
||||
#ifndef OPENSSL_NO_RSA
|
||||
|
|
@ -140,7 +139,6 @@ struct evp_md_st {
|
|||
|
||||
struct evp_md_ctx_st {
|
||||
const EVP_MD *digest;
|
||||
ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */
|
||||
unsigned long flags;
|
||||
void *md_data;
|
||||
/* Public key context for sign/verify */
|
||||
|
|
@ -169,7 +167,6 @@ struct evp_cipher_st {
|
|||
|
||||
struct evp_cipher_ctx_st {
|
||||
const EVP_CIPHER *cipher;
|
||||
ENGINE *engine; /* functional reference if 'cipher' is ENGINE-provided */
|
||||
int encrypt; /* encrypt or decrypt */
|
||||
int buf_len; /* number we have left */
|
||||
|
||||
|
|
@ -205,8 +202,6 @@ struct evp_Encode_Ctx_st {
|
|||
struct evp_pkey_ctx_st {
|
||||
/* Method associated with this operation */
|
||||
const EVP_PKEY_METHOD *pmeth;
|
||||
/* Engine that implements this method or NULL if builtin */
|
||||
ENGINE *engine;
|
||||
/* Key: may be NULL */
|
||||
EVP_PKEY *pkey;
|
||||
/* Peer key for key agreement, may be NULL */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: m_sigver.c,v 1.13 2023/07/07 19:37:53 beck Exp $ */
|
||||
/* $OpenBSD: m_sigver.c,v 1.14 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2006.
|
||||
*/
|
||||
|
|
@ -74,10 +74,10 @@ update_oneshot_only(EVP_MD_CTX *ctx, const void *data, size_t datalen)
|
|||
|
||||
static int
|
||||
do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
|
||||
ENGINE *e, EVP_PKEY *pkey, int ver)
|
||||
EVP_PKEY *pkey, int ver)
|
||||
{
|
||||
if (ctx->pctx == NULL)
|
||||
ctx->pctx = EVP_PKEY_CTX_new(pkey, e);
|
||||
ctx->pctx = EVP_PKEY_CTX_new(pkey, NULL);
|
||||
if (ctx->pctx == NULL)
|
||||
return 0;
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
|
|||
*pctx = ctx->pctx;
|
||||
if (ctx->pctx->pmeth->flags & EVP_PKEY_FLAG_SIGCTX_CUSTOM)
|
||||
return 1;
|
||||
if (!EVP_DigestInit_ex(ctx, type, e))
|
||||
if (!EVP_DigestInit_ex(ctx, type, NULL))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -131,14 +131,14 @@ int
|
|||
EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
|
||||
ENGINE *e, EVP_PKEY *pkey)
|
||||
{
|
||||
return do_sigver_init(ctx, pctx, type, e, pkey, 0);
|
||||
return do_sigver_init(ctx, pctx, type, pkey, 0);
|
||||
}
|
||||
|
||||
int
|
||||
EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
|
||||
ENGINE *e, EVP_PKEY *pkey)
|
||||
{
|
||||
return do_sigver_init(ctx, pctx, type, e, pkey, 1);
|
||||
return do_sigver_init(ctx, pctx, type, pkey, 1);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: p_lib.c,v 1.38 2023/11/19 15:46:10 tb Exp $ */
|
||||
/* $OpenBSD: p_lib.c,v 1.39 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -206,7 +206,6 @@ EVP_PKEY_new(void)
|
|||
ret->save_type = EVP_PKEY_NONE;
|
||||
ret->references = 1;
|
||||
ret->ameth = NULL;
|
||||
ret->engine = NULL;
|
||||
ret->pkey.ptr = NULL;
|
||||
ret->attributes = NULL;
|
||||
ret->save_parameters = 1;
|
||||
|
|
@ -220,18 +219,14 @@ EVP_PKEY_up_ref(EVP_PKEY *pkey)
|
|||
return ((refs > 1) ? 1 : 0);
|
||||
}
|
||||
|
||||
/* Setup a public key ASN1 method and ENGINE from a NID or a string.
|
||||
/* Setup a public key ASN1 method from a NID or a string.
|
||||
* If pkey is NULL just return 1 or 0 if the algorithm exists.
|
||||
*/
|
||||
|
||||
static int
|
||||
pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str, int len)
|
||||
pkey_set_type(EVP_PKEY *pkey, int type, const char *str, int len)
|
||||
{
|
||||
const EVP_PKEY_ASN1_METHOD *ameth;
|
||||
ENGINE **eptr = NULL;
|
||||
|
||||
if (e == NULL)
|
||||
eptr = &e;
|
||||
|
||||
if (pkey) {
|
||||
if (pkey->pkey.ptr)
|
||||
|
|
@ -242,17 +237,16 @@ pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str, int len)
|
|||
if ((type == pkey->save_type) && pkey->ameth)
|
||||
return 1;
|
||||
}
|
||||
if (str)
|
||||
ameth = EVP_PKEY_asn1_find_str(eptr, str, len);
|
||||
if (str != NULL)
|
||||
ameth = EVP_PKEY_asn1_find_str(NULL, str, len);
|
||||
else
|
||||
ameth = EVP_PKEY_asn1_find(eptr, type);
|
||||
ameth = EVP_PKEY_asn1_find(NULL, type);
|
||||
if (!ameth) {
|
||||
EVPerror(EVP_R_UNSUPPORTED_ALGORITHM);
|
||||
return 0;
|
||||
}
|
||||
if (pkey) {
|
||||
pkey->ameth = ameth;
|
||||
pkey->engine = e;
|
||||
|
||||
pkey->type = pkey->ameth->pkey_id;
|
||||
pkey->save_type = type;
|
||||
|
|
@ -263,7 +257,7 @@ pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str, int len)
|
|||
int
|
||||
EVP_PKEY_set_type(EVP_PKEY *pkey, int type)
|
||||
{
|
||||
return pkey_set_type(pkey, NULL, type, NULL, -1);
|
||||
return pkey_set_type(pkey, type, NULL, -1);
|
||||
}
|
||||
|
||||
EVP_PKEY *
|
||||
|
|
@ -275,7 +269,7 @@ EVP_PKEY_new_raw_private_key(int type, ENGINE *engine,
|
|||
if ((ret = EVP_PKEY_new()) == NULL)
|
||||
goto err;
|
||||
|
||||
if (!pkey_set_type(ret, engine, type, NULL, -1))
|
||||
if (!pkey_set_type(ret, type, NULL, -1))
|
||||
goto err;
|
||||
|
||||
if (ret->ameth->set_priv_key == NULL) {
|
||||
|
|
@ -304,7 +298,7 @@ EVP_PKEY_new_raw_public_key(int type, ENGINE *engine,
|
|||
if ((ret = EVP_PKEY_new()) == NULL)
|
||||
goto err;
|
||||
|
||||
if (!pkey_set_type(ret, engine, type, NULL, -1))
|
||||
if (!pkey_set_type(ret, type, NULL, -1))
|
||||
goto err;
|
||||
|
||||
if (ret->ameth->set_pub_key == NULL) {
|
||||
|
|
@ -368,10 +362,10 @@ EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len,
|
|||
if ((cmctx = CMAC_CTX_new()) == NULL)
|
||||
goto err;
|
||||
|
||||
if (!pkey_set_type(ret, e, EVP_PKEY_CMAC, NULL, -1))
|
||||
if (!pkey_set_type(ret, EVP_PKEY_CMAC, NULL, -1))
|
||||
goto err;
|
||||
|
||||
if (!CMAC_Init(cmctx, priv, len, cipher, e)) {
|
||||
if (!CMAC_Init(cmctx, priv, len, cipher, NULL)) {
|
||||
EVPerror(EVP_R_KEY_SETUP_FAILED);
|
||||
goto err;
|
||||
}
|
||||
|
|
@ -389,7 +383,7 @@ EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, size_t len,
|
|||
int
|
||||
EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
|
||||
{
|
||||
return pkey_set_type(pkey, NULL, EVP_PKEY_NONE, str, len);
|
||||
return pkey_set_type(pkey, EVP_PKEY_NONE, str, len);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -563,15 +557,12 @@ EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
|
|||
int
|
||||
EVP_PKEY_type(int type)
|
||||
{
|
||||
int ret;
|
||||
const EVP_PKEY_ASN1_METHOD *ameth;
|
||||
ENGINE *e;
|
||||
ameth = EVP_PKEY_asn1_find(&e, type);
|
||||
if (ameth)
|
||||
ret = ameth->pkey_id;
|
||||
else
|
||||
ret = NID_undef;
|
||||
return ret;
|
||||
|
||||
if ((ameth = EVP_PKEY_asn1_find(NULL, type)) != NULL)
|
||||
return ameth->pkey_id;
|
||||
|
||||
return NID_undef;
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: pmeth_gn.c,v 1.13 2023/07/07 19:37:54 beck Exp $ */
|
||||
/* $OpenBSD: pmeth_gn.c,v 1.14 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2006.
|
||||
*/
|
||||
|
|
@ -208,7 +208,7 @@ EVP_PKEY_new_mac_key(int type, ENGINE *e, const unsigned char *key, int keylen)
|
|||
EVP_PKEY_CTX *mac_ctx = NULL;
|
||||
EVP_PKEY *mac_key = NULL;
|
||||
|
||||
mac_ctx = EVP_PKEY_CTX_new_id(type, e);
|
||||
mac_ctx = EVP_PKEY_CTX_new_id(type, NULL);
|
||||
if (!mac_ctx)
|
||||
return NULL;
|
||||
if (EVP_PKEY_keygen_init(mac_ctx) <= 0)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: pmeth_lib.c,v 1.34 2023/11/19 15:43:52 tb Exp $ */
|
||||
/* $OpenBSD: pmeth_lib.c,v 1.35 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2006.
|
||||
*/
|
||||
|
|
@ -147,7 +147,7 @@ EVP_PKEY_meth_find(int type)
|
|||
}
|
||||
|
||||
static EVP_PKEY_CTX *
|
||||
evp_pkey_ctx_new(EVP_PKEY *pkey, ENGINE *engine, int id)
|
||||
evp_pkey_ctx_new(EVP_PKEY *pkey, int id)
|
||||
{
|
||||
EVP_PKEY_CTX *pkey_ctx = NULL;
|
||||
const EVP_PKEY_METHOD *pmeth;
|
||||
|
|
@ -167,8 +167,6 @@ evp_pkey_ctx_new(EVP_PKEY *pkey, ENGINE *engine, int id)
|
|||
EVPerror(ERR_R_MALLOC_FAILURE);
|
||||
goto err;
|
||||
}
|
||||
pkey_ctx->engine = engine;
|
||||
engine = NULL;
|
||||
pkey_ctx->pmeth = pmeth;
|
||||
pkey_ctx->operation = EVP_PKEY_OP_UNDEFINED;
|
||||
if ((pkey_ctx->pkey = pkey) != NULL)
|
||||
|
|
@ -234,13 +232,13 @@ EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth)
|
|||
EVP_PKEY_CTX *
|
||||
EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *engine)
|
||||
{
|
||||
return evp_pkey_ctx_new(pkey, engine, -1);
|
||||
return evp_pkey_ctx_new(pkey, -1);
|
||||
}
|
||||
|
||||
EVP_PKEY_CTX *
|
||||
EVP_PKEY_CTX_new_id(int id, ENGINE *engine)
|
||||
{
|
||||
return evp_pkey_ctx_new(NULL, engine, id);
|
||||
return evp_pkey_ctx_new(NULL, id);
|
||||
}
|
||||
|
||||
EVP_PKEY_CTX *
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue