commit
0a8f1d7380
@ -1,41 +0,0 @@
|
|||||||
From 7bf606ebe95c0eb0d9d7d55614b22ea6288d0598 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sergey Avseyev <sergey.avseyev@gmail.com>
|
|
||||||
Date: Sat, 21 Dec 2019 18:52:54 +0800
|
|
||||||
Subject: [PATCH] enforce system crypto policies
|
|
||||||
|
|
||||||
---
|
|
||||||
test/core/handshake/client_ssl.cc | 3 +--
|
|
||||||
test/core/handshake/server_ssl_common.cc | 3 +--
|
|
||||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc
|
|
||||||
index 467df6e..b31934e 100644
|
|
||||||
--- a/test/core/handshake/client_ssl.cc
|
|
||||||
+++ b/test/core/handshake/client_ssl.cc
|
|
||||||
@@ -161,8 +161,7 @@ static void server_thread(void* arg) {
|
|
||||||
// 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";
|
|
||||||
+ "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 --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc
|
|
||||||
index 41b2829..8b21ea7 100644
|
|
||||||
--- a/test/core/handshake/server_ssl_common.cc
|
|
||||||
+++ b/test/core/handshake/server_ssl_common.cc
|
|
||||||
@@ -167,8 +167,7 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len,
|
|
||||||
// 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";
|
|
||||||
+ "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.");
|
|
||||||
--
|
|
||||||
2.19.1
|
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: grpc
|
Name: grpc
|
||||||
Version: 1.22.0
|
Version: 1.22.0
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: A modern, open source high performance RPC framework that can run in any environment
|
Summary: A modern, open source high performance RPC framework that can run in any environment
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://www.grpc.io
|
URL: https://www.grpc.io
|
||||||
@ -9,7 +9,6 @@ Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{versio
|
|||||||
Patch9000: 0001-cxx-Arg-List-Too-Long.patch
|
Patch9000: 0001-cxx-Arg-List-Too-Long.patch
|
||||||
Patch9001: 0002-add-secure-compile-option-in-Makefile.patch
|
Patch9001: 0002-add-secure-compile-option-in-Makefile.patch
|
||||||
|
|
||||||
Patch0001: 0001-enforce-system-crypto-policies.patch
|
|
||||||
Patch0002: 0002-patch-from-15532.patch
|
Patch0002: 0002-patch-from-15532.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++ pkgconfig protobuf-devel protobuf-compiler
|
BuildRequires: gcc-c++ pkgconfig protobuf-devel protobuf-compiler
|
||||||
@ -94,5 +93,8 @@ make install-grpc-cli prefix="%{buildroot}%{_prefix}"
|
|||||||
%{python3_sitearch}/grpcio-%{version}-py?.?.egg-info
|
%{python3_sitearch}/grpcio-%{version}-py?.?.egg-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.22.0-2
|
||||||
|
- Delete unused patch
|
||||||
|
|
||||||
* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.22.0-1
|
* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.22.0-1
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user