diff --git a/core b/core index fb383738..97f0839d 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit fb383738ea80654293d2fa1d78d1844a1ca47f0d +Subproject commit 97f0839d82430462f85e4a510db612db5f2daaf8 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..73f80091 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit db6cbc794fc941b799ce2ccdf8f969c5b3ee9403 +Subproject commit 73f80091f432201a5d6793a13098f5e8560901e9 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