Browse Source

Latest update

master
Hakase 1 week ago
parent
commit
2a6d9226d4
Signed by: Hakase <hakase@hakase.app> GPG Key ID: BB2821A9E0DF48C9

+ 1
- 1
README.md View File

@@ -29,7 +29,7 @@ Default support is in bold type.
29 29
 - [Google(Gmail)](https://gmail.com/) : _TLSv1.3_ **final**
30 30
 - [NSS TLS 1.3(Mozilla)](https://tls13.crypto.mozilla.org/) : _TLSv1.3_ **final**
31 31
 
32
-[Compatible OpenSSL-3.0.0-dev (OpenSSL, 23495 commits)](https://github.com/openssl/openssl/tree/ebb7823e14596ad07fdc7d2ed0a267815f545927)
32
+[Compatible OpenSSL-3.0.0-dev (OpenSSL, 23528 commits)](https://github.com/openssl/openssl/tree/62ca15650576f3953103b27e220e4ff4cc4abed5)
33 33
 
34 34
 ## Patch files
35 35
 

+ 31
- 31
openssl-3.0.0-dev-chacha_draft.patch View File

@@ -220,69 +220,69 @@ index 37902000a0..56832b63a0 100644
220 220
  # endif
221 221
  #endif
222 222
 diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
223
-index e7c59d610d..7ba1ecdacf 100644
223
+index 913e107974..339aaa703c 100644
224 224
 --- a/crypto/objects/obj_dat.h
225 225
 +++ b/crypto/objects/obj_dat.h
226
-@@ -1079,7 +1079,7 @@ static const unsigned char so[7767] = {
227
-     0x28,0xCC,0x45,0x03,0x04,                      /* [ 7761] OBJ_gmac */
226
+@@ -1080,7 +1080,7 @@ static const unsigned char so[7775] = {
227
+     0x2A,0x81,0x1C,0xCF,0x55,0x01,0x83,0x75,       /* [ 7766] OBJ_SM2_with_SM3 */
228 228
  };
229 229
  
230
--#define NUM_NID 1204
231
-+#define NUM_NID 1205
230
+-#define NUM_NID 1205
231
++#define NUM_NID 1206
232 232
  static const ASN1_OBJECT nid_objs[NUM_NID] = {
233 233
      {"UNDEF", "undefined", NID_undef},
234 234
      {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
235
-@@ -2285,9 +2285,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
236
-     {"BLAKE2BMAC", "blake2bmac", NID_blake2bmac},
235
+@@ -2287,9 +2287,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
237 236
      {"BLAKE2SMAC", "blake2smac", NID_blake2smac},
238 237
      {"SSHKDF", "sshkdf", NID_sshkdf},
238
+     {"SM2-SM3", "SM2-with-SM3", NID_SM2_with_SM3, 8, &so[7766]},
239 239
 +    {"ChaCha20-Poly1305-D", "chacha20-poly1305-draft", NID_chacha20_poly1305_draft},
240 240
  };
241 241
  
242
--#define NUM_SN 1195
243
-+#define NUM_SN 1196
242
+-#define NUM_SN 1196
243
++#define NUM_SN 1197
244 244
  static const unsigned int sn_objs[NUM_SN] = {
245 245
       364,    /* "AD_DVCS" */
246 246
       419,    /* "AES-128-CBC" */
247
-@@ -2410,6 +2411,7 @@ static const unsigned int sn_objs[NUM_SN] = {
247
+@@ -2412,6 +2413,7 @@ static const unsigned int sn_objs[NUM_SN] = {
248 248
       417,    /* "CSPName" */
249 249
      1019,    /* "ChaCha20" */
250 250
      1018,    /* "ChaCha20-Poly1305" */
251
-+    1204,    /* "ChaCha20-Poly1305-D" */
251
++    1205,    /* "ChaCha20-Poly1305-D" */
252 252
       367,    /* "CrlID" */
253 253
       391,    /* "DC" */
254 254
        31,    /* "DES-CBC" */
255
-@@ -3486,7 +3488,7 @@ static const unsigned int sn_objs[NUM_SN] = {
255
+@@ -3489,7 +3491,7 @@ static const unsigned int sn_objs[NUM_SN] = {
256 256
      1093,    /* "x509ExtAdmission" */
257 257
  };
258 258
  
259
--#define NUM_LN 1195
260
-+#define NUM_LN 1196
259
+-#define NUM_LN 1196
260
++#define NUM_LN 1197
261 261
  static const unsigned int ln_objs[NUM_LN] = {
262 262
       363,    /* "AD Time Stamping" */
263 263
       405,    /* "ANSI X9.62" */
264
-@@ -3870,6 +3872,7 @@ static const unsigned int ln_objs[NUM_LN] = {
264
+@@ -3874,6 +3876,7 @@ static const unsigned int ln_objs[NUM_LN] = {
265 265
       883,    /* "certificateRevocationList" */
266 266
      1019,    /* "chacha20" */
267 267
      1018,    /* "chacha20-poly1305" */
268
-+    1204,    /* "chacha20-poly1305-draft" */
268
++    1205,    /* "chacha20-poly1305-draft" */
269 269
        54,    /* "challengePassword" */
270 270
       407,    /* "characteristic-two-field" */
271 271
       395,    /* "clearance" */
272 272
 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
273
-index 623e7e8623..0818547548 100644
273
+index cfd06d4c29..4d3e79d4c6 100644
274 274
 --- a/crypto/objects/obj_mac.num
275 275
 +++ b/crypto/objects/obj_mac.num
276
-@@ -1201,3 +1201,4 @@ aes_256_siv		1200
277
- blake2bmac		1201
276
+@@ -1202,3 +1202,4 @@ blake2bmac		1201
278 277
  blake2smac		1202
279 278
  sshkdf		1203
280
-+chacha20_poly1305_draft		1204
279
+ SM2_with_SM3		1204
280
++chacha20_poly1305_draft		1205
281 281
 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
282
-index cb0b99c47f..d480bd3800 100644
282
+index 78ebff6ada..2f236c3037 100644
283 283
 --- a/crypto/objects/objects.txt
284 284
 +++ b/crypto/objects/objects.txt
285
-@@ -1543,6 +1543,7 @@ sm-scheme 104 7         : SM4-CTR             : sm4-ctr
285
+@@ -1545,6 +1545,7 @@ sm-scheme 104 7         : SM4-CTR             : sm4-ctr
286 286
  			: AES-192-CBC-HMAC-SHA256	: aes-192-cbc-hmac-sha256
287 287
  			: AES-256-CBC-HMAC-SHA256	: aes-256-cbc-hmac-sha256
288 288
  			: ChaCha20-Poly1305		: chacha20-poly1305
@@ -303,16 +303,16 @@ index 72060e7e96..125bc1c425 100644
303 303
  # endif
304 304
  
305 305
 diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
306
-index 80353ad4d7..e525a04b2c 100644
306
+index c8cb5ce92d..2ad7e07709 100644
307 307
 --- a/include/openssl/obj_mac.h
308 308
 +++ b/include/openssl/obj_mac.h
309
-@@ -4828,6 +4828,10 @@
309
+@@ -4833,6 +4833,10 @@
310 310
  #define LN_chacha20_poly1305            "chacha20-poly1305"
311 311
  #define NID_chacha20_poly1305           1018
312 312
  
313 313
 +#define SN_chacha20_poly1305_draft              "ChaCha20-Poly1305-D"
314 314
 +#define LN_chacha20_poly1305_draft              "chacha20-poly1305-draft"
315
-+#define NID_chacha20_poly1305_draft             1204
315
++#define NID_chacha20_poly1305_draft             1205
316 316
 +
317 317
  #define SN_chacha20             "ChaCha20"
318 318
  #define LN_chacha20             "chacha20"
@@ -489,11 +489,11 @@ index 1d3397d880..d5ff8520b6 100644
489 489
  # define SSL_ARIA                (SSL_ARIAGCM)
490 490
  
491 491
 diff --git a/util/libcrypto.num b/util/libcrypto.num
492
-index cb0cb2279b..a5829966e7 100644
492
+index 817c8bbaf4..4d946530b4 100644
493 493
 --- a/util/libcrypto.num
494 494
 +++ b/util/libcrypto.num
495
-@@ -4655,3 +4655,4 @@ OSSL_trace_set_callback                 4610	3_0_0	EXIST::FUNCTION:
496
- OSSL_trace_enabled                      4611	3_0_0	EXIST::FUNCTION:
497
- OSSL_trace_begin                        4612	3_0_0	EXIST::FUNCTION:
498
- OSSL_trace_end                          4613	3_0_0	EXIST::FUNCTION:
499
-+EVP_chacha20_poly1305_draft             4614	3_0_0	EXIST::FUNCTION:CHACHA,POLY1305
495
+@@ -4790,3 +4790,4 @@ OSSL_PARAM_get_octet_ptr                4737	3_0_0	EXIST::FUNCTION:
496
+ OSSL_PARAM_set_octet_ptr                4738	3_0_0	EXIST::FUNCTION:
497
+ X509_set_sm2_id                         4739	3_0_0	EXIST::FUNCTION:
498
+ X509_get0_sm2_id                        4740	3_0_0	EXIST::FUNCTION:
499
++EVP_chacha20_poly1305_draft             4741	3_0_0	EXIST::FUNCTION:CHACHA,POLY1305

+ 22
- 6
openssl-equal-3.0.0-dev.patch View File

@@ -1,8 +1,24 @@
1 1
 diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
2
-index aec6a8dac8..9dc9d183e7 100644
2
+index 7c915d4645..d8c8d714b9 100644
3 3
 --- a/crypto/err/openssl.txt
4 4
 +++ b/crypto/err/openssl.txt
5
-@@ -2805,6 +2805,8 @@ SSL_R_MISSING_TMP_DH_KEY:171:missing tmp dh key
5
+@@ -2128,7 +2128,6 @@ CONF_R_UNKNOWN_MODULE_NAME:113:unknown module name
6
+ CONF_R_VARIABLE_EXPANSION_TOO_LONG:116:variable expansion too long
7
+ CONF_R_VARIABLE_HAS_NO_VALUE:104:variable has no value
8
+ CRMF_R_BAD_PBM_ITERATIONCOUNT:100:bad pbm iterationcount
9
+-CRMF_R_MALFORMED_IV:101:malformed iv
10
+ CRMF_R_CRMFERROR:102:crmferror
11
+ CRMF_R_ERROR:103:error
12
+ CRMF_R_ERROR_DECODING_CERTIFICATE:104:error decoding certificate
13
+@@ -2136,6 +2135,7 @@ CRMF_R_ERROR_DECRYPTING_CERTIFICATE:105:error decrypting certificate
14
+ CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY:106:error decrypting symmetric key
15
+ CRMF_R_FAILURE_OBTAINING_RANDOM:107:failure obtaining random
16
+ CRMF_R_ITERATIONCOUNT_BELOW_100:108:iterationcount below 100
17
++CRMF_R_MALFORMED_IV:101:malformed iv
18
+ CRMF_R_NULL_ARGUMENT:109:null argument
19
+ CRMF_R_SETTING_MAC_ALGOR_FAILURE:110:setting mac algor failure
20
+ CRMF_R_SETTING_OWF_ALGOR_FAILURE:111:setting owf algor failure
21
+@@ -2865,6 +2865,8 @@ SSL_R_MISSING_TMP_DH_KEY:171:missing tmp dh key
6 22
  SSL_R_MISSING_TMP_ECDH_KEY:311:missing tmp ecdh key
7 23
  SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA:293:\
8 24
  	mixed handshake and non handshake data
@@ -11,7 +27,7 @@ index aec6a8dac8..9dc9d183e7 100644
11 27
  SSL_R_NOT_ON_RECORD_BOUNDARY:182:not on record boundary
12 28
  SSL_R_NOT_REPLACING_CERTIFICATE:289:not replacing certificate
13 29
  SSL_R_NOT_SERVER:284:not server
14
-@@ -2913,7 +2915,9 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines
30
+@@ -2973,7 +2975,9 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines
15 31
  SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES:243:unable to load ssl3 sha1 routines
16 32
  SSL_R_UNEXPECTED_CCS_MESSAGE:262:unexpected ccs message
17 33
  SSL_R_UNEXPECTED_END_OF_EARLY_DATA:178:unexpected end of early data
@@ -48,10 +64,10 @@ index e29c5d7ced..7d795c390e 100644
48 64
  
49 65
  The following lists give the SSL or TLS cipher suites names from the
50 66
 diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
51
-index 63057517dc..77910bad17 100644
67
+index 4603ef4274..fac8736d1d 100644
52 68
 --- a/include/openssl/sslerr.h
53 69
 +++ b/include/openssl/sslerr.h
54
-@@ -597,6 +597,8 @@ int ERR_load_SSL_strings(void);
70
+@@ -601,6 +601,8 @@ int ERR_load_SSL_strings(void);
55 71
  # define SSL_R_MISSING_TMP_DH_KEY                         171
56 72
  # define SSL_R_MISSING_TMP_ECDH_KEY                       311
57 73
  # define SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA     293
@@ -60,7 +76,7 @@ index 63057517dc..77910bad17 100644
60 76
  # define SSL_R_NOT_ON_RECORD_BOUNDARY                     182
61 77
  # define SSL_R_NOT_REPLACING_CERTIFICATE                  289
62 78
  # define SSL_R_NOT_SERVER                                 284
63
-@@ -729,7 +731,9 @@ int ERR_load_SSL_strings(void);
79
+@@ -733,7 +735,9 @@ int ERR_load_SSL_strings(void);
64 80
  # define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES          243
65 81
  # define SSL_R_UNEXPECTED_CCS_MESSAGE                     262
66 82
  # define SSL_R_UNEXPECTED_END_OF_EARLY_DATA               178

+ 22
- 6
openssl-equal-3.0.0-dev_ciphers.patch View File

@@ -1,8 +1,24 @@
1 1
 diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
2
-index aec6a8dac8..9dc9d183e7 100644
2
+index 7c915d4645..d8c8d714b9 100644
3 3
 --- a/crypto/err/openssl.txt
4 4
 +++ b/crypto/err/openssl.txt
5
-@@ -2805,6 +2805,8 @@ SSL_R_MISSING_TMP_DH_KEY:171:missing tmp dh key
5
+@@ -2128,7 +2128,6 @@ CONF_R_UNKNOWN_MODULE_NAME:113:unknown module name
6
+ CONF_R_VARIABLE_EXPANSION_TOO_LONG:116:variable expansion too long
7
+ CONF_R_VARIABLE_HAS_NO_VALUE:104:variable has no value
8
+ CRMF_R_BAD_PBM_ITERATIONCOUNT:100:bad pbm iterationcount
9
+-CRMF_R_MALFORMED_IV:101:malformed iv
10
+ CRMF_R_CRMFERROR:102:crmferror
11
+ CRMF_R_ERROR:103:error
12
+ CRMF_R_ERROR_DECODING_CERTIFICATE:104:error decoding certificate
13
+@@ -2136,6 +2135,7 @@ CRMF_R_ERROR_DECRYPTING_CERTIFICATE:105:error decrypting certificate
14
+ CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY:106:error decrypting symmetric key
15
+ CRMF_R_FAILURE_OBTAINING_RANDOM:107:failure obtaining random
16
+ CRMF_R_ITERATIONCOUNT_BELOW_100:108:iterationcount below 100
17
++CRMF_R_MALFORMED_IV:101:malformed iv
18
+ CRMF_R_NULL_ARGUMENT:109:null argument
19
+ CRMF_R_SETTING_MAC_ALGOR_FAILURE:110:setting mac algor failure
20
+ CRMF_R_SETTING_OWF_ALGOR_FAILURE:111:setting owf algor failure
21
+@@ -2865,6 +2865,8 @@ SSL_R_MISSING_TMP_DH_KEY:171:missing tmp dh key
6 22
  SSL_R_MISSING_TMP_ECDH_KEY:311:missing tmp ecdh key
7 23
  SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA:293:\
8 24
  	mixed handshake and non handshake data
@@ -11,7 +27,7 @@ index aec6a8dac8..9dc9d183e7 100644
11 27
  SSL_R_NOT_ON_RECORD_BOUNDARY:182:not on record boundary
12 28
  SSL_R_NOT_REPLACING_CERTIFICATE:289:not replacing certificate
13 29
  SSL_R_NOT_SERVER:284:not server
14
-@@ -2913,7 +2915,9 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines
30
+@@ -2973,7 +2975,9 @@ SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES:242:unable to load ssl3 md5 routines
15 31
  SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES:243:unable to load ssl3 sha1 routines
16 32
  SSL_R_UNEXPECTED_CCS_MESSAGE:262:unexpected ccs message
17 33
  SSL_R_UNEXPECTED_END_OF_EARLY_DATA:178:unexpected end of early data
@@ -48,10 +64,10 @@ index e29c5d7ced..7d795c390e 100644
48 64
  
49 65
  The following lists give the SSL or TLS cipher suites names from the
50 66
 diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
51
-index 63057517dc..77910bad17 100644
67
+index 4603ef4274..fac8736d1d 100644
52 68
 --- a/include/openssl/sslerr.h
53 69
 +++ b/include/openssl/sslerr.h
54
-@@ -597,6 +597,8 @@ int ERR_load_SSL_strings(void);
70
+@@ -601,6 +601,8 @@ int ERR_load_SSL_strings(void);
55 71
  # define SSL_R_MISSING_TMP_DH_KEY                         171
56 72
  # define SSL_R_MISSING_TMP_ECDH_KEY                       311
57 73
  # define SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA     293
@@ -60,7 +76,7 @@ index 63057517dc..77910bad17 100644
60 76
  # define SSL_R_NOT_ON_RECORD_BOUNDARY                     182
61 77
  # define SSL_R_NOT_REPLACING_CERTIFICATE                  289
62 78
  # define SSL_R_NOT_SERVER                                 284
63
-@@ -729,7 +731,9 @@ int ERR_load_SSL_strings(void);
79
+@@ -733,7 +735,9 @@ int ERR_load_SSL_strings(void);
64 80
  # define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES          243
65 81
  # define SSL_R_UNEXPECTED_CCS_MESSAGE                     262
66 82
  # define SSL_R_UNEXPECTED_END_OF_EARLY_DATA               178

Loading…
Cancel
Save