SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last fixes and improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-06-07 21:20:56 +00:00
parent 4b78db449c
commit bf0676207f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
2406 changed files with 6353 additions and 434004 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/libcrypto/cms/cms_asn1.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cms_asn1.c,v 1.21 2023/03/12 17:29:02 tb Exp $ */
/* $OpenBSD: cms_asn1.c,v 1.22 2023/05/23 06:55:31 tb Exp $ */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@ -1250,7 +1250,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
.field_name = "d.data",
.item = &ASN1_OCTET_STRING_NDEF_it,
},
},
{
.value = NID_pkcs7_signed,
@ -1261,7 +1260,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
.field_name = "d.signedData",
.item = &CMS_SignedData_it,
},
},
{
.value = NID_pkcs7_enveloped,
@ -1272,7 +1270,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
.field_name = "d.envelopedData",
.item = &CMS_EnvelopedData_it,
},
},
{
.value = NID_pkcs7_digest,
@ -1283,7 +1280,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
.field_name = "d.digestedData",
.item = &CMS_DigestedData_it,
},
},
{
.value = NID_pkcs7_encrypted,
@ -1294,7 +1290,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
.field_name = "d.encryptedData",
.item = &CMS_EncryptedData_it,
},
},
{
.value = NID_id_smime_ct_authData,
@ -1305,7 +1300,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
.field_name = "d.authenticatedData",
.item = &CMS_AuthenticatedData_it,
},
},
{
.value = NID_id_smime_ct_compressedData,
@ -1316,7 +1310,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
.field_name = "d.compressedData",
.item = &CMS_CompressedData_it,
},
},
};

4
lib/libcrypto/cms/cms_local.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cms_local.h,v 1.2 2022/11/26 17:23:17 tb Exp $ */
/* $OpenBSD: cms_local.h,v 1.3 2023/06/06 16:10:56 tb Exp $ */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@ -170,7 +170,7 @@ struct CMS_EncryptedContentInfo_st {
size_t keylen;
/* Set to 1 if we are debugging decrypt and don't fake keys for MMA */
int debug;
/* Set to 1 if we have no cert and need exta safety measures for MMA */
/* Set to 1 if we have no cert and need extra safety measures for MMA */
int havenocert;
};