src - FreeBSD source tree

diff options


context:
space:
mode:

author	Jung-uk Kim <jkim@FreeBSD.org>	2023-09-11 16:50:12 +0000
committer	Jung-uk Kim <jkim@FreeBSD.org>	2023-09-11 16:50:12 +0000
commit	a1860b94f62494288804faebb1bf6ea8110ca148 (patch)
tree	90e3fba201c30e7ac041f3cdd71a7daed2d84789 /crypto
parent	cc0d356166e39da7f956c39f874e6dee67fd5d60 (diff)

Import OpenSSL 1.1.1wvendor/openssl/1.1.1w vendor/openssl-1.1.1

Diffstat (limited to 'crypto')

-rw-r--r--

crypto/asn1/ameth_lib.c

-rw-r--r--

crypto/cms/cms_asn1.c

-rw-r--r--

crypto/cms/cms_local.h

-rw-r--r--

crypto/cms/cms_sd.c

-rw-r--r--

crypto/cms/cms_smime.c

-rw-r--r--

crypto/ec/ec_ameth.c

-rwxr-xr-x

crypto/poly1305/asm/poly1305-x86_64.pl

-rw-r--r--

crypto/rsa/rsa_ameth.c

8 files changed, 63 insertions, 21 deletions

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 5e8c3ed1d5b0..4ab246e98719 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c

@@ -1,5 +1,5 @@

* Licensed under the OpenSSL license (the "License"). You may not use

* this file except in compliance with the License. You can obtain a copy

@@ -264,6 +264,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,

dst->pkey_size = src->pkey_size;

dst->pkey_bits = src->pkey_bits;

+ dst->pkey_security_bits = src->pkey_security_bits;

dst->param_decode = src->param_decode;

dst->param_encode = src->param_encode;

@@ -271,6 +272,7 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,

dst->param_copy = src->param_copy;

dst->param_cmp = src->param_cmp;

dst->param_print = src->param_print;

+ dst->sig_print = src->sig_print;

dst->pkey_free = src->pkey_free;

dst->pkey_ctrl = src->pkey_ctrl;

@@ -281,6 +283,13 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,

dst->siginf_set = src->siginf_set;

dst->pkey_check = src->pkey_check;

+ dst->pkey_public_check = src->pkey_public_check;

+ dst->pkey_param_check = src->pkey_param_check;

+ dst->set_priv_key = src->set_priv_key;

+ dst->set_pub_key = src->set_pub_key;

+ dst->get_priv_key = src->get_priv_key;

+ dst->get_pub_key = src->get_pub_key;

}

diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
index 08069d72a29e..a62e11ecbd90 100644
--- a/crypto/cms/cms_asn1.c
+++ b/crypto/cms/cms_asn1.c

@@ -1,5 +1,5 @@

* Licensed under the OpenSSL license (the "License"). You may not use

* this file except in compliance with the License. You can obtain a copy

@@ -51,6 +51,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,

EVP_PKEY_free(si->pkey);

X509_free(si->signer);

EVP_MD_CTX_free(si->mctx);

+ EVP_PKEY_CTX_free(si->pctx);

}

return 1;

}

@@ -89,11 +90,21 @@ ASN1_SEQUENCE(CMS_OriginatorInfo) = {

ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1)

} static_ASN1_SEQUENCE_END(CMS_OriginatorInfo)

-ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = {

+static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,

+ void *exarg)

+ CMS_EncryptedContentInfo *ec = (CMS_EncryptedContentInfo *)*pval;

+ if (operation == ASN1_OP_FREE_POST)

+ OPENSSL_clear_free(ec->key, ec->keylen);

+ return 1;

+ASN1_NDEF_SEQUENCE_cb(CMS_EncryptedContentInfo, cms_ec_cb) = {

ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT),

ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR),

ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0)

-} static_ASN1_NDEF_SEQUENCE_END(CMS_EncryptedContentInfo)

+} ASN1_NDEF_SEQUENCE_END_cb(CMS_EncryptedContentInfo, CMS_EncryptedContentInfo)

ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = {

ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32),

diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h
index a0ce4448f603..09c0bdfe5a47 100644
--- a/crypto/cms/cms_local.h
+++ b/crypto/cms/cms_local.h

@@ -1,5 +1,5 @@

* Licensed under the OpenSSL license (the "License"). You may not use

* this file except in compliance with the License. You can obtain a copy

@@ -342,6 +342,7 @@ struct CMS_Receipt_st {

DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)

DECLARE_ASN1_ITEM(CMS_SignerInfo)

+DECLARE_ASN1_ITEM(CMS_EncryptedContentInfo)

DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber)

DECLARE_ASN1_ITEM(CMS_Attributes_Sign)

DECLARE_ASN1_ITEM(CMS_Attributes_Verify)

diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index 3f2a782565a8..9f67f91297ea 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c

@@ -1,5 +1,5 @@

* Licensed under the OpenSSL license (the "License"). You may not use

* this file except in compliance with the License. You can obtain a copy

@@ -375,6 +375,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,

} else if (EVP_DigestSignInit(si->mctx, &si->pctx, md, NULL, pk) <=

goto err;

+ else

+ EVP_MD_CTX_set_flags(si->mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);

}

if (!sd->signerInfos)

@@ -600,6 +602,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,

unsigned char md[EVP_MAX_MD_SIZE];

unsigned int mdlen;

pctx = si->pctx;

+ si->pctx = NULL;

if (!EVP_DigestFinal_ex(mctx, md, &mdlen))

goto err;

siglen = EVP_PKEY_size(si->pkey);

@@ -680,6 +683,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)

EVP_MD_CTX_reset(mctx);

if (EVP_DigestSignInit(mctx, &pctx, md, NULL, si->pkey) <= 0)

goto err;

+ EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);

si->pctx = pctx;

}

@@ -745,8 +749,13 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)

return -1;

}

mctx = si->mctx;

+ if (si->pctx != NULL) {

+ EVP_PKEY_CTX_free(si->pctx);

+ si->pctx = NULL;

+ }

if (EVP_DigestVerifyInit(mctx, &si->pctx, md, NULL, si->pkey) <= 0)

goto err;

+ EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);

if (!cms_sd_asn1_ctrl(si, 1))

goto err;

@@ -859,8 +868,11 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)

if (EVP_PKEY_CTX_set_signature_md(pkctx, md) <= 0)

goto err;

si->pctx = pkctx;

- if (!cms_sd_asn1_ctrl(si, 1))

+ if (!cms_sd_asn1_ctrl(si, 1)) {

+ si->pctx = NULL;

goto err;

+ }

+ si->pctx = NULL;

r = EVP_PKEY_verify(pkctx, si->signature->data,

si->signature->length, mval, mlen);

if (r <= 0) {

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 6e7dbc4da1fa..f6c1c7d17705 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c

@@ -1,5 +1,5 @@

* Licensed under the OpenSSL license (the "License"). You may not use

* this file except in compliance with the License. You can obtain a copy

@@ -211,7 +211,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,

if (cms == NULL)

return NULL;

if (!CMS_EncryptedData_set1_key(cms, cipher, key, keylen))

- return NULL;

+ goto err;

if (!(flags & CMS_DETACHED))

CMS_set_detached(cms, 0);

@@ -220,6 +220,7 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,

|| CMS_final(cms, in, NULL, flags))

return cms;

+ err:

CMS_ContentInfo_free(cms);

return NULL;

}

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 5098bd7a6602..5a63590a9fbd 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c

@@ -1,5 +1,5 @@

* Licensed under the OpenSSL license (the "License"). You may not use

* this file except in compliance with the License. You can obtain a copy

@@ -38,7 +38,6 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key)

ASN1_OBJECT *asn1obj = OBJ_nid2obj(nid);

if (asn1obj == NULL || OBJ_length(asn1obj) == 0) {

- ASN1_OBJECT_free(asn1obj);

ECerr(EC_F_ECKEY_PARAM2TYPE, EC_R_MISSING_OID);

return 0;

}

@@ -98,9 +97,7 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)

ptype, pval, penc, penclen))

return 1;

err:

- if (ptype == V_ASN1_OBJECT)

- ASN1_OBJECT_free(pval);

- else

+ if (ptype == V_ASN1_SEQUENCE)

ASN1_STRING_free(pval);

OPENSSL_free(penc);

return 0;

@@ -256,24 +253,32 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)

eplen = i2d_ECPrivateKey(&ec_key, NULL);

if (!eplen) {

+ if (ptype == V_ASN1_SEQUENCE)

+ ASN1_STRING_free(pval);

ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);

return 0;

}

ep = OPENSSL_malloc(eplen);

if (ep == NULL) {

+ if (ptype == V_ASN1_SEQUENCE)

+ ASN1_STRING_free(pval);

ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_MALLOC_FAILURE);

return 0;

}

p = ep;

if (!i2d_ECPrivateKey(&ec_key, &p)) {

- OPENSSL_free(ep);

+ OPENSSL_clear_free(ep, eplen);

+ if (ptype == V_ASN1_SEQUENCE)

+ ASN1_STRING_free(pval);

ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);

return 0;

}

if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), 0,

ptype, pval, ep, eplen)) {

- OPENSSL_free(ep);

+ OPENSSL_clear_free(ep, eplen);

+ if (ptype == V_ASN1_SEQUENCE)

+ ASN1_STRING_free(pval);

return 0;

}

diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl
index 5f834d8faf2a..5e2bb18f2bac 100755
--- a/crypto/poly1305/asm/poly1305-x86_64.pl
+++ b/crypto/poly1305/asm/poly1305-x86_64.pl

@@ -1,5 +1,5 @@

#! /usr/bin/env perl

# Licensed under the OpenSSL license (the "License"). You may not use

# this file except in compliance with the License. You can obtain a copy

@@ -193,7 +193,7 @@ $code.=<<___ if ($avx>1);

bt \$`5+32`,%r9 # AVX2?

cmovc %rax,%r10

___

-$code.=<<___ if ($avx>3);

+$code.=<<___ if ($avx>3 && !$win64);

mov \$`(1<<31|1<<21|1<<16)`,%rax

shr \$32,%r9

and %rax,%r9

@@ -2722,7 +2722,7 @@ $code.=<<___;

.cfi_endproc

.size poly1305_blocks_avx512,.-poly1305_blocks_avx512

___

-if ($avx>3) {

+if ($avx>3 && !$win64) {

########################################################################

# VPMADD52 version using 2^44 radix.

diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 2c9c46ea53c8..00ed9820b0d2 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c

@@ -1,5 +1,5 @@

* Licensed under the OpenSSL license (the "License"). You may not use

* this file except in compliance with the License. You can obtain a copy

@@ -82,13 +82,16 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)

if (!rsa_param_encode(pkey, &str, &strtype))

return 0;

penclen = i2d_RSAPublicKey(pkey->pkey.rsa, &penc);

- if (penclen <= 0)

+ if (penclen <= 0) {

+ ASN1_STRING_free(str);

return 0;

+ }

if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),

strtype, str, penc, penclen))

return 1;

OPENSSL_free(penc);

+ ASN1_STRING_free(str);

return 0;

}