Merge pull request #322 from FISCO-BCOS/release-2.8.0

Release 2.8.0
FISCO-BCOS · Aug 24, 2021 · 93f347d · 93f347d
2 parents 842efae + d1f2e65
commit 93f347d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 371 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,9 +1,8 @@
 ## v2.8.0
 (2021-07-27)
 Added:
-* Add Hardware Secure Module(HSM), use hardware protect your private key, speed up crypto procedure.
+* Using Hardware Secure Module(HSM) to make cryptography operations.
 * Support use PCI crypto card or crypto machine to make SM2 SM3 calculation.
-* Support use HSM internal key to make TLS connection with FISCO BCOS nodes.
 * Support use HSM internal key to sign transaction.
 
 Update:
@@ -14,9 +13,8 @@ Update:
 
 ----
 添加:
-* 新增硬件加密模块，使用硬件保护您的私钥，提升密码运算速度。
-* 支持使用PCI加密卡/加密机进行SM2，SM3运算。
-* 支持使用密码卡/密码机内部密钥与FISCO BCOS节点建立连接。
+* 新增支持使用硬件加密模块进行密码计算。
+* 支持使用符合国密《GMT0018-2012密码设备应用接口规范》标准的PCI加密卡/加密机进行SM2，SM3运算。
 * 支持使用密码卡/密码机内部密钥进行交易签名。
 
 更新：

diff --git a/build-hsm.gradle b/build-hsm.gradle
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,7 @@ ext {
 // integrationTest.mustRunAfter test
 allprojects {
     group = 'org.fisco-bcos.java-sdk'
-    version = '2.8.0-SNAPSHOT'
+    version = '2.8.0-GMT0018-SNAPSHOT'
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
     apply plugin: 'idea'

diff --git a/sdk-core/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java b/sdk-core/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java
@@ -266,27 +266,12 @@ private SslContext initSMSslContext(ConfigOption configOption) throws NetworkExc
         try {
             // Get file, file existence is already checked when check config file.
             // Init SslContext
-            logger.info(" build SM ssl context with configured certificates ");
-            if (configOption.getCryptoMaterialConfig().getCryptoProvider() != null
-                    && configOption
-                            .getCryptoMaterialConfig()
-                            .getCryptoProvider()
-                            .equalsIgnoreCase(HSM)) {
-                return SMSslClientContextFactory.build(
-                        configOption.getCryptoMaterialConfig().getCaInputStream(),
-                        configOption.getCryptoMaterialConfig().getEnSSLCertInputStream(),
-                        "sm2_" + configOption.getCryptoMaterialConfig().getEnSslKeyIndex(),
-                        configOption.getCryptoMaterialConfig().getSdkCertInputStream(),
-                        "sm2_" + configOption.getCryptoMaterialConfig().getSslKeyIndex());
-            } else {
-                return SMSslClientContextFactory.build(
-                        configOption.getCryptoMaterialConfig().getCaInputStream(),
-                        configOption.getCryptoMaterialConfig().getEnSSLCertInputStream(),
-                        configOption.getCryptoMaterialConfig().getEnSSLPrivateKeyInputStream(),
-                        configOption.getCryptoMaterialConfig().getSdkCertInputStream(),
-                        configOption.getCryptoMaterialConfig().getSdkPrivateKeyInputStream());
-            }
-
+            return SMSslClientContextFactory.build(
+                    configOption.getCryptoMaterialConfig().getCaInputStream(),
+                    configOption.getCryptoMaterialConfig().getEnSSLCertInputStream(),
+                    configOption.getCryptoMaterialConfig().getEnSSLPrivateKeyInputStream(),
+                    configOption.getCryptoMaterialConfig().getSdkCertInputStream(),
+                    configOption.getCryptoMaterialConfig().getSdkPrivateKeyInputStream());
         } catch (Exception e) {
             if (configOption.getCryptoMaterialConfig().getCryptoProvider().equalsIgnoreCase(HSM)) {
                 logger.error(