OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update main-with-bazel from master branch

Browse Source
This commit is contained in:
BoringSSL Robot
2023-10-12 15:11:28 +00:00
parent 2b0e4e78b8 26d84fdf02
commit fcdb4fbc74
10 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/crypto/asn1/internal.h
-1
View File
@@ -256,7 +256,6 @@ typedef void ASN1_ex_free_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
typedef struct ASN1_EXTERN_FUNCS_st {
ASN1_ex_new_func *asn1_ex_new;
ASN1_ex_free_func *asn1_ex_free;
ASN1_ex_free_func *asn1_ex_clear;
ASN1_ex_d2i *asn1_ex_d2i;
ASN1_ex_i2d *asn1_ex_i2d;
} ASN1_EXTERN_FUNCS;
src/crypto/asn1/tasn_new.c
+2 -9
View File
@@ -183,16 +183,9 @@ auxerr:
}
static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it) {
const ASN1_EXTERN_FUNCS *ef;
switch (it->itype) {
case ASN1_ITYPE_EXTERN:
ef = it->funcs;
if (ef && ef->asn1_ex_clear) {
ef->asn1_ex_clear(pval, it);
} else {
*pval = NULL;
}
*pval = NULL;
break;
case ASN1_ITYPE_PRIMITIVE:
@@ -274,7 +267,7 @@ static int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it) {
}
switch (utype) {
case V_ASN1_OBJECT:
*pval = (ASN1_VALUE *)OBJ_nid2obj(NID_undef);
*pval = (ASN1_VALUE *)OBJ_get_undef();
return 1;
case V_ASN1_BOOLEAN:
src/crypto/obj/obj.c
+33 -9
View File
@@ -179,12 +179,19 @@ size_t OBJ_length(const ASN1_OBJECT *obj) {
return (size_t)obj->length;
}
static const ASN1_OBJECT *get_builtin_object(int nid) {
// |NID_undef| is stored separately, so all the indices are off by one. The
// caller of this function must have a valid built-in, non-undef NID.
BSSL_CHECK(nid > 0 && nid < NUM_NID);
return &kObjects[nid - 1];
}
// obj_cmp is called to search the kNIDsInOIDOrder array. The |key| argument is
// an |ASN1_OBJECT|* that we're looking for and |element| is a pointer to an
// unsigned int in the array.
static int obj_cmp(const void *key, const void *element) {
uint16_t nid = *((const uint16_t *)element);
return OBJ_cmp(key, &kObjects[nid]);
return OBJ_cmp(key, get_builtin_object(nid));
}
int OBJ_obj2nid(const ASN1_OBJECT *obj) {
@@ -215,7 +222,7 @@ int OBJ_obj2nid(const ASN1_OBJECT *obj) {
return NID_undef;
}
return kObjects[*nid_ptr].nid;
return get_builtin_object(*nid_ptr)->nid;
}
int OBJ_cbs2nid(const CBS *cbs) {
@@ -238,7 +245,7 @@ static int short_name_cmp(const void *key, const void *element) {
const char *name = (const char *)key;
uint16_t nid = *((const uint16_t *)element);
return strcmp(name, kObjects[nid].sn);
return strcmp(name, get_builtin_object(nid)->sn);
}
int OBJ_sn2nid(const char *short_name) {
@@ -263,7 +270,7 @@ int OBJ_sn2nid(const char *short_name) {
return NID_undef;
}
return kObjects[*nid_ptr].nid;
return get_builtin_object(*nid_ptr)->nid;
}
// long_name_cmp is called to search the kNIDsInLongNameOrder array. The
@@ -273,7 +280,7 @@ static int long_name_cmp(const void *key, const void *element) {
const char *name = (const char *)key;
uint16_t nid = *((const uint16_t *)element);
return strcmp(name, kObjects[nid].ln);
return strcmp(name, get_builtin_object(nid)->ln);
}
int OBJ_ln2nid(const char *long_name) {
@@ -297,7 +304,7 @@ int OBJ_ln2nid(const char *long_name) {
return NID_undef;
}
return kObjects[*nid_ptr].nid;
return get_builtin_object(*nid_ptr)->nid;
}
int OBJ_txt2nid(const char *s) {
@@ -324,12 +331,29 @@ OPENSSL_EXPORT int OBJ_nid2cbb(CBB *out, int nid) {
return 1;
}
const ASN1_OBJECT *OBJ_get_undef(void) {
static const ASN1_OBJECT kUndef = {
/*sn=*/SN_undef,
/*ln=*/LN_undef,
/*nid=*/NID_undef,
/*length=*/0,
/*data=*/NULL,
/*flags=*/0,
};
return &kUndef;
}
ASN1_OBJECT *OBJ_nid2obj(int nid) {
if (nid >= 0 && nid < NUM_NID) {
if (nid != NID_undef && kObjects[nid].nid == NID_undef) {
if (nid == NID_undef) {
return (ASN1_OBJECT *)OBJ_get_undef();
}
if (nid > 0 && nid < NUM_NID) {
const ASN1_OBJECT *obj = get_builtin_object(nid);
if (nid != NID_undef && obj->nid == NID_undef) {
goto err;
}
return (ASN1_OBJECT *)&kObjects[nid];
return (ASN1_OBJECT *)obj;
}
CRYPTO_MUTEX_lock_read(&global_added_lock);
src/crypto/obj/obj_dat.h
-3
View File
@@ -7140,7 +7140,6 @@ static const uint8_t kObjectData[] = {
};
static const ASN1_OBJECT kObjects[NUM_NID] = {
{"UNDEF", "undefined", NID_undef, 0, NULL, 0},
{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &kObjectData[0], 0},
{"pkcs", "RSA Data Security, Inc. PKCS", NID_pkcs, 7, &kObjectData[6], 0},
{"MD2", "md2", NID_md2, 8, &kObjectData[13], 0},
@@ -8980,7 +8979,6 @@ static const uint16_t kNIDsInShortNameOrder[] = {
16 /* ST */,
143 /* SXNetID */,
458 /* UID */,
0 /* UNDEF */,
948 /* X25519 */,
964 /* X25519Kyber768Draft00 */,
961 /* X448 */,
@@ -10670,7 +10668,6 @@ static const uint16_t kNIDsInLongNameOrder[] = {
106 /* title */,
682 /* tpBasis */,
436 /* ucl */,
0 /* undefined */,
888 /* uniqueMember */,
55 /* unstructuredAddress */,
49 /* unstructuredName */,
src/crypto/obj/obj_test.cc
+4
View File
@@ -56,6 +56,10 @@ TEST(ObjTest, TestBasic) {
};
CBS_init(&cbs, kUnknownDER, sizeof(kUnknownDER));
ASSERT_EQ(NID_undef, OBJ_cbs2nid(&cbs));
EXPECT_EQ(NID_undef, OBJ_sn2nid("UNDEF"));
EXPECT_EQ(NID_undef, OBJ_ln2nid("undefined"));
EXPECT_EQ(OBJ_get_undef(), OBJ_nid2obj(NID_undef));
}
TEST(ObjTest, TestSignatureAlgorithms) {
src/crypto/obj/objects.go
+16 -2
View File
@@ -614,6 +614,12 @@ func writeData(path string, objs *objects) error {
// Emit an ASN1_OBJECT for each object.
fmt.Fprintf(&b, "\nstatic const ASN1_OBJECT kObjects[NUM_NID] = {\n")
for nid, obj := range objs.byNID {
// Skip the entry for NID_undef. It is stored separately, so that
// OBJ_get_undef avoids pulling in the table.
if nid == 0 {
continue
}
if len(obj.name) == 0 {
fmt.Fprintf(&b, "{NULL, NULL, NID_undef, 0, NULL, 0},\n")
continue
@@ -640,7 +646,11 @@ func writeData(path string, objs *objects) error {
fmt.Fprintf(&b, "\nstatic const uint16_t kNIDsInShortNameOrder[] = {\n")
for _, nid := range nids {
fmt.Fprintf(&b, "%d /* %s */,\n", nid, objs.byNID[nid].shortName)
// Including NID_undef in the table does not do anything. Whether OBJ_sn2nid
// finds the object or not, it will return NID_undef.
if nid != 0 {
fmt.Fprintf(&b, "%d /* %s */,\n", nid, objs.byNID[nid].shortName)
}
}
fmt.Fprintf(&b, "};\n")
@@ -656,7 +666,11 @@ func writeData(path string, objs *objects) error {
fmt.Fprintf(&b, "\nstatic const uint16_t kNIDsInLongNameOrder[] = {\n")
for _, nid := range nids {
fmt.Fprintf(&b, "%d /* %s */,\n", nid, objs.byNID[nid].longName)
// Including NID_undef in the table does not do anything. Whether OBJ_ln2nid
// finds the object or not, it will return NID_undef.
if nid != 0 {
fmt.Fprintf(&b, "%d /* %s */,\n", nid, objs.byNID[nid].longName)
}
}
fmt.Fprintf(&b, "};\n")
src/crypto/x509/x509_test.cc
+1 -1
View File
@@ -6456,7 +6456,7 @@ TEST(X509Test, AddUnserializableExtension) {
MakeTestCert("Issuer", "Subject", key.get(), /*is_ca=*/true);
ASSERT_TRUE(x509);
bssl::UniquePtr<X509_EXTENSION> ext(X509_EXTENSION_new());
ASSERT_TRUE(X509_EXTENSION_set_object(ext.get(), OBJ_nid2obj(NID_undef)));
ASSERT_TRUE(X509_EXTENSION_set_object(ext.get(), OBJ_get_undef()));
EXPECT_FALSE(X509_add_ext(x509.get(), ext.get(), /*loc=*/-1));
}
src/crypto/x509/x_name.c
-1
View File
@@ -122,7 +122,6 @@ ASN1_ITEM_TEMPLATE_END(X509_NAME_INTERNAL)
static const ASN1_EXTERN_FUNCS x509_name_ff = {
x509_name_ex_new,
x509_name_ex_free,
0, // Default clear behaviour is OK
x509_name_ex_d2i,
x509_name_ex_i2d,
};
src/crypto/x509/x_x509.c
-1
View File
@@ -342,7 +342,6 @@ static int x509_i2d_cb(ASN1_VALUE **pval, unsigned char **out,
static const ASN1_EXTERN_FUNCS x509_extern_funcs = {
x509_new_cb,
x509_free_cb,
/*asn1_ex_clear=*/NULL,
x509_d2i_cb,
x509_i2d_cb,
};
src/include/openssl/obj.h
+4
View File
@@ -148,6 +148,10 @@ OPENSSL_EXPORT int OBJ_txt2nid(const char *s);
// a non-const pointer and manage ownership.
OPENSSL_EXPORT ASN1_OBJECT *OBJ_nid2obj(int nid);
// OBJ_get_undef returns the object for |NID_undef|. Prefer this function over
// |OBJ_nid2obj| to avoid pulling in the full OID table.
OPENSSL_EXPORT const ASN1_OBJECT *OBJ_get_undef(void);
// OBJ_nid2sn returns the short name for |nid|, or NULL if |nid| is unknown.
OPENSSL_EXPORT const char *OBJ_nid2sn(int nid);