hdkv/yuzu
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

early-access version 2698

Browse Source
This commit is contained in:
pineappleEA
2022-04-24 22:29:35 +02:00
parent c96f949832
commit caa0c2911b
486 changed files with 37806 additions and 14362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
externals/libressl/crypto/objects/obj_dat.c vendored
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: obj_dat.c,v 1.42 2019/07/03 03:24:04 deraadt Exp $ */
/* $OpenBSD: obj_dat.c,v 1.49 2022/03/19 17:49:32 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -69,6 +69,8 @@
#include <openssl/lhash.h>
#include <openssl/objects.h>
#include "asn1_locl.h"
/* obj_dat.h is generated from objects.h by obj_dat.pl */
#include "obj_dat.h"
@@ -456,9 +458,9 @@ OBJ_obj2nid(const ASN1_OBJECT *a)
const unsigned int *op;
ADDED_OBJ ad, *adp;
if (a == NULL)
if (a == NULL || a->length == 0)
return (NID_undef);
if (a->nid != 0)
if (a->nid != NID_undef)
return (a->nid);
if (added != NULL) {
@@ -483,12 +485,7 @@ OBJ_obj2nid(const ASN1_OBJECT *a)
ASN1_OBJECT *
OBJ_txt2obj(const char *s, int no_name)
{
int nid = NID_undef;
ASN1_OBJECT *op = NULL;
unsigned char *buf;
unsigned char *p;
const unsigned char *cp;
int i, j;
int nid;
if (!no_name) {
if (((nid = OBJ_sn2nid(s)) != NID_undef) ||
@@ -496,149 +493,16 @@ OBJ_txt2obj(const char *s, int no_name)
return OBJ_nid2obj(nid);
}
/* Work out size of content octets */
i = a2d_ASN1_OBJECT(NULL, 0, s, -1);
if (i <= 0) {
/* Don't clear the error */
/*ERR_clear_error();*/
return NULL;
}
/* Work out total size */
j = ASN1_object_size(0, i, V_ASN1_OBJECT);
if ((buf = malloc(j)) == NULL)
return NULL;
p = buf;
/* Write out tag+length */
ASN1_put_object(&p, 0, i, V_ASN1_OBJECT, V_ASN1_UNIVERSAL);
/* Write out contents */
a2d_ASN1_OBJECT(p, i, s, -1);
cp = buf;
op = d2i_ASN1_OBJECT(NULL, &cp, j);
free(buf);
return op;
return t2i_ASN1_OBJECT_internal(s);
}
int
OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *aobj, int no_name)
{
int i, ret = 0, len, nid, first = 1, use_bn;
BIGNUM *bl = NULL;
unsigned long l;
const unsigned char *p;
if (aobj == NULL || aobj->data == NULL)
return 0;
/* Ensure that, at every state, |buf| is NUL-terminated. */
if (buf_len > 0)
buf[0] = '\0';
if ((a == NULL) || (a->data == NULL))
goto err;
if (!no_name && (nid = OBJ_obj2nid(a)) != NID_undef) {
const char *s;
s = OBJ_nid2ln(nid);
if (s == NULL)
s = OBJ_nid2sn(nid);
if (s) {
ret = strlcpy(buf, s, buf_len);
goto out;
}
}
len = a->length;
p = a->data;
while (len > 0) {
l = 0;
use_bn = 0;
for (;;) {
unsigned char c = *p++;
len--;
if ((len == 0) && (c & 0x80))
goto err;
if (use_bn) {
if (!BN_add_word(bl, c & 0x7f))
goto err;
} else
l |= c & 0x7f;
if (!(c & 0x80))
break;
if (!use_bn && (l > (ULONG_MAX >> 7L))) {
if (!bl && !(bl = BN_new()))
goto err;
if (!BN_set_word(bl, l))
goto err;
use_bn = 1;
}
if (use_bn) {
if (!BN_lshift(bl, bl, 7))
goto err;
} else
l <<= 7L;
}
if (first) {
first = 0;
if (l >= 80) {
i = 2;
if (use_bn) {
if (!BN_sub_word(bl, 80))
goto err;
} else
l -= 80;
} else {
i = (int)(l / 40);
l -= (long)(i * 40);
}
if (buf_len > 1) {
*buf++ = i + '0';
*buf = '\0';
buf_len--;
}
ret++;
}
if (use_bn) {
char *bndec;
bndec = BN_bn2dec(bl);
if (!bndec)
goto err;
i = snprintf(buf, buf_len, ".%s", bndec);
free(bndec);
if (i < 0)
goto err;
if (i >= buf_len) {
buf_len = 0;
} else {
buf += i;
buf_len -= i;
}
ret += i;
} else {
i = snprintf(buf, buf_len, ".%lu", l);
if (i < 0)
goto err;
if (i >= buf_len) {
buf_len = 0;
} else {
buf += i;
buf_len -= i;
}
ret += i;
l = 0;
}
}
out:
BN_free(bl);
return ret;
err:
ret = 0;
goto out;
return i2t_ASN1_OBJECT_internal(aobj, buf, buf_len, no_name);
}
int
@@ -815,3 +679,24 @@ OBJ_create(const char *oid, const char *sn, const char *ln)
free(buf);
return (ok);
}
size_t
OBJ_length(const ASN1_OBJECT *obj)
{
if (obj == NULL)
return 0;
if (obj->length < 0)
return 0;
return obj->length;
}
const unsigned char *
OBJ_get0_data(const ASN1_OBJECT *obj)
{
if (obj == NULL)
return NULL;
return obj->data;
}

130
externals/libressl/crypto/objects/obj_dat.h vendored
View File

@@ -62,12 +62,12 @@
* [including the GNU Public Licence.]
*/
#define NUM_NID 1001
#define NUM_SN 994
#define NUM_LN 994
#define NUM_OBJ 924
#define NUM_NID 1022
#define NUM_SN 1015
#define NUM_LN 1015
#define NUM_OBJ 945
static const unsigned char lvalues[6481]={
static const unsigned char lvalues[6677]={
0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 0] OBJ_rsadsi */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 6] OBJ_pkcs */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02, /* [ 13] OBJ_md2 */
@@ -986,6 +986,27 @@ static const unsigned char lvalues[6481]={
0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x02,0x03,/* [6455] OBJ_id_tc26_gost_3410_12_512_paramSetC */
0x2A,0x85,0x03,0x07,0x01,0x01,0x04,0x01, /* [6464] OBJ_id_tc26_hmac_gost_3411_12_256 */
0x2A,0x85,0x03,0x07,0x01,0x01,0x04,0x02, /* [6472] OBJ_id_tc26_hmac_gost_3411_12_512 */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x18,/* [6480] OBJ_id_ct_routeOriginAuthz */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x1A,/* [6491] OBJ_id_ct_rpkiManifest */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x23,/* [6502] OBJ_id_ct_rpkiGhostbusters */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x24,/* [6513] OBJ_id_ct_resourceTaggedAttest */
0x2B,0x06,0x01,0x05,0x05,0x07,0x0E, /* [6524] OBJ_id_cp */
0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x1C, /* [6531] OBJ_sbgp_ipAddrBlockv2 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x1D, /* [6539] OBJ_sbgp_autonomousSysNumv2 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x0E,0x02, /* [6547] OBJ_ipAddr_asNumber */
0x2B,0x06,0x01,0x05,0x05,0x07,0x0E,0x03, /* [6555] OBJ_ipAddr_asNumberv2 */
0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x0A, /* [6563] OBJ_rpkiManifest */
0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x0B, /* [6571] OBJ_signedObject */
0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x0D, /* [6579] OBJ_rpkiNotify */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x2F,/* [6587] OBJ_id_ct_geofeedCSVwithCRLF */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x30,/* [6598] OBJ_id_ct_signedChecklist */
0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x1E, /* [6609] OBJ_id_kp_bgpsec_router */
0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x18, /* [6617] OBJ_tlsfeature */
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x31,/* [6625] OBJ_id_ct_ASPA */
0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x02,/* [6636] OBJ_ct_precert_scts */
0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x03,/* [6646] OBJ_ct_precert_poison */
0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x04,/* [6656] OBJ_ct_precert_signer */
0x2B,0x06,0x01,0x04,0x01,0xD6,0x79,0x02,0x04,0x05,/* [6666] OBJ_ct_cert_scts */
};
static const ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2612,6 +2633,42 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
NID_id_tc26_hmac_gost_3411_12_256,8,&(lvalues[6464]),0},
{"id-tc26-hmac-gost-3411-12-512","HMAC STREEBOG 512",
NID_id_tc26_hmac_gost_3411_12_512,8,&(lvalues[6472]),0},
{"id-ct-routeOriginAuthz","id-ct-routeOriginAuthz",
NID_id_ct_routeOriginAuthz,11,&(lvalues[6480]),0},
{"id-ct-rpkiManifest","id-ct-rpkiManifest",NID_id_ct_rpkiManifest,11,
&(lvalues[6491]),0},
{"id-ct-rpkiGhostbusters","id-ct-rpkiGhostbusters",
NID_id_ct_rpkiGhostbusters,11,&(lvalues[6502]),0},
{"id-ct-resourceTaggedAttest","id-ct-resourceTaggedAttest",
NID_id_ct_resourceTaggedAttest,11,&(lvalues[6513]),0},
{"id-cp","id-cp",NID_id_cp,7,&(lvalues[6524]),0},
{"sbgp-ipAddrBlockv2","sbgp-ipAddrBlockv2",NID_sbgp_ipAddrBlockv2,8,
&(lvalues[6531]),0},
{"sbgp-autonomousSysNumv2","sbgp-autonomousSysNumv2",
NID_sbgp_autonomousSysNumv2,8,&(lvalues[6539]),0},
{"ipAddr-asNumber","ipAddr-asNumber",NID_ipAddr_asNumber,8,
&(lvalues[6547]),0},
{"ipAddr-asNumberv2","ipAddr-asNumberv2",NID_ipAddr_asNumberv2,8,
&(lvalues[6555]),0},
{"rpkiManifest","RPKI Manifest",NID_rpkiManifest,8,&(lvalues[6563]),0},
{"signedObject","Signed Object",NID_signedObject,8,&(lvalues[6571]),0},
{"rpkiNotify","RPKI Notify",NID_rpkiNotify,8,&(lvalues[6579]),0},
{"id-ct-geofeedCSVwithCRLF","id-ct-geofeedCSVwithCRLF",
NID_id_ct_geofeedCSVwithCRLF,11,&(lvalues[6587]),0},
{"id-ct-signedChecklist","id-ct-signedChecklist",
NID_id_ct_signedChecklist,11,&(lvalues[6598]),0},
{"id-kp-bgpsec-router","BGPsec Router",NID_id_kp_bgpsec_router,8,
&(lvalues[6609]),0},
{"tlsfeature","TLS Feature",NID_tlsfeature,8,&(lvalues[6617]),0},
{"id-ct-ASPA","id-ct-ASPA",NID_id_ct_ASPA,11,&(lvalues[6625]),0},
{"ct_precert_scts","CT Precertificate SCTs",NID_ct_precert_scts,10,
&(lvalues[6636]),0},
{"ct_precert_poison","CT Precertificate Poison",NID_ct_precert_poison,
10,&(lvalues[6646]),0},
{"ct_precert_signer","CT Precertificate Signer",NID_ct_precert_signer,
10,&(lvalues[6656]),0},
{"ct_cert_scts","CT Certificate SCTs",NID_ct_cert_scts,10,
&(lvalues[6666]),0},
};
static const unsigned int sn_objs[NUM_SN]={
@@ -2914,6 +2971,10 @@ static const unsigned int sn_objs[NUM_SN]={
884, /* "crossCertificatePair" */
806, /* "cryptocom" */
805, /* "cryptopro" */
1021, /* "ct_cert_scts" */
1019, /* "ct_precert_poison" */
1018, /* "ct_precert_scts" */
1020, /* "ct_precert_signer" */
500, /* "dITRedirect" */
451, /* "dNSDomain" */
495, /* "dSAQuality" */
@@ -3096,7 +3157,15 @@ static const unsigned int sn_objs[NUM_SN]={
332, /* "id-cmc-senderNonce" */
327, /* "id-cmc-statusInfo" */
331, /* "id-cmc-transactionId" */
1005, /* "id-cp" */
1017, /* "id-ct-ASPA" */
787, /* "id-ct-asciiTextWithCRLF" */
1013, /* "id-ct-geofeedCSVwithCRLF" */
1004, /* "id-ct-resourceTaggedAttest" */
1001, /* "id-ct-routeOriginAuthz" */
1003, /* "id-ct-rpkiGhostbusters" */
1002, /* "id-ct-rpkiManifest" */
1014, /* "id-ct-signedChecklist" */
408, /* "id-ecPublicKey" */
508, /* "id-hex-multipart-message" */
507, /* "id-hex-partial-message" */
@@ -3118,6 +3187,7 @@ static const unsigned int sn_objs[NUM_SN]={
784, /* "id-it-suppLangTags" */
304, /* "id-it-unsupportedOIDs" */
128, /* "id-kp" */
1015, /* "id-kp-bgpsec-router" */
280, /* "id-mod-attribute-cert" */
274, /* "id-mod-cmc" */
277, /* "id-mod-cmp" */
@@ -3257,6 +3327,8 @@ static const unsigned int sn_objs[NUM_SN]={
647, /* "international-organizations" */
869, /* "internationaliSDNNumber" */
142, /* "invalidityDate" */
1008, /* "ipAddr-asNumber" */
1009, /* "ipAddr-asNumberv2" */
294, /* "ipsecEndSystem" */
295, /* "ipsecTunnel" */
296, /* "ipsecUser" */
@@ -3375,6 +3447,8 @@ static const unsigned int sn_objs[NUM_SN]={
877, /* "roleOccupant" */
448, /* "room" */
463, /* "roomNumber" */
1010, /* "rpkiManifest" */
1012, /* "rpkiNotify" */
6, /* "rsaEncryption" */
644, /* "rsaOAEPEncryptionSET" */
377, /* "rsaSignature" */
@@ -3382,7 +3456,9 @@ static const unsigned int sn_objs[NUM_SN]={
482, /* "sOARecord" */
155, /* "safeContentsBag" */
291, /* "sbgp-autonomousSysNum" */
1007, /* "sbgp-autonomousSysNumv2" */
290, /* "sbgp-ipAddrBlock" */
1006, /* "sbgp-ipAddrBlockv2" */
292, /* "sbgp-routerIdentifier" */
159, /* "sdsiCertificate" */
859, /* "searchGuide" */
@@ -3555,6 +3631,7 @@ static const unsigned int sn_objs[NUM_SN]={
604, /* "setext-pinAny" */
603, /* "setext-pinSecure" */
605, /* "setext-track2" */
1011, /* "signedObject" */
52, /* "signingTime" */
454, /* "simpleSecurityObject" */
496, /* "singleLevelQuality" */
@@ -3581,6 +3658,7 @@ static const unsigned int sn_objs[NUM_SN]={
293, /* "textNotice" */
133, /* "timeStamping" */
106, /* "title" */
1016, /* "tlsfeature" */
682, /* "tpBasis" */
375, /* "trustRoot" */
436, /* "ucl" */
@@ -3618,10 +3696,15 @@ static const unsigned int ln_objs[NUM_LN]={
910, /* "Any Extended Key Usage" */
664, /* "Any language" */
177, /* "Authority Information Access" */
1015, /* "BGPsec Router" */
365, /* "Basic OCSP Response" */
285, /* "Biometric Info" */
179, /* "CA Issuers" */
785, /* "CA Repository" */
1021, /* "CT Certificate SCTs" */
1019, /* "CT Precertificate Poison" */
1018, /* "CT Precertificate SCTs" */
1020, /* "CT Precertificate Signer" */
131, /* "Code Signing" */
783, /* "Diffie-Hellman based MAC" */
382, /* "Directory" */
@@ -3728,6 +3811,8 @@ static const unsigned int ln_objs[NUM_LN]={
165, /* "Policy Qualifier User Notice" */
385, /* "Private" */
663, /* "Proxy Certificate Information" */
1010, /* "RPKI Manifest" */
1012, /* "RPKI Notify" */
1, /* "RSA Data Security, Inc." */
2, /* "RSA Data Security, Inc. PKCS" */
188, /* "S/MIME" */
@@ -3736,8 +3821,10 @@ static const unsigned int ln_objs[NUM_LN]={
512, /* "Secure Electronic Transactions" */
386, /* "Security" */
394, /* "Selected Attribute Types" */
1011, /* "Signed Object" */
143, /* "Strong Extranet ID" */
398, /* "Subject Information Access" */
1016, /* "TLS Feature" */
130, /* "TLS Web Client Authentication" */
129, /* "TLS Web Server Authentication" */
133, /* "Time Stamping" */
@@ -4087,7 +4174,15 @@ static const unsigned int ln_objs[NUM_LN]={
332, /* "id-cmc-senderNonce" */
327, /* "id-cmc-statusInfo" */
331, /* "id-cmc-transactionId" */
1005, /* "id-cp" */
1017, /* "id-ct-ASPA" */
787, /* "id-ct-asciiTextWithCRLF" */
1013, /* "id-ct-geofeedCSVwithCRLF" */
1004, /* "id-ct-resourceTaggedAttest" */
1001, /* "id-ct-routeOriginAuthz" */
1003, /* "id-ct-rpkiGhostbusters" */
1002, /* "id-ct-rpkiManifest" */
1014, /* "id-ct-signedChecklist" */
408, /* "id-ecPublicKey" */
508, /* "id-hex-multipart-message" */
507, /* "id-hex-partial-message" */
@@ -4228,6 +4323,8 @@ static const unsigned int ln_objs[NUM_LN]={
461, /* "info" */
101, /* "initials" */
869, /* "internationaliSDNNumber" */
1008, /* "ipAddr-asNumber" */
1009, /* "ipAddr-asNumberv2" */
749, /* "ipsec3" */
750, /* "ipsec4" */
181, /* "iso" */
@@ -4374,7 +4471,9 @@ static const unsigned int ln_objs[NUM_LN]={
482, /* "sOARecord" */
155, /* "safeContentsBag" */
291, /* "sbgp-autonomousSysNum" */
1007, /* "sbgp-autonomousSysNumv2" */
290, /* "sbgp-ipAddrBlock" */
1006, /* "sbgp-ipAddrBlockv2" */
292, /* "sbgp-routerIdentifier" */
159, /* "sdsiCertificate" */
859, /* "searchGuide" */
@@ -5015,6 +5114,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
266, /* OBJ_id_aca 1 3 6 1 5 5 7 10 */
267, /* OBJ_id_qcs 1 3 6 1 5 5 7 11 */
268, /* OBJ_id_cct 1 3 6 1 5 5 7 12 */
1005, /* OBJ_id_cp 1 3 6 1 5 5 7 14 */
662, /* OBJ_id_ppl 1 3 6 1 5 5 7 21 */
176, /* OBJ_id_ad 1 3 6 1 5 5 7 48 */
507, /* OBJ_id_hex_partial_message 1 3 6 1 7 1 1 1 */
@@ -5137,6 +5237,9 @@ static const unsigned int obj_objs[NUM_OBJ]={
397, /* OBJ_ac_proxying 1 3 6 1 5 5 7 1 10 */
398, /* OBJ_sinfo_access 1 3 6 1 5 5 7 1 11 */
663, /* OBJ_proxyCertInfo 1 3 6 1 5 5 7 1 14 */
1016, /* OBJ_tlsfeature 1 3 6 1 5 5 7 1 24 */
1006, /* OBJ_sbgp_ipAddrBlockv2 1 3 6 1 5 5 7 1 28 */
1007, /* OBJ_sbgp_autonomousSysNumv2 1 3 6 1 5 5 7 1 29 */
164, /* OBJ_id_qt_cps 1 3 6 1 5 5 7 2 1 */
165, /* OBJ_id_qt_unotice 1 3 6 1 5 5 7 2 2 */
293, /* OBJ_textNotice 1 3 6 1 5 5 7 2 3 */
@@ -5150,6 +5253,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
133, /* OBJ_time_stamp 1 3 6 1 5 5 7 3 8 */
180, /* OBJ_OCSP_sign 1 3 6 1 5 5 7 3 9 */
297, /* OBJ_dvcs 1 3 6 1 5 5 7 3 10 */
1015, /* OBJ_id_kp_bgpsec_router 1 3 6 1 5 5 7 3 30 */
298, /* OBJ_id_it_caProtEncCert 1 3 6 1 5 5 7 4 1 */
299, /* OBJ_id_it_signKeyPairTypes 1 3 6 1 5 5 7 4 2 */
300, /* OBJ_id_it_encKeyPairTypes 1 3 6 1 5 5 7 4 3 */
@@ -5209,6 +5313,8 @@ static const unsigned int obj_objs[NUM_OBJ]={
360, /* OBJ_id_cct_crs 1 3 6 1 5 5 7 12 1 */
361, /* OBJ_id_cct_PKIData 1 3 6 1 5 5 7 12 2 */
362, /* OBJ_id_cct_PKIResponse 1 3 6 1 5 5 7 12 3 */
1008, /* OBJ_ipAddr_asNumber 1 3 6 1 5 5 7 14 2 */
1009, /* OBJ_ipAddr_asNumberv2 1 3 6 1 5 5 7 14 3 */
664, /* OBJ_id_ppl_anyLanguage 1 3 6 1 5 5 7 21 0 */
665, /* OBJ_id_ppl_inheritAll 1 3 6 1 5 5 7 21 1 */
667, /* OBJ_Independent 1 3 6 1 5 5 7 21 2 */
@@ -5217,6 +5323,9 @@ static const unsigned int obj_objs[NUM_OBJ]={
363, /* OBJ_ad_timeStamping 1 3 6 1 5 5 7 48 3 */
364, /* OBJ_ad_dvcs 1 3 6 1 5 5 7 48 4 */
785, /* OBJ_caRepository 1 3 6 1 5 5 7 48 5 */
1010, /* OBJ_rpkiManifest 1 3 6 1 5 5 7 48 10 */
1011, /* OBJ_signedObject 1 3 6 1 5 5 7 48 11 */
1012, /* OBJ_rpkiNotify 1 3 6 1 5 5 7 48 13 */
780, /* OBJ_hmac_md5 1 3 6 1 5 5 8 1 1 */
781, /* OBJ_hmac_sha1 1 3 6 1 5 5 8 1 2 */
58, /* OBJ_netscape_cert_extension 2 16 840 1 113730 1 */
@@ -5452,6 +5561,10 @@ static const unsigned int obj_objs[NUM_OBJ]={
138, /* OBJ_ms_efs 1 3 6 1 4 1 311 10 3 4 */
648, /* OBJ_ms_smartcard_login 1 3 6 1 4 1 311 20 2 2 */
649, /* OBJ_ms_upn 1 3 6 1 4 1 311 20 2 3 */
1018, /* OBJ_ct_precert_scts 1 3 6 1 4 1 11129 2 4 2 */
1019, /* OBJ_ct_precert_poison 1 3 6 1 4 1 11129 2 4 3 */
1020, /* OBJ_ct_precert_signer 1 3 6 1 4 1 11129 2 4 4 */
1021, /* OBJ_ct_cert_scts 1 3 6 1 4 1 11129 2 4 5 */
751, /* OBJ_camellia_128_cbc 1 2 392 200011 61 1 1 1 2 */
752, /* OBJ_camellia_192_cbc 1 2 392 200011 61 1 1 1 3 */
753, /* OBJ_camellia_256_cbc 1 2 392 200011 61 1 1 1 4 */
@@ -5475,7 +5588,14 @@ static const unsigned int obj_objs[NUM_OBJ]={
210, /* OBJ_id_smime_ct_DVCSRequestData 1 2 840 113549 1 9 16 1 7 */
211, /* OBJ_id_smime_ct_DVCSResponseData 1 2 840 113549 1 9 16 1 8 */
786, /* OBJ_id_smime_ct_compressedData 1 2 840 113549 1 9 16 1 9 */
1001, /* OBJ_id_ct_routeOriginAuthz 1 2 840 113549 1 9 16 1 24 */
1002, /* OBJ_id_ct_rpkiManifest 1 2 840 113549 1 9 16 1 26 */
787, /* OBJ_id_ct_asciiTextWithCRLF 1 2 840 113549 1 9 16 1 27 */
1003, /* OBJ_id_ct_rpkiGhostbusters 1 2 840 113549 1 9 16 1 35 */
1004, /* OBJ_id_ct_resourceTaggedAttest 1 2 840 113549 1 9 16 1 36 */
1013, /* OBJ_id_ct_geofeedCSVwithCRLF 1 2 840 113549 1 9 16 1 47 */
1014, /* OBJ_id_ct_signedChecklist 1 2 840 113549 1 9 16 1 48 */
1017, /* OBJ_id_ct_ASPA 1 2 840 113549 1 9 16 1 49 */
212, /* OBJ_id_smime_aa_receiptRequest 1 2 840 113549 1 9 16 2 1 */
213, /* OBJ_id_smime_aa_securityLabel 1 2 840 113549 1 9 16 2 2 */
214, /* OBJ_id_smime_aa_mlExpandHistory 1 2 840 113549 1 9 16 2 3 */

4
externals/libressl/crypto/objects/obj_lib.c vendored
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: obj_lib.c,v 1.15 2018/09/08 10:31:24 tb Exp $ */
/* $OpenBSD: obj_lib.c,v 1.16 2022/01/07 11:13:54 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -64,6 +64,8 @@
#include <openssl/lhash.h>
#include <openssl/objects.h>
#include "asn1_locl.h"
ASN1_OBJECT *
OBJ_dup(const ASN1_OBJECT *o)
{

22
externals/libressl/crypto/objects/obj_xref.h vendored
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: obj_xref.h,v 1.4 2016/12/21 15:49:29 jsing Exp $ */
/* $OpenBSD: obj_xref.h,v 1.5 2021/05/12 10:24:39 inoguchi Exp $ */
/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */
__BEGIN_HIDDEN_DECLS
@@ -44,6 +44,16 @@ static const nid_triple sigoid_srt[] =
{NID_rsassaPss, NID_undef, NID_rsaEncryption},
{NID_id_tc26_signwithdigest_gost3410_2012_256, NID_id_tc26_gost3411_2012_256, NID_id_GostR3410_2001},
{NID_id_tc26_signwithdigest_gost3410_2012_512, NID_id_tc26_gost3411_2012_512, NID_id_GostR3410_2001},
{NID_dhSinglePass_stdDH_sha1kdf_scheme, NID_sha1, NID_dh_std_kdf},
{NID_dhSinglePass_stdDH_sha224kdf_scheme, NID_sha224, NID_dh_std_kdf},
{NID_dhSinglePass_stdDH_sha256kdf_scheme, NID_sha256, NID_dh_std_kdf},
{NID_dhSinglePass_stdDH_sha384kdf_scheme, NID_sha384, NID_dh_std_kdf},
{NID_dhSinglePass_stdDH_sha512kdf_scheme, NID_sha512, NID_dh_std_kdf},
{NID_dhSinglePass_cofactorDH_sha1kdf_scheme, NID_sha1, NID_dh_cofactor_kdf},
{NID_dhSinglePass_cofactorDH_sha224kdf_scheme, NID_sha224, NID_dh_cofactor_kdf},
{NID_dhSinglePass_cofactorDH_sha256kdf_scheme, NID_sha256, NID_dh_cofactor_kdf},
{NID_dhSinglePass_cofactorDH_sha384kdf_scheme, NID_sha384, NID_dh_cofactor_kdf},
{NID_dhSinglePass_cofactorDH_sha512kdf_scheme, NID_sha512, NID_dh_cofactor_kdf},
};
static const nid_triple * const sigoid_srt_xref[] =
@@ -61,19 +71,29 @@ static const nid_triple * const sigoid_srt_xref[] =
&sigoid_srt[5],
&sigoid_srt[8],
&sigoid_srt[12],
&sigoid_srt[32],
&sigoid_srt[37],
&sigoid_srt[6],
&sigoid_srt[10],
&sigoid_srt[11],
&sigoid_srt[13],
&sigoid_srt[24],
&sigoid_srt[20],
&sigoid_srt[34],
&sigoid_srt[39],
&sigoid_srt[14],
&sigoid_srt[21],
&sigoid_srt[35],
&sigoid_srt[40],
&sigoid_srt[15],
&sigoid_srt[22],
&sigoid_srt[36],
&sigoid_srt[41],
&sigoid_srt[16],
&sigoid_srt[23],
&sigoid_srt[19],
&sigoid_srt[33],
&sigoid_srt[38],
&sigoid_srt[25],
&sigoid_srt[26],
&sigoid_srt[27],