diff --git a/openssl-3.0.0-dev-chacha_draft.patch b/openssl-3.0.0-dev-chacha_draft.patch index f445915..7eb5828 100644 --- a/openssl-3.0.0-dev-chacha_draft.patch +++ b/openssl-3.0.0-dev-chacha_draft.patch @@ -220,66 +220,66 @@ index 37902000a0..56832b63a0 100644 # endif #endif diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h -index 913e107974..339aaa703c 100644 +index c778d45aa9..b761ad1e47 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 1205 -+#define NUM_NID 1206 +-#define NUM_NID 1206 ++#define NUM_NID 1207 static const ASN1_OBJECT nid_objs[NUM_NID] = { {"UNDEF", "undefined", NID_undef}, {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]}, -@@ -2287,9 +2287,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { - {"BLAKE2SMAC", "blake2smac", NID_blake2smac}, +@@ -2288,9 +2288,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { {"SSHKDF", "sshkdf", NID_sshkdf}, {"SM2-SM3", "SM2-with-SM3", NID_SM2_with_SM3, 8, &so[7766]}, + {"SSKDF", "sskdf", NID_sskdf}, + {"ChaCha20-Poly1305-D", "chacha20-poly1305-draft", NID_chacha20_poly1305_draft}, }; --#define NUM_SN 1196 -+#define NUM_SN 1197 +-#define NUM_SN 1197 ++#define NUM_SN 1198 static const unsigned int sn_objs[NUM_SN] = { 364, /* "AD_DVCS" */ 419, /* "AES-128-CBC" */ -@@ -2412,6 +2413,7 @@ static const unsigned int sn_objs[NUM_SN] = { +@@ -2413,6 +2414,7 @@ static const unsigned int sn_objs[NUM_SN] = { 417, /* "CSPName" */ 1019, /* "ChaCha20" */ 1018, /* "ChaCha20-Poly1305" */ -+ 1205, /* "ChaCha20-Poly1305-D" */ ++ 1206, /* "ChaCha20-Poly1305-D" */ 367, /* "CrlID" */ 391, /* "DC" */ 31, /* "DES-CBC" */ -@@ -3489,7 +3491,7 @@ static const unsigned int sn_objs[NUM_SN] = { +@@ -3491,7 +3493,7 @@ static const unsigned int sn_objs[NUM_SN] = { 1093, /* "x509ExtAdmission" */ }; --#define NUM_LN 1196 -+#define NUM_LN 1197 +-#define NUM_LN 1197 ++#define NUM_LN 1198 static const unsigned int ln_objs[NUM_LN] = { 363, /* "AD Time Stamping" */ 405, /* "ANSI X9.62" */ -@@ -3874,6 +3876,7 @@ static const unsigned int ln_objs[NUM_LN] = { +@@ -3876,6 +3878,7 @@ static const unsigned int ln_objs[NUM_LN] = { 883, /* "certificateRevocationList" */ 1019, /* "chacha20" */ 1018, /* "chacha20-poly1305" */ -+ 1205, /* "chacha20-poly1305-draft" */ ++ 1206, /* "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 cfd06d4c29..4d3e79d4c6 100644 +index 44820a7c8d..03c87d5b33 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num -@@ -1202,3 +1202,4 @@ blake2bmac 1201 - blake2smac 1202 +@@ -1203,3 +1203,4 @@ blake2smac 1202 sshkdf 1203 SM2_with_SM3 1204 -+chacha20_poly1305_draft 1205 + sskdf 1205 ++chacha20_poly1305_draft 1206 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt -index 78ebff6ada..2f236c3037 100644 +index 2240916ff4..2a61f1a23a 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 78ebff6ada..2f236c3037 100644 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH diff --git a/include/openssl/evp.h b/include/openssl/evp.h -index 72060e7e96..125bc1c425 100644 +index db8eec12f2..52319cc4af 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h -@@ -924,6 +924,7 @@ const EVP_CIPHER *EVP_camellia_256_ctr(void); +@@ -928,6 +928,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 72060e7e96..125bc1c425 100644 # endif diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h -index c8cb5ce92d..2ad7e07709 100644 +index a0d4eed358..6ab0a3bd3f 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -4833,6 +4833,10 @@ @@ -312,7 +312,7 @@ index c8cb5ce92d..2ad7e07709 100644 +#define SN_chacha20_poly1305_draft "ChaCha20-Poly1305-D" +#define LN_chacha20_poly1305_draft "chacha20-poly1305-draft" -+#define NID_chacha20_poly1305_draft 1205 ++#define NID_chacha20_poly1305_draft 1206 + #define SN_chacha20 "ChaCha20" #define LN_chacha20 "chacha20" @@ -489,11 +489,11 @@ index 1d3397d880..d5ff8520b6 100644 # define SSL_ARIA (SSL_ARIAGCM) diff --git a/util/libcrypto.num b/util/libcrypto.num -index 817c8bbaf4..4d946530b4 100644 +index 5b488d0e4d..8b153624c4 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num -@@ -4790,3 +4790,4 @@ OSSL_PARAM_get_octet_ptr 4737 3_0_0 EXIST::FUNCTION: - OSSL_PARAM_set_octet_ptr 4738 3_0_0 EXIST::FUNCTION: - X509_set_sm2_id 4739 3_0_0 EXIST::FUNCTION: - X509_get0_sm2_id 4740 3_0_0 EXIST::FUNCTION: -+EVP_chacha20_poly1305_draft 4741 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305 +@@ -4793,3 +4793,4 @@ X509_get0_sm2_id 4740 3_0_0 EXIST::FUNCTION:SM2 + EVP_PKEY_get0_engine 4741 3_0_0 EXIST::FUNCTION:ENGINE + EVP_MD_upref 4742 3_0_0 EXIST::FUNCTION: + EVP_MD_fetch 4743 3_0_0 EXIST::FUNCTION: ++EVP_chacha20_poly1305_draft 4744 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305 diff --git a/openssl-equal-3.0.0-dev.patch b/openssl-equal-3.0.0-dev.patch index 963bed5..4173176 100644 --- a/openssl-equal-3.0.0-dev.patch +++ b/openssl-equal-3.0.0-dev.patch @@ -1,24 +1,8 @@ diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt -index 7c915d4645..d8c8d714b9 100644 +index f52beb131e..ad1e04452b 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt -@@ -2128,7 +2128,6 @@ CONF_R_UNKNOWN_MODULE_NAME:113:unknown module name - CONF_R_VARIABLE_EXPANSION_TOO_LONG:116:variable expansion too long - CONF_R_VARIABLE_HAS_NO_VALUE:104:variable has no value - CRMF_R_BAD_PBM_ITERATIONCOUNT:100:bad pbm iterationcount --CRMF_R_MALFORMED_IV:101:malformed iv - CRMF_R_CRMFERROR:102:crmferror - CRMF_R_ERROR:103:error - CRMF_R_ERROR_DECODING_CERTIFICATE:104:error decoding certificate -@@ -2136,6 +2135,7 @@ CRMF_R_ERROR_DECRYPTING_CERTIFICATE:105:error decrypting certificate - CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY:106:error decrypting symmetric key - CRMF_R_FAILURE_OBTAINING_RANDOM:107:failure obtaining random - CRMF_R_ITERATIONCOUNT_BELOW_100:108:iterationcount below 100 -+CRMF_R_MALFORMED_IV:101:malformed iv - CRMF_R_NULL_ARGUMENT:109:null argument - CRMF_R_SETTING_MAC_ALGOR_FAILURE:110:setting mac algor failure - CRMF_R_SETTING_OWF_ALGOR_FAILURE:111:setting owf algor failure -@@ -2865,6 +2865,8 @@ SSL_R_MISSING_TMP_DH_KEY:171:missing tmp dh key +@@ -2880,6 +2880,8 @@ SSL_R_MISSING_TMP_DH_KEY:171:missing tmp dh key SSL_R_MISSING_TMP_ECDH_KEY:311:missing tmp ecdh key SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA:293:\ mixed handshake and non handshake data @@ -27,7 +11,7 @@ index 7c915d4645..d8c8d714b9 100644 SSL_R_NOT_ON_RECORD_BOUNDARY:182:not on record boundary SSL_R_NOT_REPLACING_CERTIFICATE:289:not replacing certificate SSL_R_NOT_SERVER:284:not server -@@ -2973,7 +2975,9 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines +@@ -2988,7 +2990,9 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES:243:unable to load ssl3 sha1 routines SSL_R_UNEXPECTED_CCS_MESSAGE:262:unexpected ccs message SSL_R_UNEXPECTED_END_OF_EARLY_DATA:178:unexpected end of early data diff --git a/openssl-equal-3.0.0-dev_ciphers.patch b/openssl-equal-3.0.0-dev_ciphers.patch index 938f1c4..397cb31 100644 --- a/openssl-equal-3.0.0-dev_ciphers.patch +++ b/openssl-equal-3.0.0-dev_ciphers.patch @@ -1,24 +1,8 @@ diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt -index 7c915d4645..d8c8d714b9 100644 +index f52beb131e..ad1e04452b 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt -@@ -2128,7 +2128,6 @@ CONF_R_UNKNOWN_MODULE_NAME:113:unknown module name - CONF_R_VARIABLE_EXPANSION_TOO_LONG:116:variable expansion too long - CONF_R_VARIABLE_HAS_NO_VALUE:104:variable has no value - CRMF_R_BAD_PBM_ITERATIONCOUNT:100:bad pbm iterationcount --CRMF_R_MALFORMED_IV:101:malformed iv - CRMF_R_CRMFERROR:102:crmferror - CRMF_R_ERROR:103:error - CRMF_R_ERROR_DECODING_CERTIFICATE:104:error decoding certificate -@@ -2136,6 +2135,7 @@ CRMF_R_ERROR_DECRYPTING_CERTIFICATE:105:error decrypting certificate - CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY:106:error decrypting symmetric key - CRMF_R_FAILURE_OBTAINING_RANDOM:107:failure obtaining random - CRMF_R_ITERATIONCOUNT_BELOW_100:108:iterationcount below 100 -+CRMF_R_MALFORMED_IV:101:malformed iv - CRMF_R_NULL_ARGUMENT:109:null argument - CRMF_R_SETTING_MAC_ALGOR_FAILURE:110:setting mac algor failure - CRMF_R_SETTING_OWF_ALGOR_FAILURE:111:setting owf algor failure -@@ -2865,6 +2865,8 @@ SSL_R_MISSING_TMP_DH_KEY:171:missing tmp dh key +@@ -2880,6 +2880,8 @@ SSL_R_MISSING_TMP_DH_KEY:171:missing tmp dh key SSL_R_MISSING_TMP_ECDH_KEY:311:missing tmp ecdh key SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA:293:\ mixed handshake and non handshake data @@ -27,7 +11,7 @@ index 7c915d4645..d8c8d714b9 100644 SSL_R_NOT_ON_RECORD_BOUNDARY:182:not on record boundary SSL_R_NOT_REPLACING_CERTIFICATE:289:not replacing certificate SSL_R_NOT_SERVER:284:not server -@@ -2973,7 +2975,9 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines +@@ -2988,7 +2990,9 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES:243:unable to load ssl3 sha1 routines SSL_R_UNEXPECTED_CCS_MESSAGE:262:unexpected ccs message SSL_R_UNEXPECTED_END_OF_EARLY_DATA:178:unexpected end of early data