From e48b924f0bdf2f4cf9daa7ef408494518c37ff41 Mon Sep 17 00:00:00 2001 From: Hakase Date: Sun, 11 Nov 2018 15:40:17 +0900 Subject: [PATCH] Update latest patch (1.1.2-dev) --- openssl-1.1.2-dev-chacha_draft.patch | 10 +++++----- openssl-equal-1.1.2-dev.patch | 8 ++++---- openssl-equal-1.1.2-dev_ciphers.patch | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/openssl-1.1.2-dev-chacha_draft.patch b/openssl-1.1.2-dev-chacha_draft.patch index e8da334..223fc2b 100644 --- a/openssl-1.1.2-dev-chacha_draft.patch +++ b/openssl-1.1.2-dev-chacha_draft.patch @@ -291,7 +291,7 @@ index 1e83dffc09..d1f21424db 100644 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH diff --git a/include/openssl/evp.h b/include/openssl/evp.h -index e803fa81e7..4c2c4d94bc 100644 +index a0b7a54d3c..90b778294a 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -917,6 +917,7 @@ const EVP_CIPHER *EVP_camellia_256_ctr(void); @@ -499,11 +499,11 @@ index c22c1f9ee8..6c4595c49b 100644 # define SSL_ARIA (SSL_ARIAGCM) diff --git a/util/libcrypto.num b/util/libcrypto.num -index f159a40528..6a7361dbdf 100644 +index c6de172f8e..bce7d37c8a 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num -@@ -4597,3 +4597,4 @@ EVP_MAC_do_all 4550 1_1_2 EXIST::FUNCTION: - EVP_MAC_do_all_sorted 4551 1_1_2 EXIST::FUNCTION: +@@ -4598,3 +4598,4 @@ EVP_MAC_do_all_sorted 4551 1_1_2 EXIST::FUNCTION: EVP_str2ctrl 4552 1_1_2 EXIST::FUNCTION: EVP_hex2ctrl 4553 1_1_2 EXIST::FUNCTION: -+EVP_chacha20_poly1305_draft 4554 1_1_0 EXIST::FUNCTION:CHACHA,POLY1305_DRAFT + EVP_PKEY_supports_digest_nid 4554 1_1_2 EXIST::FUNCTION: ++EVP_chacha20_poly1305_draft 4555 1_1_0 EXIST::FUNCTION:CHACHA,POLY1305_DRAFT diff --git a/openssl-equal-1.1.2-dev.patch b/openssl-equal-1.1.2-dev.patch index f4af706..74e84f2 100644 --- a/openssl-equal-1.1.2-dev.patch +++ b/openssl-equal-1.1.2-dev.patch @@ -824,7 +824,7 @@ index 11331ce41f..cfc770b8d6 100644 {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_ALERT_TYPE), "unknown alert type"}, diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c -index 846b856af4..bcf98bdee9 100644 +index e7e8aa90f9..e2612c5bb0 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1115,6 +1115,71 @@ int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm) @@ -1073,10 +1073,10 @@ index c22c1f9ee8..cf1b0c6081 100644 __owur int ssl3_new(SSL *s); void ssl3_free(SSL *s); diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c -index 4b5e6fe2b8..99981c9e37 100644 +index ab4dbf6713..745897b638 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c -@@ -530,8 +530,25 @@ EXT_RETURN tls_construct_ctos_supported_versions(SSL *s, WPACKET *pkt, +@@ -533,8 +533,25 @@ EXT_RETURN tls_construct_ctos_supported_versions(SSL *s, WPACKET *pkt, return EXT_RETURN_FAIL; } @@ -1103,7 +1103,7 @@ index 4b5e6fe2b8..99981c9e37 100644 SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_VERSIONS, ERR_R_INTERNAL_ERROR); -@@ -1760,6 +1777,15 @@ int tls_parse_stoc_supported_versions(SSL *s, PACKET *pkt, unsigned int context, +@@ -1763,6 +1780,15 @@ int tls_parse_stoc_supported_versions(SSL *s, PACKET *pkt, unsigned int context, return 0; } diff --git a/openssl-equal-1.1.2-dev_ciphers.patch b/openssl-equal-1.1.2-dev_ciphers.patch index 6e55d3d..ba01d0e 100644 --- a/openssl-equal-1.1.2-dev_ciphers.patch +++ b/openssl-equal-1.1.2-dev_ciphers.patch @@ -859,7 +859,7 @@ index 11331ce41f..cfc770b8d6 100644 {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_ALERT_TYPE), "unknown alert type"}, diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c -index 846b856af4..bcf98bdee9 100644 +index e7e8aa90f9..e2612c5bb0 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1115,6 +1115,71 @@ int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm) @@ -1108,10 +1108,10 @@ index c22c1f9ee8..cf1b0c6081 100644 __owur int ssl3_new(SSL *s); void ssl3_free(SSL *s); diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c -index 4b5e6fe2b8..99981c9e37 100644 +index ab4dbf6713..745897b638 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c -@@ -530,8 +530,25 @@ EXT_RETURN tls_construct_ctos_supported_versions(SSL *s, WPACKET *pkt, +@@ -533,8 +533,25 @@ EXT_RETURN tls_construct_ctos_supported_versions(SSL *s, WPACKET *pkt, return EXT_RETURN_FAIL; } @@ -1138,7 +1138,7 @@ index 4b5e6fe2b8..99981c9e37 100644 SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_VERSIONS, ERR_R_INTERNAL_ERROR); -@@ -1760,6 +1777,15 @@ int tls_parse_stoc_supported_versions(SSL *s, PACKET *pkt, unsigned int context, +@@ -1763,6 +1780,15 @@ int tls_parse_stoc_supported_versions(SSL *s, PACKET *pkt, unsigned int context, return 0; }