update main-with-bazel from master branch

This commit is contained in:
BoringSSL Robot
2023-03-01 00:14:41 +00:00
4 changed files with 9 additions and 1 deletions
+4 -1
View File
@@ -57,7 +57,7 @@
/* This file is generated by crypto/obj/objects.go. */
#define NUM_NID 966
#define NUM_NID 967
static const uint8_t kObjectData[] = {
/* NID_rsadsi */
@@ -8784,6 +8784,7 @@ static const ASN1_OBJECT kObjects[NUM_NID] = {
{"HKDF", "hkdf", NID_hkdf, 0, NULL, 0},
{"X25519Kyber768", "X25519Kyber768", NID_X25519Kyber768, 0, NULL, 0},
{"P256Kyber768", "P256Kyber768", NID_P256Kyber768, 0, NULL, 0},
{"P384Kyber768", "P384Kyber768", NID_P384Kyber768, 0, NULL, 0},
};
static const uint16_t kNIDsInShortNameOrder[] = {
@@ -8918,6 +8919,7 @@ static const uint16_t kNIDsInShortNameOrder[] = {
749 /* Oakley-EC2N-3 */,
750 /* Oakley-EC2N-4 */,
965 /* P256Kyber768 */,
966 /* P384Kyber768 */,
9 /* PBE-MD2-DES */,
168 /* PBE-MD2-RC2-64 */,
10 /* PBE-MD5-DES */,
@@ -9833,6 +9835,7 @@ static const uint16_t kNIDsInLongNameOrder[] = {
371 /* OCSP Service Locator */,
180 /* OCSP Signing */,
965 /* P256Kyber768 */,
966 /* P384Kyber768 */,
161 /* PBES2 */,
69 /* PBKDF2 */,
162 /* PBMAC1 */,
+1
View File
@@ -954,3 +954,4 @@ sha512_256 962
hkdf 963
X25519Kyber768 964
P256Kyber768 965
P384Kyber768 966
+1
View File
@@ -1336,6 +1336,7 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
: CECPQ2
: X25519Kyber768
: P256Kyber768
: P384Kyber768
# See RFC 8410.
1 3 101 110 : X25519
+3
View File
@@ -4261,6 +4261,9 @@ extern "C" {
#define SN_P256Kyber768 "P256Kyber768"
#define NID_P256Kyber768 965
#define SN_P384Kyber768 "P384Kyber768"
#define NID_P384Kyber768 966
#if defined(__cplusplus)
} /* extern C */