Hakase/openssl-patch
1
0 Fork 0
Code Issues Pull Requests Releases Activity

Latest update (3.0.0-dev)

Browse Source
This commit is contained in:
Hakase
2020-01-27 18:28:44 +09:00
parent 2c19ec2ec7
commit 3495b70412
4 changed files with 143 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openssl-3.0.0-dev-chacha_draft.patch
+40 -40
View File
@@ -220,69 +220,69 @@ index b7340b147d..4080db7554 100644
# endif
#endif
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index a719df8e3d..fa1690cc7c 100644
index 80426896ba..c7cab61fe7 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -1087,7 +1087,7 @@ static const unsigned char so[7837] = {
0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x07, /* [ 7828] OBJ_SRVName */
@@ -1088,7 +1088,7 @@ static const unsigned char so[7845] = {
0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x08, /* [ 7836] OBJ_NAIRealm */
};
-#define NUM_NID 1211
+#define NUM_NID 1212
-#define NUM_NID 1212
+#define NUM_NID 1213
static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"UNDEF", "undefined", NID_undef},
{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
@@ -2300,9 +2300,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"id-on-SmtpUTF8Mailbox", "Smtp UTF8 Mailbox", NID_id_on_SmtpUTF8Mailbox, 8, &so[7812]},
@@ -2302,9 +2302,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
{"id-on-xmppAddr", "XmppAddr", NID_XmppAddr, 8, &so[7820]},
{"id-on-dnsSRV", "SRVName", NID_SRVName, 8, &so[7828]},
{"id-on-NAIRealm", "NAIRealm", NID_NAIRealm, 8, &so[7836]},
+ {"ChaCha20-Poly1305-D", "chacha20-poly1305-draft", NID_chacha20_poly1305_draft},
};
-#define NUM_SN 1202
+#define NUM_SN 1203
-#define NUM_SN 1203
+#define NUM_SN 1204
static const unsigned int sn_objs[NUM_SN] = {
364, /* "AD_DVCS" */
419, /* "AES-128-CBC" */
@@ -2425,6 +2426,7 @@ static const unsigned int sn_objs[NUM_SN] = {
@@ -2427,6 +2428,7 @@ static const unsigned int sn_objs[NUM_SN] = {
417, /* "CSPName" */
1019, /* "ChaCha20" */
1018, /* "ChaCha20-Poly1305" */
+ 1211, /* "ChaCha20-Poly1305-D" */
+ 1212, /* "ChaCha20-Poly1305-D" */
367, /* "CrlID" */
391, /* "DC" */
31, /* "DES-CBC" */
@@ -3508,7 +3510,7 @@ static const unsigned int sn_objs[NUM_SN] = {
@@ -3511,7 +3513,7 @@ static const unsigned int sn_objs[NUM_SN] = {
1093, /* "x509ExtAdmission" */
};
-#define NUM_LN 1202
+#define NUM_LN 1203
-#define NUM_LN 1203
+#define NUM_LN 1204
static const unsigned int ln_objs[NUM_LN] = {
363, /* "AD Time Stamping" */
405, /* "ANSI X9.62" */
@@ -3896,6 +3898,7 @@ static const unsigned int ln_objs[NUM_LN] = {
@@ -3900,6 +3902,7 @@ static const unsigned int ln_objs[NUM_LN] = {
883, /* "certificateRevocationList" */
1019, /* "chacha20" */
1018, /* "chacha20-poly1305" */
+ 1211, /* "chacha20-poly1305-draft" */
+ 1212, /* "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 3ab2524244..4e801247be 100644
index 541bb4eb3f..86e1fe2eae 100644
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1208,3 +1208,4 @@ x942kdf 1207
id_on_SmtpUTF8Mailbox 1208
@@ -1209,3 +1209,4 @@ id_on_SmtpUTF8Mailbox 1208
XmppAddr 1209
SRVName 1210
+chacha20_poly1305_draft 1211
NAIRealm 1211
+chacha20_poly1305_draft 1212
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 8833acd500..340c0e67be 100644
index 693852aa3c..99b3b39640 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1548,6 +1548,7 @@ sm-scheme 104 7 : SM4-CTR : sm4-ctr
@@ -1549,6 +1549,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,10 +291,10 @@ index 8833acd500..340c0e67be 100644
ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 99eef2461d..fb3fd5dca2 100644
index 181c588f0f..a271b27af8 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -976,6 +976,7 @@ const EVP_CIPHER *EVP_camellia_256_ctr(void);
@@ -985,6 +985,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,22 +303,22 @@ index 99eef2461d..fb3fd5dca2 100644
# endif
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index 4fb8601bf1..ff6c268ebc 100644
index 5d7611bc25..11a3b6a818 100644
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -4852,6 +4852,10 @@
@@ -4857,6 +4857,10 @@
#define LN_chacha20_poly1305 "chacha20-poly1305"
#define NID_chacha20_poly1305 1018
+#define SN_chacha20_poly1305_draft "ChaCha20-Poly1305-D"
+#define LN_chacha20_poly1305_draft "chacha20-poly1305-draft"
+#define NID_chacha20_poly1305_draft 1211
+#define NID_chacha20_poly1305_draft 1212
+
#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 35477d9cb7..e94eaafb9a 100644
index 3b52f86412..e37959c22b 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -131,6 +131,7 @@ extern "C" {
@@ -330,7 +330,7 @@ index 35477d9cb7..e94eaafb9a 100644
# define SSL_TXT_ARIA "ARIA"
# define SSL_TXT_ARIA_GCM "ARIAGCM"
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 62a1763623..8e5c35daeb 100644
index 9a1683e0fd..552eec1f25 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -573,7 +573,12 @@ __owur int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain)
@@ -372,7 +372,7 @@ index 62a1763623..8e5c35daeb 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 a329915ac9..6c68e257e1 100644
index 745bccc836..9c95f968b3 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 a329915ac9..6c68e257e1 100644
1,
TLS1_TXT_PSK_WITH_CHACHA20_POLY1305,
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index d047b8ff5d..1f8e19b7a2 100644
index f9fbc5954f..4852097796 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -44,7 +44,8 @@
@@ -460,7 +460,7 @@ index d047b8ff5d..1f8e19b7a2 100644
{0, SSL_TXT_ARIA, NULL, 0, 0, 0, SSL_ARIA},
{0, SSL_TXT_ARIA_GCM, NULL, 0, 0, 0, SSL_ARIA128GCM | SSL_ARIA256GCM},
@@ -1799,6 +1802,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
@@ -1797,6 +1800,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_CHACHA20POLY1305:
enc = "CHACHA20/POLY1305(256)";
break;
@@ -470,7 +470,7 @@ index d047b8ff5d..1f8e19b7a2 100644
default:
enc = "unknown";
break;
@@ -2123,7 +2129,7 @@ int ssl_cipher_get_overhead(const SSL_CIPHER *c, size_t *mac_overhead,
@@ -2116,7 +2122,7 @@ int ssl_cipher_get_overhead(const SSL_CIPHER *c, size_t *mac_overhead,
out = EVP_CCM_TLS_EXPLICIT_IV_LEN + 16;
} else if (c->algorithm_enc & (SSL_AES128CCM8 | SSL_AES256CCM8)) {
out = EVP_CCM_TLS_EXPLICIT_IV_LEN + 8;
@@ -480,7 +480,7 @@ index d047b8ff5d..1f8e19b7a2 100644
} else if (c->algorithm_mac & SSL_AEAD) {
/* We're supposed to have handled all the AEAD modes above */
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index c6f0af7922..b5034d5fa3 100644
index 43b0623a0b..ed6c0ef06e 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -234,12 +234,13 @@
@@ -499,11 +499,11 @@ index c6f0af7922..b5034d5fa3 100644
# define SSL_ARIA (SSL_ARIAGCM)
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 90c355bfbe..3c3134dff3 100644
index 64b2ed277c..83656b2367 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4826,3 +4826,4 @@ EVP_DigestSignInit_ex 4942 3_0_0 EXIST::FUNCTION:
EVP_DigestSignUpdate 4943 3_0_0 EXIST::FUNCTION:
EVP_DigestVerifyInit_ex 4944 3_0_0 EXIST::FUNCTION:
EVP_DigestVerifyUpdate 4945 3_0_0 EXIST::FUNCTION:
+EVP_chacha20_poly1305_draft 4946 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305
@@ -4915,3 +4915,4 @@ RAND_bytes_ex ? 3_0_0 EXIST::FUNCTION:
EVP_PKEY_get_default_digest_name ? 3_0_0 EXIST::FUNCTION:
PKCS8_pkey_add1_attr ? 3_0_0 EXIST::FUNCTION:
PKCS8_pkey_add1_attr_by_OBJ ? 3_0_0 EXIST::FUNCTION:
+EVP_chacha20_poly1305_draft ? 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305