From 9767ac46ea71f229d675659ceea1b316e3a1ad1d Mon Sep 17 00:00:00 2001
From: liuyuanmu <liuyuanmu@jd.com>
Date: Tue, 21 Dec 2021 10:36:28 +0800
Subject: [PATCH] add protocol,enabled-protocols,ciphers settings

---
 core                                                         | 2 +-
 .../src/main/resources/config/application-gw.properties      | 5 ++++-
 .../src/main/resources/config/application-peer.properties    | 3 +++
 deploy/deploy-peer/src/main/resources/config/init/local.conf | 3 +++
 libs/bft-smart                                               | 2 +-
 libs/httpservice                                             | 2 +-
 libs/utils                                                   | 2 +-
 7 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/core b/core
index 3b2fccd3..8c58f3ad 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 3b2fccd37dc18be40322b25acd1e0aeb1a4b126c
+Subproject commit 8c58f3ad78ada5a40c8c6c0d83ceea9cf04ad94c
diff --git a/deploy/deploy-gateway/src/main/resources/config/application-gw.properties b/deploy/deploy-gateway/src/main/resources/config/application-gw.properties
index 89ab714b..bcf7d476 100644
--- a/deploy/deploy-gateway/src/main/resources/config/application-gw.properties
+++ b/deploy/deploy-gateway/src/main/resources/config/application-gw.properties
@@ -2,7 +2,10 @@
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain
 
-# TLS
+# SSL
+server.ssl.protocol=
+server.ssl.enabled-protocols=
+server.ssl.ciphers=
 server.ssl.key-store=
 server.ssl.key-store-type=PKCS12
 server.ssl.key-alias=
diff --git a/deploy/deploy-peer/src/main/resources/config/application-peer.properties b/deploy/deploy-peer/src/main/resources/config/application-peer.properties
index 1b00fc08..728ed961 100644
--- a/deploy/deploy-peer/src/main/resources/config/application-peer.properties
+++ b/deploy/deploy-peer/src/main/resources/config/application-peer.properties
@@ -5,6 +5,9 @@ server.compression.mime-types=application/json,application/xml,text/html,text/xm
 # 管理服务TLS配置
 server.ssl.enabled=false
 server.ssl.client-auth=none
+server.ssl.protocol=
+server.ssl.enabled-protocols=
+server.ssl.ciphers=
 server.ssl.key-store=
 server.ssl.key-store-type=PKCS12
 server.ssl.key-alias=
diff --git a/deploy/deploy-peer/src/main/resources/config/init/local.conf b/deploy/deploy-peer/src/main/resources/config/init/local.conf
index 56ef3328..dabd8753 100644
--- a/deploy/deploy-peer/src/main/resources/config/init/local.conf
+++ b/deploy/deploy-peer/src/main/resources/config/init/local.conf
@@ -15,6 +15,9 @@ local.parti.privkey-path=
 local.parti.pwd=
 
 #当前参与方的共识服务TLS配置
+local.parti.ssl.protocol=
+local.parti.ssl.enabled-protocols=
+local.parti.ssl.ciphers=
 local.parti.ssl.key-store=
 local.parti.ssl.key-store-type=
 local.parti.ssl.key-alias=
diff --git a/libs/bft-smart b/libs/bft-smart
index db6cbc79..9a6a4978 160000
--- a/libs/bft-smart
+++ b/libs/bft-smart
@@ -1 +1 @@
-Subproject commit db6cbc794fc941b799ce2ccdf8f969c5b3ee9403
+Subproject commit 9a6a497815984ceccc480beca6d429d5b203125f
diff --git a/libs/httpservice b/libs/httpservice
index 55190ca8..5257ed25 160000
--- a/libs/httpservice
+++ b/libs/httpservice
@@ -1 +1 @@
-Subproject commit 55190ca843098d30740e61aa1911239983fdd032
+Subproject commit 5257ed25bc6b89af413842739d06f8923e40ab14
diff --git a/libs/utils b/libs/utils
index 7f0b301a..df08741c 160000
--- a/libs/utils
+++ b/libs/utils
@@ -1 +1 @@
-Subproject commit 7f0b301addd9ec6237c2c947cdb629b12831fd43
+Subproject commit df08741c65808d5f36ca032152b0bcc341a5a409