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

Compare commits

base: Hakase/openssl-patch:777dd976b141f880adf84086b8db2edcaff48f95
Branches Tags
Hakase/openssl-patch:master
..
compare: Hakase/openssl-patch:ece2c60b3f1449387d86b9e980f665b42dcc6b79
Branches Tags
Hakase/openssl-patch:master
2 Commits
777dd976b1 .. ece2c60b3f
Author SHA1 Message Date
Hakase ece2c60b3f Update chacha20 patch 2019-06-24 15:23:46 +09:00
Hakase 0e64ff0bd8 Latest update - OpenSSL v3.0.0-dev 2019-06-24 15:21:54 +09:00
4 changed files with 10 additions and 10 deletions
Expand all files Collapse all files
README.md
+1 -1
View File
@@ -31,7 +31,7 @@ Default support is in bold type.
- [Google(Gmail)](https://gmail.com/) : _TLSv1.3_ **final** - [Google(Gmail)](https://gmail.com/) : _TLSv1.3_ **final**
- [NSS TLS 1.3(Mozilla)](https://tls13.crypto.mozilla.org/) : _TLSv1.3_ **final** - [NSS TLS 1.3(Mozilla)](https://tls13.crypto.mozilla.org/) : _TLSv1.3_ **final**
[Compatible OpenSSL-3.0.0-dev (OpenSSL, 24014 commits)](https://github.com/openssl/openssl/tree/4cdb302fef1f2160b74acbe1739f62c713fd99f5) [Compatible OpenSSL-3.0.0-dev (OpenSSL, 24031 commits)](https://github.com/openssl/openssl/tree/3bbec1afed1c65b6f7f645b27808b070e6e7a509)
## Patch files ## Patch files
openssl-3.0.0-dev-chacha_draft.patch
+5 -5
View File
@@ -291,7 +291,7 @@ index 566438948f..92f235d5d5 100644
ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH
diff --git a/include/openssl/evp.h b/include/openssl/evp.h diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 5fb04d15c3..0c35685846 100644 index 8195d11250..16dca70c30 100644
--- a/include/openssl/evp.h --- a/include/openssl/evp.h
+++ b/include/openssl/evp.h +++ b/include/openssl/evp.h
@@ -936,6 +936,7 @@ const EVP_CIPHER *EVP_camellia_256_ctr(void); @@ -936,6 +936,7 @@ const EVP_CIPHER *EVP_camellia_256_ctr(void);
@@ -499,11 +499,11 @@ index a61987f327..898932910f 100644
# define SSL_ARIA (SSL_ARIAGCM) # define SSL_ARIA (SSL_ARIAGCM)
diff --git a/util/libcrypto.num b/util/libcrypto.num diff --git a/util/libcrypto.num b/util/libcrypto.num
index 0b181070eb..c4b68ae6ca 100644 index 766c735b2f..c41dd36456 100644
--- a/util/libcrypto.num --- a/util/libcrypto.num
+++ b/util/libcrypto.num +++ b/util/libcrypto.num
@@ -4832,3 +4832,4 @@ OPENSSL_CTX_get0_private_drbg 4776 3_0_0 EXIST::FUNCTION: @@ -4833,3 +4833,4 @@ BN_CTX_new_ex 4777 3_0_0 EXIST::FUNCTION:
BN_CTX_new_ex 4777 3_0_0 EXIST::FUNCTION:
BN_CTX_secure_new_ex 4778 3_0_0 EXIST::FUNCTION: BN_CTX_secure_new_ex 4778 3_0_0 EXIST::FUNCTION:
OPENSSL_thread_stop_ex 4779 3_0_0 EXIST::FUNCTION: OPENSSL_thread_stop_ex 4779 3_0_0 EXIST::FUNCTION:
+EVP_chacha20_poly1305_draft 4780 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305 OSSL_PARAM_locate_const 4780 3_0_0 EXIST::FUNCTION:
+EVP_chacha20_poly1305_draft 4781 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305
openssl-equal-3.0.0-dev.patch
+2 -2
View File
@@ -1029,7 +1029,7 @@ index a61987f327..e03be541e1 100644
__owur int ssl3_new(SSL *s); __owur int ssl3_new(SSL *s);
void ssl3_free(SSL *s); void ssl3_free(SSL *s);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 79c2aa0ede..a39647431f 100644 index 79c2aa0ede..0be033fd90 100644
--- a/ssl/statem/statem_srvr.c --- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c
@@ -1749,7 +1749,7 @@ static int tls_early_post_process_client_hello(SSL *s) @@ -1749,7 +1749,7 @@ static int tls_early_post_process_client_hello(SSL *s)
@@ -1058,7 +1058,7 @@ index 79c2aa0ede..a39647431f 100644
- s->cipher_list = sk_SSL_CIPHER_dup(s->peer_ciphers); - s->cipher_list = sk_SSL_CIPHER_dup(s->peer_ciphers);
+ ssl_cipher_preference_list_free(s->cipher_list); + ssl_cipher_preference_list_free(s->cipher_list);
+ s->cipher_list = ssl_cipher_preference_list_from_ciphers( + s->cipher_list = ssl_cipher_preference_list_from_ciphers(
+ s->session->ciphers); + s->peer_ciphers);
sk_SSL_CIPHER_free(s->cipher_list_by_id); sk_SSL_CIPHER_free(s->cipher_list_by_id);
s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->peer_ciphers); s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->peer_ciphers);
} }
openssl-equal-3.0.0-dev_ciphers.patch
+2 -2
View File
@@ -1105,7 +1105,7 @@ index a61987f327..e03be541e1 100644
__owur int ssl3_new(SSL *s); __owur int ssl3_new(SSL *s);
void ssl3_free(SSL *s); void ssl3_free(SSL *s);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 79c2aa0ede..a39647431f 100644 index 79c2aa0ede..0be033fd90 100644
--- a/ssl/statem/statem_srvr.c --- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c
@@ -1749,7 +1749,7 @@ static int tls_early_post_process_client_hello(SSL *s) @@ -1749,7 +1749,7 @@ static int tls_early_post_process_client_hello(SSL *s)
@@ -1134,7 +1134,7 @@ index 79c2aa0ede..a39647431f 100644
- s->cipher_list = sk_SSL_CIPHER_dup(s->peer_ciphers); - s->cipher_list = sk_SSL_CIPHER_dup(s->peer_ciphers);
+ ssl_cipher_preference_list_free(s->cipher_list); + ssl_cipher_preference_list_free(s->cipher_list);
+ s->cipher_list = ssl_cipher_preference_list_from_ciphers( + s->cipher_list = ssl_cipher_preference_list_from_ciphers(
+ s->session->ciphers); + s->peer_ciphers);
sk_SSL_CIPHER_free(s->cipher_list_by_id); sk_SSL_CIPHER_free(s->cipher_list_by_id);
s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->peer_ciphers); s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->peer_ciphers);
} }