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: ameth_lib.c,v 1.33 2023/11/19 15:46:09 tb Exp $ */
|
||||
/* $OpenBSD: ameth_lib.c,v 1.34 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2006.
|
||||
*/
|
||||
|
|
@ -158,6 +158,9 @@ EVP_PKEY_asn1_find(ENGINE **pe, int type)
|
|||
{
|
||||
const EVP_PKEY_ASN1_METHOD *mp;
|
||||
|
||||
if (pe != NULL)
|
||||
*pe = NULL;
|
||||
|
||||
for (;;) {
|
||||
if ((mp = pkey_asn1_find(type)) == NULL)
|
||||
break;
|
||||
|
|
@ -165,9 +168,7 @@ EVP_PKEY_asn1_find(ENGINE **pe, int type)
|
|||
break;
|
||||
type = mp->pkey_base_id;
|
||||
}
|
||||
if (pe) {
|
||||
*pe = NULL;
|
||||
}
|
||||
|
||||
return mp;
|
||||
}
|
||||
|
||||
|
|
@ -179,9 +180,8 @@ EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len)
|
|||
|
||||
if (len == -1)
|
||||
len = strlen(str);
|
||||
if (pe) {
|
||||
if (pe != NULL)
|
||||
*pe = NULL;
|
||||
}
|
||||
for (i = EVP_PKEY_asn1_get_count() - 1; i >= 0; i--) {
|
||||
ameth = EVP_PKEY_asn1_get0(i);
|
||||
if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cm_pmeth.c,v 1.10 2022/11/26 16:08:51 tb Exp $ */
|
||||
/* $OpenBSD: cm_pmeth.c,v 1.11 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2010.
|
||||
*/
|
||||
|
|
@ -143,7 +143,7 @@ pkey_cmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
|
|||
break;
|
||||
|
||||
case EVP_PKEY_CTRL_CIPHER:
|
||||
if (!CMAC_Init(cmctx, NULL, 0, p2, ctx->engine))
|
||||
if (!CMAC_Init(cmctx, NULL, 0, p2, NULL))
|
||||
return 0;
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cmac.c,v 1.14 2023/07/08 14:27:14 beck Exp $ */
|
||||
/* $OpenBSD: cmac.c,v 1.16 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
|
|
@ -59,37 +59,52 @@
|
|||
|
||||
#include "evp_local.h"
|
||||
|
||||
/*
|
||||
* This implementation follows https://doi.org/10.6028/NIST.SP.800-38B
|
||||
*/
|
||||
|
||||
/*
|
||||
* CMAC context. k1 and k2 are the secret subkeys, computed as in section 6.1.
|
||||
* The temporary block tbl is a scratch buffer that holds intermediate secrets.
|
||||
*/
|
||||
struct CMAC_CTX_st {
|
||||
/* Cipher context to use */
|
||||
EVP_CIPHER_CTX cctx;
|
||||
/* Keys k1 and k2 */
|
||||
unsigned char k1[EVP_MAX_BLOCK_LENGTH];
|
||||
unsigned char k2[EVP_MAX_BLOCK_LENGTH];
|
||||
/* Temporary block */
|
||||
unsigned char tbl[EVP_MAX_BLOCK_LENGTH];
|
||||
/* Last (possibly partial) block */
|
||||
unsigned char last_block[EVP_MAX_BLOCK_LENGTH];
|
||||
/* Number of bytes in last block: -1 means context not initialised */
|
||||
/* Bytes in last block. -1 means not initialized. */
|
||||
int nlast_block;
|
||||
};
|
||||
|
||||
|
||||
/* Make temporary keys K1 and K2 */
|
||||
|
||||
/*
|
||||
* SP 800-38B, section 6.1, steps 2 and 3: given the input key l, calculate
|
||||
* the subkeys k1 and k2: shift l one bit to the left. If the most significant
|
||||
* bit of l was 1, additionally xor the result with Rb to get kn.
|
||||
*
|
||||
* Step 2: calculate k1 with l being the intermediate block CIPH_K(0),
|
||||
* Step 3: calculate k2 from l == k1.
|
||||
*
|
||||
* Per 5.3, Rb is the lexically first irreducible polynomial of degree b with
|
||||
* the minimum number of non-zero terms. This gives R128 = (1 << 128) | 0x87
|
||||
* and R64 = (1 << 64) | 0x1b for the only supported block sizes 128 and 64.
|
||||
*/
|
||||
static void
|
||||
make_kn(unsigned char *k1, unsigned char *l, int bl)
|
||||
make_kn(unsigned char *kn, const unsigned char *l, int bl)
|
||||
{
|
||||
unsigned char mask, Rb;
|
||||
int i;
|
||||
|
||||
/* Shift block to left, including carry */
|
||||
for (i = 0; i < bl; i++) {
|
||||
k1[i] = l[i] << 1;
|
||||
if (i < bl - 1 && l[i + 1] & 0x80)
|
||||
k1[i] |= 1;
|
||||
}
|
||||
/* If MSB set fixup with R */
|
||||
if (l[0] & 0x80)
|
||||
k1[bl - 1] ^= bl == 16 ? 0x87 : 0x1b;
|
||||
/* Choose Rb according to the block size in bytes. */
|
||||
Rb = bl == 16 ? 0x87 : 0x1b;
|
||||
|
||||
/* Compute l << 1 up to last byte. */
|
||||
for (i = 0; i < bl - 1; i++)
|
||||
kn[i] = (l[i] << 1) | (l[i + 1] >> 7);
|
||||
|
||||
/* Only xor with Rb if the MSB is one. */
|
||||
mask = 0 - (l[0] >> 7);
|
||||
kn[bl - 1] = (l[bl - 1] << 1) ^ (Rb & mask);
|
||||
}
|
||||
|
||||
CMAC_CTX *
|
||||
|
|
@ -160,44 +175,61 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
|
|||
const EVP_CIPHER *cipher, ENGINE *impl)
|
||||
{
|
||||
static unsigned char zero_iv[EVP_MAX_BLOCK_LENGTH];
|
||||
int bl;
|
||||
|
||||
/* All zeros means restart */
|
||||
if (!key && !cipher && !impl && keylen == 0) {
|
||||
if (key == NULL && cipher == NULL && keylen == 0) {
|
||||
/* Not initialised */
|
||||
if (ctx->nlast_block == -1)
|
||||
return 0;
|
||||
if (!EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, zero_iv))
|
||||
return 0;
|
||||
memset(ctx->tbl, 0, EVP_CIPHER_CTX_block_size(&ctx->cctx));
|
||||
explicit_bzero(ctx->tbl, sizeof(ctx->tbl));
|
||||
ctx->nlast_block = 0;
|
||||
return 1;
|
||||
}
|
||||
/* Initialise context */
|
||||
if (cipher && !EVP_EncryptInit_ex(&ctx->cctx, cipher, impl, NULL, NULL))
|
||||
return 0;
|
||||
/* Non-NULL key means initialisation complete */
|
||||
if (key) {
|
||||
int bl;
|
||||
|
||||
if (!EVP_CIPHER_CTX_cipher(&ctx->cctx))
|
||||
/* Initialise context. */
|
||||
if (cipher != NULL) {
|
||||
if (!EVP_EncryptInit_ex(&ctx->cctx, cipher, NULL, NULL, NULL))
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Non-NULL key means initialisation is complete. */
|
||||
if (key != NULL) {
|
||||
if (EVP_CIPHER_CTX_cipher(&ctx->cctx) == NULL)
|
||||
return 0;
|
||||
|
||||
/* make_kn() only supports block sizes of 8 and 16 bytes. */
|
||||
bl = EVP_CIPHER_CTX_block_size(&ctx->cctx);
|
||||
if (bl != 8 && bl != 16)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* Section 6.1, step 1: store the intermediate secret CIPH_K(0)
|
||||
* in ctx->tbl.
|
||||
*/
|
||||
if (!EVP_CIPHER_CTX_set_key_length(&ctx->cctx, keylen))
|
||||
return 0;
|
||||
if (!EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, key, zero_iv))
|
||||
return 0;
|
||||
bl = EVP_CIPHER_CTX_block_size(&ctx->cctx);
|
||||
if (!EVP_Cipher(&ctx->cctx, ctx->tbl, zero_iv, bl))
|
||||
return 0;
|
||||
|
||||
/* Section 6.1, step 2: compute k1 from intermediate secret. */
|
||||
make_kn(ctx->k1, ctx->tbl, bl);
|
||||
/* Section 6.1, step 3: compute k2 from k1. */
|
||||
make_kn(ctx->k2, ctx->k1, bl);
|
||||
explicit_bzero(ctx->tbl, bl);
|
||||
/* Reset context again ready for first data block */
|
||||
|
||||
/* Destroy intermediate secret and reset last block count. */
|
||||
explicit_bzero(ctx->tbl, sizeof(ctx->tbl));
|
||||
ctx->nlast_block = 0;
|
||||
|
||||
/* Reset context again to get ready for the first data block. */
|
||||
if (!EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, zero_iv))
|
||||
return 0;
|
||||
/* Zero tbl so resume works */
|
||||
memset(ctx->tbl, 0, bl);
|
||||
ctx->nlast_block = 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
LCRYPTO_ALIAS(CMAC_Init);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: dh_lib.c,v 1.42 2023/11/19 15:46:09 tb Exp $ */
|
||||
/* $OpenBSD: dh_lib.c,v 1.43 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -230,7 +230,7 @@ LCRYPTO_ALIAS(DH_security_bits);
|
|||
ENGINE *
|
||||
DH_get0_engine(DH *dh)
|
||||
{
|
||||
return dh->engine;
|
||||
return NULL;
|
||||
}
|
||||
LCRYPTO_ALIAS(DH_get0_engine);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: dh_local.h,v 1.3 2022/01/14 08:25:44 tb Exp $ */
|
||||
/* $OpenBSD: dh_local.h,v 1.4 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -100,7 +100,6 @@ struct dh_st {
|
|||
int references;
|
||||
CRYPTO_EX_DATA ex_data;
|
||||
const DH_METHOD *meth;
|
||||
ENGINE *engine;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: dsa_lib.c,v 1.45 2023/11/19 15:46:09 tb Exp $ */
|
||||
/* $OpenBSD: dsa_lib.c,v 1.46 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -397,7 +397,7 @@ LCRYPTO_ALIAS(DSA_set_flags);
|
|||
ENGINE *
|
||||
DSA_get0_engine(DSA *d)
|
||||
{
|
||||
return d->engine;
|
||||
return NULL;
|
||||
}
|
||||
LCRYPTO_ALIAS(DSA_get0_engine);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: dsa_local.h,v 1.2 2023/03/04 20:54:52 tb Exp $ */
|
||||
/* $OpenBSD: dsa_local.h,v 1.3 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2007 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
|
|
@ -106,8 +106,6 @@ struct dsa_st {
|
|||
int references;
|
||||
CRYPTO_EX_DATA ex_data;
|
||||
const DSA_METHOD *meth;
|
||||
/* functional reference if 'meth' is ENGINE-provided */
|
||||
ENGINE *engine;
|
||||
} /* DSA */;
|
||||
|
||||
int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: hm_pmeth.c,v 1.15 2022/11/26 16:08:53 tb Exp $ */
|
||||
/* $OpenBSD: hm_pmeth.c,v 1.16 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2007.
|
||||
*/
|
||||
|
|
@ -204,7 +204,7 @@ pkey_hmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
|
|||
case EVP_PKEY_CTRL_DIGESTINIT:
|
||||
key = ctx->pkey->pkey.ptr;
|
||||
if (!HMAC_Init_ex(&hctx->ctx, key->data, key->length, hctx->md,
|
||||
ctx->engine))
|
||||
NULL))
|
||||
return 0;
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: pem_lib.c,v 1.54 2023/11/19 15:46:10 tb Exp $ */
|
||||
/* $OpenBSD: pem_lib.c,v 1.55 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -220,8 +220,7 @@ check_pem(const char *nm, const char *name)
|
|||
const EVP_PKEY_ASN1_METHOD *ameth;
|
||||
slen = pem_check_suffix(nm, "PARAMETERS");
|
||||
if (slen > 0) {
|
||||
ENGINE *e;
|
||||
ameth = EVP_PKEY_asn1_find_str(&e, nm, slen);
|
||||
ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
|
||||
if (ameth) {
|
||||
int r;
|
||||
if (ameth->param_decode)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: rsa_local.h,v 1.6 2023/08/09 12:09:06 tb Exp $ */
|
||||
/* $OpenBSD: rsa_local.h,v 1.7 2023/11/29 21:35:57 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -108,8 +108,6 @@ struct rsa_st {
|
|||
long version;
|
||||
const RSA_METHOD *meth;
|
||||
|
||||
/* functional reference if 'meth' is ENGINE-provided */
|
||||
ENGINE *engine;
|
||||
BIGNUM *n;
|
||||
BIGNUM *e;
|
||||
BIGNUM *d;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue