diff --git a/openssl-1.1.1c-chacha_draft.patch b/openssl-1.1.1c-chacha_draft.patch index 0d2eab1..83e45f4 100644 --- a/openssl-1.1.1c-chacha_draft.patch +++ b/openssl-1.1.1c-chacha_draft.patch @@ -11,7 +11,7 @@ index 086b3c4d51..5699901f7d 100644 #endif } diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c -index d3e2c622a1..ef679522d1 100644 +index d3e2c622a1..e61c9e1bea 100644 --- a/crypto/evp/e_chacha20_poly1305.c +++ b/crypto/evp/e_chacha20_poly1305.c @@ -156,6 +156,7 @@ typedef struct { @@ -194,7 +194,7 @@ index d3e2c622a1..ef679522d1 100644 + NID_chacha20_poly1305_draft, + 1, /* block_size */ + CHACHA_KEY_SIZE, /* key_len */ -+ 0, /* iv_len, none */ ++ 0, /* iv_len, none */ + EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_CUSTOM_IV | + EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT | + EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_CUSTOM_CIPHER, @@ -431,7 +431,7 @@ index 99ae48199c..7e36a0d7ea 100644 1, TLS1_TXT_PSK_WITH_CHACHA20_POLY1305, diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c -index b60d67aa0d..ce750c4425 100644 +index b60d67aa0d..7dac0053a2 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -43,7 +43,8 @@ @@ -460,17 +460,7 @@ index b60d67aa0d..ce750c4425 100644 {0, SSL_TXT_ARIA, NULL, 0, 0, 0, SSL_ARIA}, {0, SSL_TXT_ARIA_GCM, NULL, 0, 0, 0, SSL_ARIA128GCM | SSL_ARIA256GCM}, -@@ -1791,6 +1794,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) - case SSL_CHACHA20POLY1305: - enc = "CHACHA20/POLY1305(256)"; - break; -+ case SSL_CHACHA20POLY1305_D: -+ enc = "CHACHA20/POLY1305-Draft(256)"; -+ break; - default: - enc = "unknown"; - break; -@@ -2115,7 +2121,7 @@ int ssl_cipher_get_overhead(const SSL_CIPHER *c, size_t *mac_overhead, +@@ -2115,7 +2118,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; @@ -499,11 +489,11 @@ index 33db1460ab..00c5ee4cff 100644 # define SSL_ARIA (SSL_ARIAGCM) diff --git a/util/libcrypto.num b/util/libcrypto.num -index 32c64cb2c7..86cb7a994b 100644 +index 32c64cb2c7..9574117daa 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4579,3 +4579,4 @@ EVP_PKEY_meth_set_digest_custom 4532 1_1_1 EXIST::FUNCTION: EVP_PKEY_meth_get_digest_custom 4533 1_1_1 EXIST::FUNCTION: OPENSSL_INIT_set_config_filename 4534 1_1_1b EXIST::FUNCTION:STDIO OPENSSL_INIT_set_config_file_flags 4535 1_1_1b EXIST::FUNCTION:STDIO -+EVP_chacha20_poly1305_draft 4536 1_1_0 EXIST::FUNCTION:CHACHA,POLY1305 ++EVP_chacha20_poly1305_draft 4536 1_1_1c EXIST::FUNCTION:CHACHA,POLY1305