sync with OpenBSD -current
This commit is contained in:
parent
b97c2ce374
commit
d93a7459f8
GPG key ID:
F42C07F07E2E35B7
97 changed files with 717 additions and 833 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_addr.c,v 1.91 2023/10/29 13:22:37 tb Exp $ */
|
||||
/* $OpenBSD: x509_addr.c,v 1.92 2024/07/08 14:47:44 beck Exp $ */
|
||||
/*
|
||||
* Contributed to the OpenSSL Project by the American Registry for
|
||||
* Internet Numbers ("ARIN").
|
||||
|
|
@ -109,6 +109,7 @@ const ASN1_ITEM IPAddressRange_it = {
|
|||
.size = sizeof(IPAddressRange),
|
||||
.sname = "IPAddressRange",
|
||||
};
|
||||
LCRYPTO_ALIAS(IPAddressRange_it);
|
||||
|
||||
static const ASN1_TEMPLATE IPAddressOrRange_ch_tt[] = {
|
||||
{
|
||||
|
|
@ -136,6 +137,7 @@ const ASN1_ITEM IPAddressOrRange_it = {
|
|||
.size = sizeof(IPAddressOrRange),
|
||||
.sname = "IPAddressOrRange",
|
||||
};
|
||||
LCRYPTO_ALIAS(IPAddressOrRange_it);
|
||||
|
||||
static const ASN1_TEMPLATE IPAddressChoice_ch_tt[] = {
|
||||
{
|
||||
|
|
@ -163,6 +165,7 @@ const ASN1_ITEM IPAddressChoice_it = {
|
|||
.size = sizeof(IPAddressChoice),
|
||||
.sname = "IPAddressChoice",
|
||||
};
|
||||
LCRYPTO_ALIAS(IPAddressChoice_it);
|
||||
|
||||
static const ASN1_TEMPLATE IPAddressFamily_seq_tt[] = {
|
||||
{
|
||||
|
|
@ -190,6 +193,7 @@ const ASN1_ITEM IPAddressFamily_it = {
|
|||
.size = sizeof(IPAddressFamily),
|
||||
.sname = "IPAddressFamily",
|
||||
};
|
||||
LCRYPTO_ALIAS(IPAddressFamily_it);
|
||||
|
||||
static const ASN1_TEMPLATE IPAddrBlocks_item_tt = {
|
||||
.flags = ASN1_TFLG_SEQUENCE_OF,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_akeya.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_akeya.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -96,6 +96,7 @@ const ASN1_ITEM AUTHORITY_KEYID_it = {
|
|||
.size = sizeof(AUTHORITY_KEYID),
|
||||
.sname = "AUTHORITY_KEYID",
|
||||
};
|
||||
LCRYPTO_ALIAS(AUTHORITY_KEYID_it);
|
||||
|
||||
|
||||
AUTHORITY_KEYID *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_asid.c,v 1.43 2024/02/20 14:58:16 tb Exp $ */
|
||||
/* $OpenBSD: x509_asid.c,v 1.44 2024/07/08 14:47:44 beck Exp $ */
|
||||
/*
|
||||
* Contributed to the OpenSSL Project by the American Registry for
|
||||
* Internet Numbers ("ARIN").
|
||||
|
|
@ -102,6 +102,7 @@ const ASN1_ITEM ASRange_it = {
|
|||
.size = sizeof(ASRange),
|
||||
.sname = "ASRange",
|
||||
};
|
||||
LCRYPTO_ALIAS(ASRange_it);
|
||||
|
||||
static const ASN1_TEMPLATE ASIdOrRange_ch_tt[] = {
|
||||
{
|
||||
|
|
@ -129,6 +130,7 @@ const ASN1_ITEM ASIdOrRange_it = {
|
|||
.size = sizeof(ASIdOrRange),
|
||||
.sname = "ASIdOrRange",
|
||||
};
|
||||
LCRYPTO_ALIAS(ASIdOrRange_it);
|
||||
|
||||
static const ASN1_TEMPLATE ASIdentifierChoice_ch_tt[] = {
|
||||
{
|
||||
|
|
@ -156,6 +158,7 @@ const ASN1_ITEM ASIdentifierChoice_it = {
|
|||
.size = sizeof(ASIdentifierChoice),
|
||||
.sname = "ASIdentifierChoice",
|
||||
};
|
||||
LCRYPTO_ALIAS(ASIdentifierChoice_it);
|
||||
|
||||
static const ASN1_TEMPLATE ASIdentifiers_seq_tt[] = {
|
||||
{
|
||||
|
|
@ -183,6 +186,7 @@ const ASN1_ITEM ASIdentifiers_it = {
|
|||
.size = sizeof(ASIdentifiers),
|
||||
.sname = "ASIdentifiers",
|
||||
};
|
||||
LCRYPTO_ALIAS(ASIdentifiers_it);
|
||||
|
||||
ASRange *
|
||||
d2i_ASRange(ASRange **a, const unsigned char **in, long len)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_bcons.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_bcons.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -113,6 +113,7 @@ const ASN1_ITEM BASIC_CONSTRAINTS_it = {
|
|||
.size = sizeof(BASIC_CONSTRAINTS),
|
||||
.sname = "BASIC_CONSTRAINTS",
|
||||
};
|
||||
LCRYPTO_ALIAS(BASIC_CONSTRAINTS_it);
|
||||
|
||||
|
||||
BASIC_CONSTRAINTS *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_cpols.c,v 1.11 2023/04/26 20:54:21 tb Exp $ */
|
||||
/* $OpenBSD: x509_cpols.c,v 1.12 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -116,6 +116,7 @@ const ASN1_ITEM CERTIFICATEPOLICIES_it = {
|
|||
.size = 0,
|
||||
.sname = "CERTIFICATEPOLICIES",
|
||||
};
|
||||
LCRYPTO_ALIAS(CERTIFICATEPOLICIES_it);
|
||||
|
||||
|
||||
CERTIFICATEPOLICIES *
|
||||
|
|
@ -173,6 +174,7 @@ const ASN1_ITEM POLICYINFO_it = {
|
|||
.size = sizeof(POLICYINFO),
|
||||
.sname = "POLICYINFO",
|
||||
};
|
||||
LCRYPTO_ALIAS(POLICYINFO_it);
|
||||
|
||||
|
||||
POLICYINFO *
|
||||
|
|
@ -270,6 +272,7 @@ const ASN1_ITEM POLICYQUALINFO_it = {
|
|||
.size = sizeof(POLICYQUALINFO),
|
||||
.sname = "POLICYQUALINFO",
|
||||
};
|
||||
LCRYPTO_ALIAS(POLICYQUALINFO_it);
|
||||
|
||||
|
||||
POLICYQUALINFO *
|
||||
|
|
@ -327,6 +330,7 @@ const ASN1_ITEM USERNOTICE_it = {
|
|||
.size = sizeof(USERNOTICE),
|
||||
.sname = "USERNOTICE",
|
||||
};
|
||||
LCRYPTO_ALIAS(USERNOTICE_it);
|
||||
|
||||
|
||||
USERNOTICE *
|
||||
|
|
@ -384,6 +388,7 @@ const ASN1_ITEM NOTICEREF_it = {
|
|||
.size = sizeof(NOTICEREF),
|
||||
.sname = "NOTICEREF",
|
||||
};
|
||||
LCRYPTO_ALIAS(NOTICEREF_it);
|
||||
|
||||
|
||||
NOTICEREF *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_crld.c,v 1.5 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_crld.c,v 1.6 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -417,6 +417,7 @@ const ASN1_ITEM DIST_POINT_NAME_it = {
|
|||
.size = sizeof(DIST_POINT_NAME),
|
||||
.sname = "DIST_POINT_NAME",
|
||||
};
|
||||
LCRYPTO_ALIAS(DIST_POINT_NAME_it);
|
||||
|
||||
|
||||
|
||||
|
|
@ -482,6 +483,7 @@ const ASN1_ITEM DIST_POINT_it = {
|
|||
.size = sizeof(DIST_POINT),
|
||||
.sname = "DIST_POINT",
|
||||
};
|
||||
LCRYPTO_ALIAS(DIST_POINT_it);
|
||||
|
||||
|
||||
DIST_POINT *
|
||||
|
|
@ -530,6 +532,7 @@ const ASN1_ITEM CRL_DIST_POINTS_it = {
|
|||
.size = 0,
|
||||
.sname = "CRL_DIST_POINTS",
|
||||
};
|
||||
LCRYPTO_ALIAS(CRL_DIST_POINTS_it);
|
||||
|
||||
|
||||
CRL_DIST_POINTS *
|
||||
|
|
@ -615,6 +618,7 @@ const ASN1_ITEM ISSUING_DIST_POINT_it = {
|
|||
.size = sizeof(ISSUING_DIST_POINT),
|
||||
.sname = "ISSUING_DIST_POINT",
|
||||
};
|
||||
LCRYPTO_ALIAS(ISSUING_DIST_POINT_it);
|
||||
|
||||
|
||||
ISSUING_DIST_POINT *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_extku.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_extku.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -120,6 +120,7 @@ const ASN1_ITEM EXTENDED_KEY_USAGE_it = {
|
|||
.size = 0,
|
||||
.sname = "EXTENDED_KEY_USAGE",
|
||||
};
|
||||
LCRYPTO_ALIAS(EXTENDED_KEY_USAGE_it);
|
||||
|
||||
|
||||
EXTENDED_KEY_USAGE *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_genn.c,v 1.6 2023/04/25 15:51:04 tb Exp $ */
|
||||
/* $OpenBSD: x509_genn.c,v 1.7 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -90,6 +90,7 @@ const ASN1_ITEM OTHERNAME_it = {
|
|||
.size = sizeof(OTHERNAME),
|
||||
.sname = "OTHERNAME",
|
||||
};
|
||||
LCRYPTO_ALIAS(OTHERNAME_it);
|
||||
|
||||
|
||||
OTHERNAME *
|
||||
|
|
@ -148,6 +149,7 @@ const ASN1_ITEM EDIPARTYNAME_it = {
|
|||
.size = sizeof(EDIPARTYNAME),
|
||||
.sname = "EDIPARTYNAME",
|
||||
};
|
||||
LCRYPTO_ALIAS(EDIPARTYNAME_it);
|
||||
|
||||
|
||||
EDIPARTYNAME *
|
||||
|
|
@ -256,6 +258,7 @@ const ASN1_ITEM GENERAL_NAME_it = {
|
|||
.size = sizeof(GENERAL_NAME),
|
||||
.sname = "GENERAL_NAME",
|
||||
};
|
||||
LCRYPTO_ALIAS(GENERAL_NAME_it);
|
||||
|
||||
|
||||
GENERAL_NAME *
|
||||
|
|
@ -304,6 +307,7 @@ const ASN1_ITEM GENERAL_NAMES_it = {
|
|||
.size = 0,
|
||||
.sname = "GENERAL_NAMES",
|
||||
};
|
||||
LCRYPTO_ALIAS(GENERAL_NAMES_it);
|
||||
|
||||
|
||||
GENERAL_NAMES *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_info.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_info.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -131,6 +131,7 @@ const ASN1_ITEM ACCESS_DESCRIPTION_it = {
|
|||
.size = sizeof(ACCESS_DESCRIPTION),
|
||||
.sname = "ACCESS_DESCRIPTION",
|
||||
};
|
||||
LCRYPTO_ALIAS(ACCESS_DESCRIPTION_it);
|
||||
|
||||
|
||||
ACCESS_DESCRIPTION *
|
||||
|
|
@ -179,6 +180,7 @@ const ASN1_ITEM AUTHORITY_INFO_ACCESS_it = {
|
|||
.size = 0,
|
||||
.sname = "AUTHORITY_INFO_ACCESS",
|
||||
};
|
||||
LCRYPTO_ALIAS(AUTHORITY_INFO_ACCESS_it);
|
||||
|
||||
|
||||
AUTHORITY_INFO_ACCESS *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_ncons.c,v 1.9 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_ncons.c,v 1.10 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
|
|
@ -131,6 +131,7 @@ const ASN1_ITEM GENERAL_SUBTREE_it = {
|
|||
.size = sizeof(GENERAL_SUBTREE),
|
||||
.sname = "GENERAL_SUBTREE",
|
||||
};
|
||||
LCRYPTO_ALIAS(GENERAL_SUBTREE_it);
|
||||
|
||||
static const ASN1_TEMPLATE NAME_CONSTRAINTS_seq_tt[] = {
|
||||
{
|
||||
|
|
@ -158,6 +159,7 @@ const ASN1_ITEM NAME_CONSTRAINTS_it = {
|
|||
.size = sizeof(NAME_CONSTRAINTS),
|
||||
.sname = "NAME_CONSTRAINTS",
|
||||
};
|
||||
LCRYPTO_ALIAS(NAME_CONSTRAINTS_it);
|
||||
|
||||
|
||||
GENERAL_SUBTREE *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_pcons.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_pcons.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
|
|
@ -114,6 +114,7 @@ const ASN1_ITEM POLICY_CONSTRAINTS_it = {
|
|||
.size = sizeof(POLICY_CONSTRAINTS),
|
||||
.sname = "POLICY_CONSTRAINTS",
|
||||
};
|
||||
LCRYPTO_ALIAS(POLICY_CONSTRAINTS_it);
|
||||
|
||||
|
||||
POLICY_CONSTRAINTS *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_pku.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_pku.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
*/
|
||||
|
|
@ -108,6 +108,7 @@ const ASN1_ITEM PKEY_USAGE_PERIOD_it = {
|
|||
.size = sizeof(PKEY_USAGE_PERIOD),
|
||||
.sname = "PKEY_USAGE_PERIOD",
|
||||
};
|
||||
LCRYPTO_ALIAS(PKEY_USAGE_PERIOD_it);
|
||||
|
||||
|
||||
PKEY_USAGE_PERIOD *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_pmaps.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_pmaps.c,v 1.4 2024/07/08 14:47:44 beck Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
|
|
@ -112,6 +112,7 @@ const ASN1_ITEM POLICY_MAPPING_it = {
|
|||
.size = sizeof(POLICY_MAPPING),
|
||||
.sname = "POLICY_MAPPING",
|
||||
};
|
||||
LCRYPTO_ALIAS(POLICY_MAPPING_it);
|
||||
|
||||
static const ASN1_TEMPLATE POLICY_MAPPINGS_item_tt = {
|
||||
.flags = ASN1_TFLG_SEQUENCE_OF,
|
||||
|
|
@ -130,6 +131,7 @@ const ASN1_ITEM POLICY_MAPPINGS_it = {
|
|||
.size = 0,
|
||||
.sname = "POLICY_MAPPINGS",
|
||||
};
|
||||
LCRYPTO_ALIAS(POLICY_MAPPINGS_it);
|
||||
|
||||
|
||||
POLICY_MAPPING *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_utl.c,v 1.18 2024/06/18 08:29:40 tb Exp $ */
|
||||
/* $OpenBSD: x509_utl.c,v 1.19 2024/07/08 06:57:37 jca Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
|
|
@ -1325,9 +1325,10 @@ ipv6_from_asc(unsigned char *v6, const char *in)
|
|||
v6stat.zero_pos = -1;
|
||||
v6stat.zero_cnt = 0;
|
||||
|
||||
/* Treat the IPv6 representation as a list of values
|
||||
* separated by ':'. The presence of a '::' will parse
|
||||
* as one, two or three zero length elements.
|
||||
/*
|
||||
* Treat the IPv6 representation as a list of values separated by ':'.
|
||||
* The presence of a '::' will parse as one (e.g., "2001:db8::1"),
|
||||
* two (e.g., "2001:db8::") or three (e.g., "::") zero length elements.
|
||||
*/
|
||||
if (!CONF_parse_list(in, ':', 0, ipv6_cb, &v6stat))
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue