Merge pull request #313 from MaggieNgWu/r2.8-hsm

auto add "sm2_" prefix of ssl key index, fix a bug

Author: MaggieNgWu

build.gradle

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

sdk-core/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java

@@ -275,9 +275,9 @@ private SslContext initSMSslContext(ConfigOption configOption) throws NetworkExc
                 return SMSslClientContextFactory.build(
                         configOption.getCryptoMaterialConfig().getCaInputStream(),
                         configOption.getCryptoMaterialConfig().getEnSSLCertInputStream(),
-                        configOption.getCryptoMaterialConfig().getEnSslKeyIndex(),
+                        "sm2_" + configOption.getCryptoMaterialConfig().getEnSslKeyIndex(),
                         configOption.getCryptoMaterialConfig().getSdkCertInputStream(),
-                        configOption.getCryptoMaterialConfig().getSslKeyIndex());
+                        "sm2_" + configOption.getCryptoMaterialConfig().getSslKeyIndex());
             } else {
                 return SMSslClientContextFactory.build(
                         configOption.getCryptoMaterialConfig().getCaInputStream(),
@@ -293,9 +293,9 @@ private SslContext initSMSslContext(ConfigOption configOption) throws NetworkExc
                         "initSMSslContext failed, caCert:{}, sslCert: {}, sslKeyIndex: {}, enCert: {}, enSslKeyIndex: {}, error: {}, e: {}",
                         configOption.getCryptoMaterialConfig().getCaCertPath(),
                         configOption.getCryptoMaterialConfig().getSdkCertPath(),
-                        configOption.getCryptoMaterialConfig().getEnSslKeyIndex(),
-                        configOption.getCryptoMaterialConfig().getEnSSLCertPath(),
                         configOption.getCryptoMaterialConfig().getSslKeyIndex(),
+                        configOption.getCryptoMaterialConfig().getEnSSLCertPath(),
+                        configOption.getCryptoMaterialConfig().getEnSslKeyIndex(),
                         e.getMessage(),
                         e);
             } else {

sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoSuite.java

@@ -115,6 +115,7 @@ protected void initCryptoSuite(int cryptoTypeConfig) {
             this.signatureImpl = new SDFSM2Signature();
             this.hashImpl = new SDFSM3Hash();
             this.keyPairFactory = new SDFSM2KeyPair();
+            this.cryptoTypeConfig = CryptoType.SM_TYPE;
         } else {
             throw new UnsupportedCryptoTypeException(
                     "only support "

sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java

@@ -108,7 +108,7 @@ static Client build(
             return null;
         }
         CryptoSuite cryptoSuite = new CryptoSuite(cryptoType, groupManagerService.getConfig());
-        logger.info("build client success for group {}", groupId);
+        logger.info("build client success for group {}, crypto type {}", groupId, cryptoType);
         return new ClientImpl(
                 groupManagerService, channel, groupId, cryptoSuite, nodeVersion, eventResource);
     }