Remove TLSv1.3 draft.

openssl-3.0.0-dev-chacha_draft.patch

@@ -220,69 +220,69 @@ index 0d4612f314..5a3516d642 100644
  # endif
  #endif
 diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
-index 859795fa50..550e794fca 100644
+index 78a9e7acaf..15c712b291 100644
 --- a/crypto/objects/obj_dat.h
 +++ b/crypto/objects/obj_dat.h
 @@ -1079,7 +1079,7 @@ static const unsigned char so[7767] = {
      0x28,0xCC,0x45,0x03,0x04,                      /* [ 7761] OBJ_gmac */
  };
  
--#define NUM_NID 1201
-+#define NUM_NID 1202
+-#define NUM_NID 1203
++#define NUM_NID 1204
  static const ASN1_OBJECT nid_objs[NUM_NID] = {
      {"UNDEF", "undefined", NID_undef},
      {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
-@@ -2282,9 +2282,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
-     {"AES-128-SIV", "aes-128-siv", NID_aes_128_siv},
-     {"AES-192-SIV", "aes-192-siv", NID_aes_192_siv},
+@@ -2284,9 +2284,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
      {"AES-256-SIV", "aes-256-siv", NID_aes_256_siv},
+     {"BLAKE2BMAC", "blake2bmac", NID_blake2bmac},
+     {"BLAKE2SMAC", "blake2smac", NID_blake2smac},
 +    {"ChaCha20-Poly1305-D", "chacha20-poly1305-draft", NID_chacha20_poly1305_draft },
  };
  
--#define NUM_SN 1192
-+#define NUM_SN 1193
+-#define NUM_SN 1194
++#define NUM_SN 1195
  static const unsigned int sn_objs[NUM_SN] = {
       364,    /* "AD_DVCS" */
       419,    /* "AES-128-CBC" */
-@@ -2405,6 +2406,7 @@ static const unsigned int sn_objs[NUM_SN] = {
+@@ -2409,6 +2410,7 @@ static const unsigned int sn_objs[NUM_SN] = {
       417,    /* "CSPName" */
      1019,    /* "ChaCha20" */
      1018,    /* "ChaCha20-Poly1305" */
-+    1201,    /* "chacha20-poly1305-draft" */
++    1203,    /* "chacha20-poly1305-draft" */
       367,    /* "CrlID" */
       391,    /* "DC" */
        31,    /* "DES-CBC" */
-@@ -3480,7 +3482,7 @@ static const unsigned int sn_objs[NUM_SN] = {
+@@ -3484,7 +3486,7 @@ static const unsigned int sn_objs[NUM_SN] = {
      1093,    /* "x509ExtAdmission" */
  };
  
--#define NUM_LN 1192
-+#define NUM_LN 1193
+-#define NUM_LN 1194
++#define NUM_LN 1195
  static const unsigned int ln_objs[NUM_LN] = {
       363,    /* "AD Time Stamping" */
       405,    /* "ANSI X9.62" */
-@@ -3862,6 +3864,7 @@ static const unsigned int ln_objs[NUM_LN] = {
+@@ -3868,6 +3870,7 @@ static const unsigned int ln_objs[NUM_LN] = {
       883,    /* "certificateRevocationList" */
      1019,    /* "chacha20" */
      1018,    /* "chacha20-poly1305" */
-+    1201,    /* "ChaCha20-Poly1305-D" */
++    1203,    /* "ChaCha20-Poly1305-D" */
        54,    /* "challengePassword" */
       407,    /* "characteristic-two-field" */
       395,    /* "clearance" */
 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
-index 021875d9e4..c13c751d74 100644
+index 87790200d4..94d033c158 100644
 --- a/crypto/objects/obj_mac.num
 +++ b/crypto/objects/obj_mac.num
-@@ -1198,3 +1198,4 @@ kmac256		1197
- aes_128_siv		1198
- aes_192_siv		1199
+@@ -1200,3 +1200,4 @@ aes_192_siv		1199
  aes_256_siv		1200
-+chacha20_poly1305_draft		1201
+ blake2bmac		1201
+ blake2smac		1202
++chacha20_poly1305_draft		1203
 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
-index 851e31e5aa..e5b288d999 100644
+index 344b67b395..21653d9b87 100644
 --- a/crypto/objects/objects.txt
 +++ b/crypto/objects/objects.txt
-@@ -1541,6 +1541,7 @@ sm-scheme 104 7         : SM4-CTR             : sm4-ctr
+@@ -1543,6 +1543,7 @@ sm-scheme 104 7         : SM4-CTR             : sm4-ctr
  			: AES-192-CBC-HMAC-SHA256	: aes-192-cbc-hmac-sha256
  			: AES-256-CBC-HMAC-SHA256	: aes-256-cbc-hmac-sha256
  			: ChaCha20-Poly1305		: chacha20-poly1305
@@ -291,7 +291,7 @@ index 851e31e5aa..e5b288d999 100644
  
  ISO-US 10046 2 1	: dhpublicnumber		: X9.42 DH
 diff --git a/include/openssl/evp.h b/include/openssl/evp.h
-index 9f1dbd4b8b..774f102e48 100644
+index 23f07eaa05..c90c6435bd 100644
 --- a/include/openssl/evp.h
 +++ b/include/openssl/evp.h
 @@ -928,6 +928,7 @@ const EVP_CIPHER *EVP_camellia_256_ctr(void);
@@ -303,22 +303,22 @@ index 9f1dbd4b8b..774f102e48 100644
  # endif
  
 diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
-index 242eaeb6ce..c8960d0e5c 100644
+index 97b2204ba6..a9b341243a 100644
 --- a/include/openssl/obj_mac.h
 +++ b/include/openssl/obj_mac.h
-@@ -4824,6 +4824,10 @@
+@@ -4832,6 +4832,10 @@
  #define LN_chacha20             "chacha20"
  #define NID_chacha20            1019
  
 +#define SN_chacha20_poly1305_draft      "ChaCha20-Poly1305-D"
 +#define LN_chacha20_poly1305_draft      "chacha20-poly1305-draft"
-+#define NID_chacha20_poly1305_draft     1201
++#define NID_chacha20_poly1305_draft     1203
 +
  #define SN_dhpublicnumber               "dhpublicnumber"
  #define LN_dhpublicnumber               "X9.42 DH"
  #define NID_dhpublicnumber              920
 diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
-index c7a830445b..8aa020669d 100644
+index 35311acaf4..c2bce6822d 100644
 --- a/include/openssl/ssl.h
 +++ b/include/openssl/ssl.h
 @@ -125,6 +125,7 @@ extern "C" {