Latest update - OpenSSL v3.0.0-dev

openssl-3.0.0-dev-chacha_draft.patch

@@ -220,66 +220,66 @@ index ccef031b89..083179398c 100644
  # endif
  #endif
 diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
-index c778d45aa9..b761ad1e47 100644
+index 876bab2a7f..0e825e5b8b 100644
 --- a/crypto/objects/obj_dat.h
 +++ b/crypto/objects/obj_dat.h
 @@ -1080,7 +1080,7 @@ static const unsigned char so[7775] = {
      0x2A,0x81,0x1C,0xCF,0x55,0x01,0x83,0x75,       /* [ 7766] OBJ_SM2_with_SM3 */
  };
  
--#define NUM_NID 1206
-+#define NUM_NID 1207
+-#define NUM_NID 1207
++#define NUM_NID 1208
  static const ASN1_OBJECT nid_objs[NUM_NID] = {
      {"UNDEF", "undefined", NID_undef},
      {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
-@@ -2288,9 +2288,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
-     {"SSHKDF", "sshkdf", NID_sshkdf},
+@@ -2289,9 +2289,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
      {"SM2-SM3", "SM2-with-SM3", NID_SM2_with_SM3, 8, &so[7766]},
      {"SSKDF", "sskdf", NID_sskdf},
+     {"X963KDF", "x963kdf", NID_x963kdf},
 +    {"ChaCha20-Poly1305-D", "chacha20-poly1305-draft", NID_chacha20_poly1305_draft},
  };
  
--#define NUM_SN 1197
-+#define NUM_SN 1198
+-#define NUM_SN 1198
++#define NUM_SN 1199
  static const unsigned int sn_objs[NUM_SN] = {
       364,    /* "AD_DVCS" */
       419,    /* "AES-128-CBC" */
-@@ -2413,6 +2414,7 @@ static const unsigned int sn_objs[NUM_SN] = {
+@@ -2414,6 +2415,7 @@ static const unsigned int sn_objs[NUM_SN] = {
       417,    /* "CSPName" */
      1019,    /* "ChaCha20" */
      1018,    /* "ChaCha20-Poly1305" */
-+    1206,    /* "ChaCha20-Poly1305-D" */
++    1207,    /* "ChaCha20-Poly1305-D" */
       367,    /* "CrlID" */
       391,    /* "DC" */
        31,    /* "DES-CBC" */
-@@ -3491,7 +3493,7 @@ static const unsigned int sn_objs[NUM_SN] = {
+@@ -3493,7 +3495,7 @@ static const unsigned int sn_objs[NUM_SN] = {
      1093,    /* "x509ExtAdmission" */
  };
  
--#define NUM_LN 1197
-+#define NUM_LN 1198
+-#define NUM_LN 1198
++#define NUM_LN 1199
  static const unsigned int ln_objs[NUM_LN] = {
       363,    /* "AD Time Stamping" */
       405,    /* "ANSI X9.62" */
-@@ -3876,6 +3878,7 @@ static const unsigned int ln_objs[NUM_LN] = {
+@@ -3878,6 +3880,7 @@ static const unsigned int ln_objs[NUM_LN] = {
       883,    /* "certificateRevocationList" */
      1019,    /* "chacha20" */
      1018,    /* "chacha20-poly1305" */
-+    1206,    /* "chacha20-poly1305-draft" */
++    1207,    /* "chacha20-poly1305-draft" */
        54,    /* "challengePassword" */
       407,    /* "characteristic-two-field" */
       395,    /* "clearance" */
 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
-index 44820a7c8d..03c87d5b33 100644
+index e0969fe1fd..957a28d47a 100644
 --- a/crypto/objects/obj_mac.num
 +++ b/crypto/objects/obj_mac.num
-@@ -1203,3 +1203,4 @@ blake2smac		1202
- sshkdf		1203
+@@ -1204,3 +1204,4 @@ sshkdf		1203
  SM2_with_SM3		1204
  sskdf		1205
-+chacha20_poly1305_draft		1206
+ x963kdf		1206
++chacha20_poly1305_draft		1207
 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
-index 2240916ff4..2a61f1a23a 100644
+index 566438948f..92f235d5d5 100644
 --- a/crypto/objects/objects.txt
 +++ b/crypto/objects/objects.txt
 @@ -1545,6 +1545,7 @@ sm-scheme 104 7         : SM4-CTR             : sm4-ctr
@@ -291,10 +291,10 @@ index 2240916ff4..2a61f1a23a 100644
  
  ISO-US 10046 2 1	: dhpublicnumber		: X9.42 DH
 diff --git a/include/openssl/evp.h b/include/openssl/evp.h
-index 6fc0f35114..c26c6d0182 100644
+index 5fb04d15c3..0c35685846 100644
 --- a/include/openssl/evp.h
 +++ b/include/openssl/evp.h
-@@ -933,6 +933,7 @@ const EVP_CIPHER *EVP_camellia_256_ctr(void);
+@@ -936,6 +936,7 @@ const EVP_CIPHER *EVP_camellia_256_ctr(void);
  const EVP_CIPHER *EVP_chacha20(void);
  #  ifndef OPENSSL_NO_POLY1305
  const EVP_CIPHER *EVP_chacha20_poly1305(void);
@@ -303,7 +303,7 @@ index 6fc0f35114..c26c6d0182 100644
  # endif
  
 diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
-index a0d4eed358..6ab0a3bd3f 100644
+index 147bad12db..6e9f141ba5 100644
 --- a/include/openssl/obj_mac.h
 +++ b/include/openssl/obj_mac.h
 @@ -4833,6 +4833,10 @@
@@ -312,13 +312,13 @@ index a0d4eed358..6ab0a3bd3f 100644
  
 +#define SN_chacha20_poly1305_draft              "ChaCha20-Poly1305-D"
 +#define LN_chacha20_poly1305_draft              "chacha20-poly1305-draft"
-+#define NID_chacha20_poly1305_draft             1206
++#define NID_chacha20_poly1305_draft             1207
 +
  #define SN_chacha20             "ChaCha20"
  #define LN_chacha20             "chacha20"
  #define NID_chacha20            1019
 diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
-index f4b17f1beb..bb3fe66300 100644
+index 7219d83420..b569270f84 100644
 --- a/include/openssl/ssl.h
 +++ b/include/openssl/ssl.h
 @@ -125,6 +125,7 @@ extern "C" {
@@ -372,7 +372,7 @@ index 4db2b6a0db..5b07fb3cba 100644
  # define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305       "ECDHE-ECDSA-CHACHA20-POLY1305"
  # define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305           "DHE-RSA-CHACHA20-POLY1305"
 diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
-index 5ea2c2d029..5877f6876c 100644
+index 3238fd9b7e..c281fed428 100644
 --- a/ssl/s3_lib.c
 +++ b/ssl/s3_lib.c
 @@ -2083,6 +2083,54 @@ static SSL_CIPHER ssl3_ciphers[] = {
@@ -431,7 +431,7 @@ index 5ea2c2d029..5877f6876c 100644
       1,
       TLS1_TXT_PSK_WITH_CHACHA20_POLY1305,
 diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
-index 5aa04dbd53..8b2b7e7b36 100644
+index 6cb8b33b5b..d94adfc6a2 100644
 --- a/ssl/ssl_ciph.c
 +++ b/ssl/ssl_ciph.c
 @@ -44,7 +44,8 @@
@@ -480,7 +480,7 @@ index 5aa04dbd53..8b2b7e7b36 100644
      } else if (c->algorithm_mac & SSL_AEAD) {
          /* We're supposed to have handled all the AEAD modes above */
 diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
-index 4a72864980..5da1a0f0c0 100644
+index a61987f327..898932910f 100644
 --- a/ssl/ssl_locl.h
 +++ b/ssl/ssl_locl.h
 @@ -234,12 +234,13 @@
@@ -499,11 +499,11 @@ index 4a72864980..5da1a0f0c0 100644
  # define SSL_ARIA                (SSL_ARIAGCM)
  
 diff --git a/util/libcrypto.num b/util/libcrypto.num
-index 010f8686d5..e6ae934b4d 100644
+index 0b181070eb..c4b68ae6ca 100644
 --- a/util/libcrypto.num
 +++ b/util/libcrypto.num
-@@ -4804,3 +4804,4 @@ EVP_KDF_CTX_new                         4751	3_0_0	EXIST::FUNCTION:
- EVP_KDF_CTX_kdf                         4752	3_0_0	EXIST::FUNCTION:
- EVP_KDF_nid                             4753	3_0_0	EXIST::FUNCTION:
- EVP_get_kdfbyname                       4754	3_0_0	EXIST::FUNCTION:
-+EVP_chacha20_poly1305_draft             4755	3_0_0	EXIST::FUNCTION:CHACHA,POLY1305
+@@ -4832,3 +4832,4 @@ OPENSSL_CTX_get0_private_drbg           4776	3_0_0	EXIST::FUNCTION:
+ BN_CTX_new_ex                           4777	3_0_0	EXIST::FUNCTION:
+ BN_CTX_secure_new_ex                    4778	3_0_0	EXIST::FUNCTION:
+ OPENSSL_thread_stop_ex                  4779	3_0_0	EXIST::FUNCTION:
++EVP_chacha20_poly1305_draft             4780	3_0_0	EXIST::FUNCTION:CHACHA,POLY1305