General: • New version 1.39.0 • Rebase patches as needed C (core) and C++ (cpp): • New C soversion 18 • New C++ soversion 1.39 Python: • New subpackages python3-grpcio-admin and python3-grpcio-csds
41 lines
2.1 KiB
Diff
41 lines
2.1 KiB
Diff
diff -Naur grpc-1.39.0-original/src/objective-c/tests/CronetTests/CronetUnitTests.mm grpc-1.39.0/src/objective-c/tests/CronetTests/CronetUnitTests.mm
|
|
--- grpc-1.39.0-original/src/objective-c/tests/CronetTests/CronetUnitTests.mm 2021-07-20 18:39:39.000000000 -0400
|
|
+++ grpc-1.39.0/src/objective-c/tests/CronetTests/CronetUnitTests.mm 2021-07-23 14:42:11.649278304 -0400
|
|
@@ -103,7 +103,7 @@
|
|
BIO_free(pem);
|
|
|
|
// Select cipher suite
|
|
- SSL_CTX_set_cipher_list(ctx, "ECDHE-RSA-AES128-GCM-SHA256");
|
|
+ SSL_CTX_set_cipher_list(ctx, "PROFILE=SYSTEM");
|
|
|
|
// Select ALPN protocol
|
|
SSL_CTX_set_alpn_select_cb(ctx, alpn_cb, NULL);
|
|
diff -Naur grpc-1.39.0-original/test/core/handshake/client_ssl.cc grpc-1.39.0/test/core/handshake/client_ssl.cc
|
|
--- grpc-1.39.0-original/test/core/handshake/client_ssl.cc 2021-07-20 18:39:39.000000000 -0400
|
|
+++ grpc-1.39.0/test/core/handshake/client_ssl.cc 2021-07-23 14:41:27.549570232 -0400
|
|
@@ -220,9 +220,7 @@
|
|
|
|
// Set the cipher list to match the one expressed in
|
|
// src/core/tsi/ssl_transport_security.cc.
|
|
- const char* cipher_list =
|
|
- "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-"
|
|
- "SHA384:ECDHE-RSA-AES256-GCM-SHA384";
|
|
+ const char* cipher_list = "PROFILE=SYSTEM";
|
|
if (!SSL_CTX_set_cipher_list(ctx, cipher_list)) {
|
|
ERR_print_errors_fp(stderr);
|
|
gpr_log(GPR_ERROR, "Couldn't set server cipher list.");
|
|
diff -Naur grpc-1.39.0-original/test/core/handshake/server_ssl_common.cc grpc-1.39.0/test/core/handshake/server_ssl_common.cc
|
|
--- grpc-1.39.0-original/test/core/handshake/server_ssl_common.cc 2021-07-20 18:39:39.000000000 -0400
|
|
+++ grpc-1.39.0/test/core/handshake/server_ssl_common.cc 2021-07-23 14:41:14.369657480 -0400
|
|
@@ -204,9 +204,7 @@
|
|
|
|
// Set the cipher list to match the one expressed in
|
|
// src/core/tsi/ssl_transport_security.c.
|
|
- const char* cipher_list =
|
|
- "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-"
|
|
- "SHA384:ECDHE-RSA-AES256-GCM-SHA384";
|
|
+ const char* cipher_list = "PROFILE=SYSTEM";
|
|
if (!SSL_CTX_set_cipher_list(ctx, cipher_list)) {
|
|
ERR_print_errors_fp(stderr);
|
|
gpr_log(GPR_ERROR, "Couldn't set server cipher list.");
|