sync with OpenBSD -current
This commit is contained in:
parent
20629a8b0d
commit
604988d5d3
GPG key ID:
F42C07F07E2E35B7
58 changed files with 592 additions and 377 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: asn1_item.c,v 1.19 2024/01/13 13:59:18 joshua Exp $ */
|
||||
/* $OpenBSD: asn1_item.c,v 1.20 2024/01/28 14:43:48 joshua Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -381,7 +381,7 @@ int
|
|||
ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
|
||||
ASN1_BIT_STRING *signature, void *asn, EVP_PKEY *pkey)
|
||||
{
|
||||
EVP_MD_CTX ctx;
|
||||
EVP_MD_CTX *md_ctx = NULL;
|
||||
unsigned char *in = NULL;
|
||||
int mdnid, pknid;
|
||||
int in_len = 0;
|
||||
|
|
@ -389,15 +389,16 @@ ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
|
|||
|
||||
if (pkey == NULL) {
|
||||
ASN1error(ERR_R_PASSED_NULL_PARAMETER);
|
||||
return -1;
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (signature->type == V_ASN1_BIT_STRING && signature->flags & 0x7) {
|
||||
ASN1error(ASN1_R_INVALID_BIT_STRING_BITS_LEFT);
|
||||
return -1;
|
||||
goto err;
|
||||
}
|
||||
|
||||
EVP_MD_CTX_init(&ctx);
|
||||
if ((md_ctx = EVP_MD_CTX_new()) == NULL)
|
||||
goto err;
|
||||
|
||||
/* Convert signature OID into digest and public key OIDs */
|
||||
if (!OBJ_find_sigid_algs(OBJ_obj2nid(a->algorithm), &mdnid, &pknid)) {
|
||||
|
|
@ -409,7 +410,7 @@ ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
|
|||
ASN1error(ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM);
|
||||
goto err;
|
||||
}
|
||||
ret = pkey->ameth->item_verify(&ctx, it, asn, a,
|
||||
ret = pkey->ameth->item_verify(md_ctx, it, asn, a,
|
||||
signature, pkey);
|
||||
/* Return value of 2 means carry on, anything else means we
|
||||
* exit straight away: either a fatal error of the underlying
|
||||
|
|
@ -432,7 +433,7 @@ ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
|
|||
goto err;
|
||||
}
|
||||
|
||||
if (!EVP_DigestVerifyInit(&ctx, NULL, type, NULL, pkey)) {
|
||||
if (!EVP_DigestVerifyInit(md_ctx, NULL, type, NULL, pkey)) {
|
||||
ASN1error(ERR_R_EVP_LIB);
|
||||
ret = 0;
|
||||
goto err;
|
||||
|
|
@ -446,7 +447,7 @@ ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
|
|||
goto err;
|
||||
}
|
||||
|
||||
if (EVP_DigestVerify(&ctx, signature->data, signature->length,
|
||||
if (EVP_DigestVerify(md_ctx, signature->data, signature->length,
|
||||
in, in_len) <= 0) {
|
||||
ASN1error(ERR_R_EVP_LIB);
|
||||
ret = 0;
|
||||
|
|
@ -456,7 +457,7 @@ ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
|
|||
ret = 1;
|
||||
|
||||
err:
|
||||
EVP_MD_CTX_cleanup(&ctx);
|
||||
EVP_MD_CTX_free(md_ctx);
|
||||
freezero(in, in_len);
|
||||
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cmac.c,v 1.18 2023/12/18 21:15:00 tb Exp $ */
|
||||
/* $OpenBSD: cmac.c,v 1.20 2024/01/28 20:57:15 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
* The temporary block tbl is a scratch buffer that holds intermediate secrets.
|
||||
*/
|
||||
struct CMAC_CTX_st {
|
||||
EVP_CIPHER_CTX cctx;
|
||||
EVP_CIPHER_CTX *cipher_ctx;
|
||||
unsigned char k1[EVP_MAX_BLOCK_LENGTH];
|
||||
unsigned char k2[EVP_MAX_BLOCK_LENGTH];
|
||||
unsigned char tbl[EVP_MAX_BLOCK_LENGTH];
|
||||
|
|
@ -112,19 +112,27 @@ CMAC_CTX_new(void)
|
|||
{
|
||||
CMAC_CTX *ctx;
|
||||
|
||||
ctx = malloc(sizeof(CMAC_CTX));
|
||||
if (!ctx)
|
||||
return NULL;
|
||||
EVP_CIPHER_CTX_init(&ctx->cctx);
|
||||
if ((ctx = calloc(1, sizeof(CMAC_CTX))) == NULL)
|
||||
goto err;
|
||||
if ((ctx->cipher_ctx = EVP_CIPHER_CTX_new()) == NULL)
|
||||
goto err;
|
||||
|
||||
ctx->nlast_block = -1;
|
||||
|
||||
return ctx;
|
||||
|
||||
err:
|
||||
CMAC_CTX_free(ctx);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
LCRYPTO_ALIAS(CMAC_CTX_new);
|
||||
|
||||
void
|
||||
CMAC_CTX_cleanup(CMAC_CTX *ctx)
|
||||
{
|
||||
EVP_CIPHER_CTX_cleanup(&ctx->cctx);
|
||||
if (ctx->cipher_ctx != NULL)
|
||||
EVP_CIPHER_CTX_reset(ctx->cipher_ctx);
|
||||
explicit_bzero(ctx->tbl, EVP_MAX_BLOCK_LENGTH);
|
||||
explicit_bzero(ctx->k1, EVP_MAX_BLOCK_LENGTH);
|
||||
explicit_bzero(ctx->k2, EVP_MAX_BLOCK_LENGTH);
|
||||
|
|
@ -136,7 +144,7 @@ LCRYPTO_ALIAS(CMAC_CTX_cleanup);
|
|||
EVP_CIPHER_CTX *
|
||||
CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx)
|
||||
{
|
||||
return &ctx->cctx;
|
||||
return ctx->cipher_ctx;
|
||||
}
|
||||
LCRYPTO_ALIAS(CMAC_CTX_get0_cipher_ctx);
|
||||
|
||||
|
|
@ -147,7 +155,8 @@ CMAC_CTX_free(CMAC_CTX *ctx)
|
|||
return;
|
||||
|
||||
CMAC_CTX_cleanup(ctx);
|
||||
free(ctx);
|
||||
EVP_CIPHER_CTX_free(ctx->cipher_ctx);
|
||||
freezero(ctx, sizeof(CMAC_CTX));
|
||||
}
|
||||
LCRYPTO_ALIAS(CMAC_CTX_free);
|
||||
|
||||
|
|
@ -158,9 +167,9 @@ CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in)
|
|||
|
||||
if (in->nlast_block == -1)
|
||||
return 0;
|
||||
if (!EVP_CIPHER_CTX_copy(&out->cctx, &in->cctx))
|
||||
if (!EVP_CIPHER_CTX_copy(out->cipher_ctx, in->cipher_ctx))
|
||||
return 0;
|
||||
block_size = EVP_CIPHER_CTX_block_size(&in->cctx);
|
||||
block_size = EVP_CIPHER_CTX_block_size(in->cipher_ctx);
|
||||
memcpy(out->k1, in->k1, block_size);
|
||||
memcpy(out->k2, in->k2, block_size);
|
||||
memcpy(out->tbl, in->tbl, block_size);
|
||||
|
|
@ -182,7 +191,7 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
|
|||
/* Not initialised */
|
||||
if (ctx->nlast_block == -1)
|
||||
return 0;
|
||||
if (!EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, zero_iv))
|
||||
if (!EVP_EncryptInit_ex(ctx->cipher_ctx, NULL, NULL, NULL, zero_iv))
|
||||
return 0;
|
||||
explicit_bzero(ctx->tbl, sizeof(ctx->tbl));
|
||||
ctx->nlast_block = 0;
|
||||
|
|
@ -198,17 +207,17 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
|
|||
*/
|
||||
if ((cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) != 0)
|
||||
return 0;
|
||||
if (!EVP_EncryptInit_ex(&ctx->cctx, cipher, NULL, NULL, NULL))
|
||||
if (!EVP_EncryptInit_ex(ctx->cipher_ctx, cipher, NULL, NULL, NULL))
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Non-NULL key means initialisation is complete. */
|
||||
if (key != NULL) {
|
||||
if (EVP_CIPHER_CTX_cipher(&ctx->cctx) == NULL)
|
||||
if (EVP_CIPHER_CTX_cipher(ctx->cipher_ctx) == NULL)
|
||||
return 0;
|
||||
|
||||
/* make_kn() only supports block sizes of 8 and 16 bytes. */
|
||||
block_size = EVP_CIPHER_CTX_block_size(&ctx->cctx);
|
||||
block_size = EVP_CIPHER_CTX_block_size(ctx->cipher_ctx);
|
||||
if (block_size != 8 && block_size != 16)
|
||||
return 0;
|
||||
|
||||
|
|
@ -216,11 +225,11 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
|
|||
* 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))
|
||||
if (!EVP_CIPHER_CTX_set_key_length(ctx->cipher_ctx, keylen))
|
||||
return 0;
|
||||
if (!EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, key, zero_iv))
|
||||
if (!EVP_EncryptInit_ex(ctx->cipher_ctx, NULL, NULL, key, zero_iv))
|
||||
return 0;
|
||||
if (!EVP_Cipher(&ctx->cctx, ctx->tbl, zero_iv, block_size))
|
||||
if (!EVP_Cipher(ctx->cipher_ctx, ctx->tbl, zero_iv, block_size))
|
||||
return 0;
|
||||
|
||||
/* Section 6.1, step 2: compute k1 from intermediate secret. */
|
||||
|
|
@ -233,7 +242,7 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
|
|||
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))
|
||||
if (!EVP_EncryptInit_ex(ctx->cipher_ctx, NULL, NULL, NULL, zero_iv))
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -251,7 +260,7 @@ CMAC_Update(CMAC_CTX *ctx, const void *in, size_t dlen)
|
|||
return 0;
|
||||
if (dlen == 0)
|
||||
return 1;
|
||||
block_size = EVP_CIPHER_CTX_block_size(&ctx->cctx);
|
||||
block_size = EVP_CIPHER_CTX_block_size(ctx->cipher_ctx);
|
||||
/* Copy into partial block if we need to */
|
||||
if (ctx->nlast_block > 0) {
|
||||
size_t nleft;
|
||||
|
|
@ -267,13 +276,13 @@ CMAC_Update(CMAC_CTX *ctx, const void *in, size_t dlen)
|
|||
return 1;
|
||||
data += nleft;
|
||||
/* Else not final block so encrypt it */
|
||||
if (!EVP_Cipher(&ctx->cctx, ctx->tbl, ctx->last_block,
|
||||
if (!EVP_Cipher(ctx->cipher_ctx, ctx->tbl, ctx->last_block,
|
||||
block_size))
|
||||
return 0;
|
||||
}
|
||||
/* Encrypt all but one of the complete blocks left */
|
||||
while (dlen > block_size) {
|
||||
if (!EVP_Cipher(&ctx->cctx, ctx->tbl, data, block_size))
|
||||
if (!EVP_Cipher(ctx->cipher_ctx, ctx->tbl, data, block_size))
|
||||
return 0;
|
||||
dlen -= block_size;
|
||||
data += block_size;
|
||||
|
|
@ -292,7 +301,7 @@ CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen)
|
|||
|
||||
if (ctx->nlast_block == -1)
|
||||
return 0;
|
||||
block_size = EVP_CIPHER_CTX_block_size(&ctx->cctx);
|
||||
block_size = EVP_CIPHER_CTX_block_size(ctx->cipher_ctx);
|
||||
*poutlen = (size_t)block_size;
|
||||
if (!out)
|
||||
return 1;
|
||||
|
|
@ -308,7 +317,7 @@ CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen)
|
|||
for (i = 0; i < block_size; i++)
|
||||
out[i] = ctx->last_block[i] ^ ctx->k2[i];
|
||||
}
|
||||
if (!EVP_Cipher(&ctx->cctx, out, out, block_size)) {
|
||||
if (!EVP_Cipher(ctx->cipher_ctx, out, out, block_size)) {
|
||||
explicit_bzero(out, block_size);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -327,6 +336,6 @@ CMAC_resume(CMAC_CTX *ctx)
|
|||
* So reinitialising using the last decrypted block will allow
|
||||
* CMAC to continue after calling CMAC_Final().
|
||||
*/
|
||||
return EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, ctx->tbl);
|
||||
return EVP_EncryptInit_ex(ctx->cipher_ctx, NULL, NULL, NULL, ctx->tbl);
|
||||
}
|
||||
LCRYPTO_ALIAS(CMAC_resume);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: conf_lib.c,v 1.15 2017/01/29 17:49:22 beck Exp $ */
|
||||
/* $OpenBSD: conf_lib.c,v 1.16 2024/01/28 21:00:54 tb Exp $ */
|
||||
/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
|
||||
* project 2000.
|
||||
*/
|
||||
|
|
@ -86,8 +86,8 @@ CONF_set_default_method(CONF_METHOD *meth)
|
|||
return 1;
|
||||
}
|
||||
|
||||
LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
|
||||
long *eline)
|
||||
LHASH_OF(CONF_VALUE) *
|
||||
CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, long *eline)
|
||||
{
|
||||
LHASH_OF(CONF_VALUE) *ltmp;
|
||||
BIO *in = NULL;
|
||||
|
|
@ -104,8 +104,8 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
|
|||
return ltmp;
|
||||
}
|
||||
|
||||
LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
|
||||
long *eline)
|
||||
LHASH_OF(CONF_VALUE) *
|
||||
CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, long *eline)
|
||||
{
|
||||
BIO *btmp;
|
||||
LHASH_OF(CONF_VALUE) *ltmp;
|
||||
|
|
@ -119,8 +119,8 @@ LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
|
|||
return ltmp;
|
||||
}
|
||||
|
||||
LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
|
||||
long *eline)
|
||||
LHASH_OF(CONF_VALUE) *
|
||||
CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp, long *eline)
|
||||
{
|
||||
CONF ctmp;
|
||||
int ret;
|
||||
|
|
@ -133,8 +133,8 @@ LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
|
||||
const char *section)
|
||||
STACK_OF(CONF_VALUE) *
|
||||
CONF_get_section(LHASH_OF(CONF_VALUE) *conf, const char *section)
|
||||
{
|
||||
if (conf == NULL) {
|
||||
return NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue