From 2daee4d652d7d91b678270eb3d798f6c53d6ddeb Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Mon, 21 Sep 2020 18:46:28 +0800 Subject: [PATCH] Separately define the encryption type in CryptoType to support jar package modularization --- .../bcos/sdk/demo/contract/DagTransfer.java | 5 ++-- .../bcos/sdk/demo/contract/HelloWorld.java | 5 ++-- .../org/fisco/bcos/sdk/demo/contract/Ok.java | 5 ++-- .../org/fisco/bcos/sdk/demo/contract/OkD.java | 5 ++-- .../bcos/sdk/demo/contract/ParallelOk.java | 5 ++-- .../bcos/sdk/demo/contract/TableTest.java | 5 ++-- .../bcos/sdk/amop/topic/AmopMsgHandler.java | 5 ++-- .../sdk/codegen/SolidityContractWrapper.java | 9 ++++--- .../org/fisco/bcos/sdk/config/Config.java | 4 +-- .../fisco/bcos/sdk/config/ConfigOption.java | 4 +-- .../config/model/CryptoMaterialConfig.java | 6 ++--- .../precompiled/cns/CNSPrecompiled.java | 5 ++-- .../consensus/ConsensusPrecompiled.java | 5 ++-- .../ContractLifeCyclePrecompiled.java | 5 ++-- .../sdk/contract/precompiled/crud/CRUD.java | 5 ++-- .../precompiled/crud/table/TableFactory.java | 5 ++-- .../ChainGovernancePrecompiled.java | 5 ++-- .../permission/PermissionPrecompiled.java | 5 ++-- .../sysconfig/SystemConfigPrecompiled.java | 5 ++-- .../bcos/sdk/crypto/CryptoInterface.java | 13 +++++---- .../org/fisco/bcos/sdk/model/CryptoType.java | 21 +++++++++++++++ .../bcos/sdk/network/ConnectionManager.java | 4 +-- .../fisco/bcos/sdk/network/NetworkImp.java | 6 ++--- .../sdk/service/GroupManagerServiceImpl.java | 6 ++--- .../bcos/sdk/amop/AmopMsgHandlerTest.java | 3 ++- .../org/fisco/bcos/sdk/amop/ConfigTest.java | 6 ++--- .../org/fisco/bcos/sdk/config/ConfigTest.java | 4 +-- .../org/fisco/bcos/sdk/test/abi/Utils.java | 3 ++- .../fisco/bcos/sdk/test/crypto/HashTest.java | 5 ++-- .../bcos/sdk/test/crypto/KeyManagerTest.java | 25 ++++++++--------- .../bcos/sdk/test/crypto/SignatureTest.java | 27 ++++++++++--------- 31 files changed, 118 insertions(+), 103 deletions(-) create mode 100644 src/main/java/org/fisco/bcos/sdk/model/CryptoType.java diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java index 2f5b161b2..33bf7e251 100644 --- a/src/demo/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java +++ b/src/demo/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java @@ -17,6 +17,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -51,9 +52,7 @@ protected DagTransfer(String contractAddress, Client client, CryptoInterface cre } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt userTransfer(String user_a, String user_b, BigInteger amount) { diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java index 522719676..29c1bce3e 100644 --- a/src/demo/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java +++ b/src/demo/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java @@ -13,6 +13,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -45,9 +46,7 @@ protected HelloWorld(String contractAddress, Client client, CryptoInterface cred } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt set(String n) { diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/Ok.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/Ok.java index 462b36ff6..df4a00e83 100644 --- a/src/demo/java/org/fisco/bcos/sdk/demo/contract/Ok.java +++ b/src/demo/java/org/fisco/bcos/sdk/demo/contract/Ok.java @@ -17,6 +17,7 @@ import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; import org.fisco.bcos.sdk.eventsub.EventCallback; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -54,9 +55,7 @@ protected Ok(String contractAddress, Client client, CryptoInterface credential) } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt trans(BigInteger num) { diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/OkD.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/OkD.java index c46b3236c..223ae5b06 100644 --- a/src/demo/java/org/fisco/bcos/sdk/demo/contract/OkD.java +++ b/src/demo/java/org/fisco/bcos/sdk/demo/contract/OkD.java @@ -18,6 +18,7 @@ import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; import org.fisco.bcos.sdk.eventsub.EventCallback; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -55,9 +56,7 @@ protected OkD(String contractAddress, Client client, CryptoInterface credential) } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public BigInteger get() throws ContractException { diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java index 199e0fa05..bd43a3646 100644 --- a/src/demo/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java +++ b/src/demo/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java @@ -17,6 +17,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -61,9 +62,7 @@ protected ParallelOk(String contractAddress, Client client, CryptoInterface cred } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt registerParallelFunction( diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/TableTest.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/TableTest.java index 604d5a06e..1c6c5030e 100644 --- a/src/demo/java/org/fisco/bcos/sdk/demo/contract/TableTest.java +++ b/src/demo/java/org/fisco/bcos/sdk/demo/contract/TableTest.java @@ -22,6 +22,7 @@ import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; import org.fisco.bcos.sdk.eventsub.EventCallback; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -92,9 +93,7 @@ protected TableTest(String contractAddress, Client client, CryptoInterface crede } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt update(String name, BigInteger item_id, String item_name) { diff --git a/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java b/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java index 4fe508498..d78fda6ba 100644 --- a/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java +++ b/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java @@ -34,6 +34,7 @@ import org.fisco.bcos.sdk.crypto.CryptoInterface; import org.fisco.bcos.sdk.crypto.keystore.KeyManager; import org.fisco.bcos.sdk.model.AmopMsg; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.Message; import org.fisco.bcos.sdk.model.MsgType; import org.fisco.bcos.sdk.model.Response; @@ -219,7 +220,7 @@ public int checkSignature(String topic, byte[] randomValue, byte[] signature) { Iterator pks = pubKeys.iterator(); while (pks.hasNext()) { KeyManager km = pks.next(); - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); if (cryptoInterface.verify( km, Hex.toHexString(cryptoInterface.hash(randomValue)), @@ -255,7 +256,7 @@ public void onPrivateTopicRandomValue(ChannelHandlerContext ctx, AmopMsg msg) { logger.error("topic:{} not subscribed, reject message", getSimpleTopic(topic)); return; } else { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); try { signature = cryptoInterface.sign(km, Hex.toHexString(cryptoInterface.hash(randValue))); diff --git a/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java b/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java index 3ec94b312..b2c0f1220 100644 --- a/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java +++ b/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java @@ -58,6 +58,7 @@ import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; import org.fisco.bcos.sdk.eventsub.EventCallback; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; import org.fisco.bcos.sdk.utils.Collection; @@ -117,7 +118,8 @@ public void generateJavaFiles( List abiDefinitions = CodeGenUtils.loadContractAbiDefinition(abi); TypeSpec.Builder classBuilder = createClassBuilder(className, bin, smBin, abi); - classBuilder.addMethod(buildGetBinaryMethod(CryptoInterface.class, CREDENTIAL)); + classBuilder.addMethod( + buildGetBinaryMethod(CryptoInterface.class, CryptoType.class, CREDENTIAL)); classBuilder.addMethod(buildConstructor(CryptoInterface.class, CREDENTIAL)); classBuilder.addFields(buildFuncNameConstants(abiDefinitions)); @@ -315,7 +317,8 @@ private Iterable buildFuncNameConstants(List functionD return fields; } - private static MethodSpec buildGetBinaryMethod(Class authType, String authName) { + private static MethodSpec buildGetBinaryMethod( + Class authType, Class cryptoType, String authName) { MethodSpec.Builder toReturn = MethodSpec.methodBuilder(GET_BINARY_FUNC) .addParameter(authType, authName) @@ -325,7 +328,7 @@ private static MethodSpec buildGetBinaryMethod(Class authType, String authName) toReturn.addStatement( "return ($N.getCryptoTypeConfig() == $T.ECDSA_TYPE ? $N : $N)", authName, - authType, + cryptoType, BINARY_NAME, SM_BINARY_NAME); return toReturn.build(); diff --git a/src/main/java/org/fisco/bcos/sdk/config/Config.java b/src/main/java/org/fisco/bcos/sdk/config/Config.java index 61374e96d..6e7e18a78 100644 --- a/src/main/java/org/fisco/bcos/sdk/config/Config.java +++ b/src/main/java/org/fisco/bcos/sdk/config/Config.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.fisco.bcos.sdk.config.exceptions.ConfigException; import org.fisco.bcos.sdk.config.model.ConfigProperty; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; /** * Config is to load config file and verify. @@ -30,7 +30,7 @@ public class Config { public static ConfigOption load(String tomlConfigFile) throws ConfigException { // default load ECDSA config - return load(tomlConfigFile, CryptoInterface.ECDSA_TYPE); + return load(tomlConfigFile, CryptoType.ECDSA_TYPE); } /** * @param tomlConfigFile diff --git a/src/main/java/org/fisco/bcos/sdk/config/ConfigOption.java b/src/main/java/org/fisco/bcos/sdk/config/ConfigOption.java index 3f204063c..1d3123830 100644 --- a/src/main/java/org/fisco/bcos/sdk/config/ConfigOption.java +++ b/src/main/java/org/fisco/bcos/sdk/config/ConfigOption.java @@ -23,7 +23,7 @@ import org.fisco.bcos.sdk.config.model.CryptoMaterialConfig; import org.fisco.bcos.sdk.config.model.NetworkConfig; import org.fisco.bcos.sdk.config.model.ThreadPoolConfig; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; /** * ConfigOption is the java object of the config file. @@ -40,7 +40,7 @@ public class ConfigOption { private ConfigProperty configProperty; public ConfigOption(ConfigProperty configProperty) throws ConfigException { - this(configProperty, CryptoInterface.ECDSA_TYPE); + this(configProperty, CryptoType.ECDSA_TYPE); } public ConfigOption(ConfigProperty configProperty, int cryptoType) throws ConfigException { diff --git a/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java b/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java index ecc70209e..166f628cb 100644 --- a/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java +++ b/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java @@ -18,7 +18,7 @@ import java.io.File; import java.util.Map; import org.fisco.bcos.sdk.config.exceptions.ConfigException; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,11 +80,11 @@ public CryptoMaterialConfig getDefaultCaCertPath(int cryptoType, String certPath CryptoMaterialConfig cryptoMaterialConfig = new CryptoMaterialConfig(); cryptoMaterialConfig.setCertPath(certPath); String smDir = "gm"; - if (cryptoType == CryptoInterface.ECDSA_TYPE) { + if (cryptoType == CryptoType.ECDSA_TYPE) { cryptoMaterialConfig.setCaCertPath(certPath + File.separator + "ca.crt"); cryptoMaterialConfig.setSdkCertPath(certPath + File.separator + "sdk.crt"); cryptoMaterialConfig.setSdkPrivateKeyPath(certPath + File.separator + "sdk.key"); - } else if (cryptoType == CryptoInterface.SM_TYPE) { + } else if (cryptoType == CryptoType.SM_TYPE) { cryptoMaterialConfig.setCaCertPath( certPath + File.separator + smDir + File.separator + "gmca.crt"); cryptoMaterialConfig.setSdkCertPath( diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java index 5df059815..b3d6fc1b2 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java @@ -17,6 +17,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -49,9 +50,7 @@ protected CNSPrecompiled(String contractAddress, Client client, CryptoInterface } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public String selectByName(String name) throws ContractException { diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java index 35e52961f..025912be3 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java @@ -15,6 +15,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -46,9 +47,7 @@ protected ConsensusPrecompiled( } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt addObserver(String param0) { diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java index 445273dc3..6d741c9a7 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java @@ -18,6 +18,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -53,9 +54,7 @@ protected ContractLifeCyclePrecompiled( } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public Tuple2 getStatus(String addr) throws ContractException { diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java index 7e91e19d7..37c85b23f 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java @@ -18,6 +18,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -52,9 +53,7 @@ protected CRUD(String contractAddress, Client client, CryptoInterface credential } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt update( diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java index 5c93ad6b4..bd2b3dee5 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java @@ -17,6 +17,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -45,9 +46,7 @@ protected TableFactory(String contractAddress, Client client, CryptoInterface cr } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt createTable(String param0, String param1, String param2) { diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java index 64031c91a..e35d28df7 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java @@ -18,6 +18,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -69,9 +70,7 @@ protected ChainGovernancePrecompiled( } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public String listOperators() throws ContractException { diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java index fe0422b5b..abdfc91fc 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java @@ -17,6 +17,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -54,9 +55,7 @@ protected PermissionPrecompiled( } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt insert(String table_name, String addr) { diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java index c58a7d87a..1d773d717 100644 --- a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java +++ b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java @@ -16,6 +16,7 @@ import org.fisco.bcos.sdk.contract.Contract; import org.fisco.bcos.sdk.contract.exceptions.ContractException; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.TransactionReceipt; import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback; @@ -43,9 +44,7 @@ protected SystemConfigPrecompiled( } public static String getBinary(CryptoInterface credential) { - return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE - ? BINARY - : SM_BINARY); + return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY); } public TransactionReceipt setValueByKey(String key, String value) { diff --git a/src/main/java/org/fisco/bcos/sdk/crypto/CryptoInterface.java b/src/main/java/org/fisco/bcos/sdk/crypto/CryptoInterface.java index 1cad68d3a..dc8bccf3b 100644 --- a/src/main/java/org/fisco/bcos/sdk/crypto/CryptoInterface.java +++ b/src/main/java/org/fisco/bcos/sdk/crypto/CryptoInterface.java @@ -31,6 +31,7 @@ import org.fisco.bcos.sdk.crypto.signature.SM2Signature; import org.fisco.bcos.sdk.crypto.signature.Signature; import org.fisco.bcos.sdk.crypto.signature.SignatureResult; +import org.fisco.bcos.sdk.model.CryptoType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,8 +39,6 @@ public class CryptoInterface { private static Logger logger = LoggerFactory.getLogger(CryptoInterface.class); - public static final int ECDSA_TYPE = 0; - public static final int SM_TYPE = 1; public final int cryptoTypeConfig; public final Signature signatureImpl; @@ -66,19 +65,23 @@ public CryptoInterface(int cryptoTypeConfig, ConfigOption configOption) { */ public CryptoInterface(int cryptoTypeConfig) { this.cryptoTypeConfig = cryptoTypeConfig; - if (this.cryptoTypeConfig == ECDSA_TYPE) { + if (this.cryptoTypeConfig == CryptoType.ECDSA_TYPE) { this.signatureImpl = new ECDSASignature(); this.hashImpl = new Keccak256(); this.keyPairFactory = new ECDSAKeyPair(); - } else if (this.cryptoTypeConfig == SM_TYPE) { + } else if (this.cryptoTypeConfig == CryptoType.SM_TYPE) { this.signatureImpl = new SM2Signature(); this.hashImpl = new SM3Hash(); this.keyPairFactory = new SM2KeyPair(); } else { throw new UnsupportedCryptoTypeException( - "only support " + ECDSA_TYPE + "/" + SM_TYPE + " crypto type"); + "only support " + + CryptoType.ECDSA_TYPE + + "/" + + CryptoType.SM_TYPE + + " crypto type"); } // create keyPair randomly createKeyPair(); diff --git a/src/main/java/org/fisco/bcos/sdk/model/CryptoType.java b/src/main/java/org/fisco/bcos/sdk/model/CryptoType.java new file mode 100644 index 000000000..bb3c804d5 --- /dev/null +++ b/src/main/java/org/fisco/bcos/sdk/model/CryptoType.java @@ -0,0 +1,21 @@ +/* + * Copyright 2014-2020 [fisco-dev] + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * + */ + +package org.fisco.bcos.sdk.model; + +public class CryptoType { + public static final int ECDSA_TYPE = 0; + public static final int SM_TYPE = 1; +} diff --git a/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java b/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java index 1c4a8a9ca..3114002f2 100644 --- a/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java +++ b/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java @@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit; import javax.net.ssl.SSLException; import org.fisco.bcos.sdk.config.ConfigOption; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.RetCode; import org.fisco.bcos.sdk.utils.ThreadPoolService; import org.slf4j.Logger; @@ -289,7 +289,7 @@ private void initNetty(ConfigOption configOption) throws NetworkException { bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, (int) TimeoutConfig.connectTimeout); int sslCryptoType = configOption.getCryptoMaterialConfig().getSslCryptoType(); SslContext sslContext = - (sslCryptoType == CryptoInterface.ECDSA_TYPE + (sslCryptoType == CryptoType.ECDSA_TYPE ? initSslContext(configOption) : initSMSslContext(configOption)); SslContext finalSslContext = sslContext; diff --git a/src/main/java/org/fisco/bcos/sdk/network/NetworkImp.java b/src/main/java/org/fisco/bcos/sdk/network/NetworkImp.java index b27bc72b1..35c4f7ea5 100644 --- a/src/main/java/org/fisco/bcos/sdk/network/NetworkImp.java +++ b/src/main/java/org/fisco/bcos/sdk/network/NetworkImp.java @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService; import org.fisco.bcos.sdk.config.ConfigOption; import org.fisco.bcos.sdk.config.exceptions.ConfigException; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -164,7 +164,7 @@ public void start() throws NetworkException { } } catch (NetworkException e) { tryEcdsaConnect = true; - configOption.reloadConfig(CryptoInterface.SM_TYPE); + configOption.reloadConfig(CryptoType.SM_TYPE); result = checkCertExistence(true); if (e.getErrorCode() == NetworkException.CONNECT_FAILED || !result.isCheckPassed()) { @@ -176,7 +176,7 @@ public void start() throws NetworkException { e.getMessage()); } logger.debug("start connManager with SM sslContext"); - configOption.reloadConfig(CryptoInterface.SM_TYPE); + configOption.reloadConfig(CryptoType.SM_TYPE); result = checkCertExistence(true); if (!result.isCheckPassed()) { if (tryEcdsaConnect) { diff --git a/src/main/java/org/fisco/bcos/sdk/service/GroupManagerServiceImpl.java b/src/main/java/org/fisco/bcos/sdk/service/GroupManagerServiceImpl.java index cee5a93e6..dfe9a856e 100644 --- a/src/main/java/org/fisco/bcos/sdk/service/GroupManagerServiceImpl.java +++ b/src/main/java/org/fisco/bcos/sdk/service/GroupManagerServiceImpl.java @@ -45,7 +45,7 @@ import org.fisco.bcos.sdk.client.protocol.response.BlockNumber; import org.fisco.bcos.sdk.client.protocol.response.GroupList; import org.fisco.bcos.sdk.config.ConfigOption; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.Message; import org.fisco.bcos.sdk.model.MsgType; import org.fisco.bcos.sdk.model.NodeVersion; @@ -121,9 +121,9 @@ public Integer getCryptoType(String peerInfo) { } NodeVersion nodeVersion = nodeToNodeVersion.get(peerInfo); if (nodeVersion.getNodeVersion().getVersion().contains(SM_CRYPTO_STR)) { - return CryptoInterface.SM_TYPE; + return CryptoType.SM_TYPE; } - return CryptoInterface.ECDSA_TYPE; + return CryptoType.ECDSA_TYPE; } @Override diff --git a/src/test/java/org/fisco/bcos/sdk/amop/AmopMsgHandlerTest.java b/src/test/java/org/fisco/bcos/sdk/amop/AmopMsgHandlerTest.java index 5961bd49c..61e4b3086 100644 --- a/src/test/java/org/fisco/bcos/sdk/amop/AmopMsgHandlerTest.java +++ b/src/test/java/org/fisco/bcos/sdk/amop/AmopMsgHandlerTest.java @@ -13,6 +13,7 @@ import org.fisco.bcos.sdk.crypto.keystore.P12Manager; import org.fisco.bcos.sdk.crypto.keystore.PEMManager; import org.fisco.bcos.sdk.model.AmopMsg; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.model.Message; import org.fisco.bcos.sdk.model.MsgType; import org.fisco.bcos.sdk.model.Response; @@ -92,7 +93,7 @@ public void testSignRandom() throws JsonProcessingException { AmopMsg amopMsg = new AmopMsg(signedRandom); amopMsg.decodeAmopBody(signedRandom.getData()); - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); Assert.assertTrue(amopMsg.getType() == (short) MsgType.AMOP_RESPONSE.getType()); Assert.assertEquals( "#!$VerifyChannel_#!$TopicNeedVerify_priv1_5e14c53197adbcb719d915fb93342c25", diff --git a/src/test/java/org/fisco/bcos/sdk/amop/ConfigTest.java b/src/test/java/org/fisco/bcos/sdk/amop/ConfigTest.java index 9a5e8c06f..e246164ad 100644 --- a/src/test/java/org/fisco/bcos/sdk/amop/ConfigTest.java +++ b/src/test/java/org/fisco/bcos/sdk/amop/ConfigTest.java @@ -4,7 +4,7 @@ import org.fisco.bcos.sdk.config.Config; import org.fisco.bcos.sdk.config.ConfigOption; import org.fisco.bcos.sdk.config.exceptions.ConfigException; -import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -25,7 +25,7 @@ public class ConfigTest { @Test public void testConfigSenderAmop() throws ConfigException { System.out.println(senderConfig); - ConfigOption configOption = Config.load(senderConfig, CryptoInterface.ECDSA_TYPE); + ConfigOption configOption = Config.load(senderConfig, CryptoType.ECDSA_TYPE); AmopImp amopImp = new AmopImp(new MockChannel(), configOption); Set topics = amopImp.getAllTopics(); @@ -41,7 +41,7 @@ public void testConfigSenderAmop() throws ConfigException { @Ignore @Test public void testConfigSubscriberAmop() throws ConfigException { - ConfigOption configOption = Config.load(subscriberConfig, CryptoInterface.ECDSA_TYPE); + ConfigOption configOption = Config.load(subscriberConfig, CryptoType.ECDSA_TYPE); AmopImp amopImp = new AmopImp(new MockChannel(), configOption); Set topics = amopImp.getAllTopics(); diff --git a/src/test/java/org/fisco/bcos/sdk/config/ConfigTest.java b/src/test/java/org/fisco/bcos/sdk/config/ConfigTest.java index 9539303a8..1fa07b6c2 100644 --- a/src/test/java/org/fisco/bcos/sdk/config/ConfigTest.java +++ b/src/test/java/org/fisco/bcos/sdk/config/ConfigTest.java @@ -18,8 +18,8 @@ import static org.junit.Assert.fail; import org.fisco.bcos.sdk.config.exceptions.ConfigException; -import org.fisco.bcos.sdk.crypto.CryptoInterface; import org.fisco.bcos.sdk.model.ConstantConfig; +import org.fisco.bcos.sdk.model.CryptoType; import org.junit.Assert; import org.junit.Test; @@ -30,7 +30,7 @@ public void testLoadRightConfig() { ConfigOption configOption = Config.load( "src/test/resources/" + ConstantConfig.CONFIG_FILE_NAME, - CryptoInterface.ECDSA_TYPE); + CryptoType.ECDSA_TYPE); Assert.assertTrue(configOption.getAccountConfig() != null); System.out.println( "configOption.getAccountConfig: " diff --git a/src/test/java/org/fisco/bcos/sdk/test/abi/Utils.java b/src/test/java/org/fisco/bcos/sdk/test/abi/Utils.java index 971313e29..21ae04fa1 100644 --- a/src/test/java/org/fisco/bcos/sdk/test/abi/Utils.java +++ b/src/test/java/org/fisco/bcos/sdk/test/abi/Utils.java @@ -18,11 +18,12 @@ import org.fisco.bcos.sdk.abi.wrapper.ABIDefinitionFactory; import org.fisco.bcos.sdk.abi.wrapper.ContractABIDefinition; import org.fisco.bcos.sdk.crypto.CryptoInterface; +import org.fisco.bcos.sdk.model.CryptoType; public class Utils { public static CryptoInterface getCryptoInterface() { - return new CryptoInterface(CryptoInterface.ECDSA_TYPE); + return new CryptoInterface(CryptoType.ECDSA_TYPE); } public static ContractABIDefinition getContractABIDefinition(String abiDesc) { diff --git a/src/test/java/org/fisco/bcos/sdk/test/crypto/HashTest.java b/src/test/java/org/fisco/bcos/sdk/test/crypto/HashTest.java index 14d993ed9..922ce02fe 100644 --- a/src/test/java/org/fisco/bcos/sdk/test/crypto/HashTest.java +++ b/src/test/java/org/fisco/bcos/sdk/test/crypto/HashTest.java @@ -18,6 +18,7 @@ import org.fisco.bcos.sdk.crypto.hash.Hash; import org.fisco.bcos.sdk.crypto.hash.Keccak256; import org.fisco.bcos.sdk.crypto.hash.SM3Hash; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.utils.Hex; import org.junit.Assert; import org.junit.Test; @@ -25,7 +26,7 @@ public class HashTest { @Test public void testCryptoInterfaceForSMHash() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.SM_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.SM_TYPE); // check sm3 hash for "abcde" checkHashWithCryptoInterface( cryptoInterface, @@ -47,7 +48,7 @@ public void testCryptoInterfaceForSMHash() { @Test public void testCryptoInterfaceForKeccak256Hash() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); // check keccak256 for "abcde" checkHashWithCryptoInterface( cryptoInterface, diff --git a/src/test/java/org/fisco/bcos/sdk/test/crypto/KeyManagerTest.java b/src/test/java/org/fisco/bcos/sdk/test/crypto/KeyManagerTest.java index e747986bc..32d01d859 100644 --- a/src/test/java/org/fisco/bcos/sdk/test/crypto/KeyManagerTest.java +++ b/src/test/java/org/fisco/bcos/sdk/test/crypto/KeyManagerTest.java @@ -20,6 +20,7 @@ import org.fisco.bcos.sdk.crypto.keystore.KeyManager; import org.fisco.bcos.sdk.crypto.keystore.P12Manager; import org.fisco.bcos.sdk.crypto.keystore.PEMManager; +import org.fisco.bcos.sdk.model.CryptoType; import org.junit.Assert; import org.junit.Test; @@ -30,7 +31,7 @@ public void testECDSALoadPEMFile() { CryptoKeyPair cryptoKeyPair = testLoadPEMFile( keyStoreFile, - CryptoInterface.ECDSA_TYPE, + CryptoType.ECDSA_TYPE, "0x0fc3c4bb89bd90299db4c62be0174c4966286c00"); // check the public key and the privateKey // Note the 04 prefix @@ -48,7 +49,7 @@ public void testSMLoadPEMFile() { CryptoKeyPair cryptoKeyPair = testLoadPEMFile( keyStoreFile, - CryptoInterface.SM_TYPE, + CryptoType.SM_TYPE, "0x40b3558746e8f9a47a474774e8c4a9e67d4e3174"); Assert.assertEquals( "043b72cd28244c856d3d89b67d1c5ff22e1f26835bafcd63e9a4ad3424a2a57f2b759149f46c696df08b9d9473686675fc6dade744d0c82bdc5598d759e015fd96", @@ -62,18 +63,14 @@ public void testSMLoadPEMFile() { public void testECDSALoadInvalidPEMFile() { String keyStoreFile = "keystore/ecdsa/invalid.pem"; testLoadPEMFile( - keyStoreFile, - CryptoInterface.ECDSA_TYPE, - "0x0fc3c4bb89bd90299db4c62be0174c4966286c00"); + keyStoreFile, CryptoType.ECDSA_TYPE, "0x0fc3c4bb89bd90299db4c62be0174c4966286c00"); } @Test(expected = LoadKeyStoreException.class) public void testSMLoadInvalidPEMFile() { String keyStoreFile = "keystore/gm/invalid.pem"; testLoadPEMFile( - keyStoreFile, - CryptoInterface.SM_TYPE, - "0x40b3558746e8f9a47a474774e8c4a9e67d4e3174"); + keyStoreFile, CryptoType.SM_TYPE, "0x40b3558746e8f9a47a474774e8c4a9e67d4e3174"); } @Test @@ -82,7 +79,7 @@ public void testLoadECDSAP12File() { CryptoKeyPair cryptoKeyPair = testLoadP12File( keyStoreFile, - CryptoInterface.ECDSA_TYPE, + CryptoType.ECDSA_TYPE, "123456", "0x45e14c53197adbcb719d915fb93342c25600faaf"); Assert.assertEquals( @@ -99,7 +96,7 @@ public void testLoadSMP12File() { CryptoKeyPair cryptoKeyPair = testLoadP12File( keyStoreFile, - CryptoInterface.SM_TYPE, + CryptoType.SM_TYPE, "abcd123", "0x6f68461309925093236df82b51df630a55d32377"); Assert.assertEquals( @@ -116,7 +113,7 @@ public void testInvalidECDSAP12Case() { String keyStoreFile = "keystore/ecdsa/0x45e14c53197adbcb719d915fb93342c25600faaf.p12"; testLoadP12File( keyStoreFile, - CryptoInterface.ECDSA_TYPE, + CryptoType.ECDSA_TYPE, "13456", "0x45e14c53197adbcb719d915fb93342c25600faaf"); } @@ -126,7 +123,7 @@ public void testInvalidSMP12Case() { String keyStoreFile = "keystore/gm/0x6f68461309925093236df82b51df630a55d32377.p12"; testLoadP12File( keyStoreFile, - CryptoInterface.SM_TYPE, + CryptoType.SM_TYPE, "abcd12e", "0x6f68461309925093236df82b51df630a55d32377"); } @@ -136,7 +133,7 @@ public void testInvalidP12FileForECDSA() { String keyStoreFile = "keystore/ecdsa/invalid.p12"; testLoadP12File( keyStoreFile, - CryptoInterface.ECDSA_TYPE, + CryptoType.ECDSA_TYPE, "abcd123", "0x6f68461309925093236df82b51df630a55d32377"); } @@ -146,7 +143,7 @@ public void testInvalidP12FileForSM() { String keyStoreFile = "keystore/gm/invalid.p12"; testLoadP12File( keyStoreFile, - CryptoInterface.SM_TYPE, + CryptoType.SM_TYPE, "123456", "0x45e14c53197adbcb719d915fb93342c25600faaf"); } diff --git a/src/test/java/org/fisco/bcos/sdk/test/crypto/SignatureTest.java b/src/test/java/org/fisco/bcos/sdk/test/crypto/SignatureTest.java index 62816970c..44f3e3237 100644 --- a/src/test/java/org/fisco/bcos/sdk/test/crypto/SignatureTest.java +++ b/src/test/java/org/fisco/bcos/sdk/test/crypto/SignatureTest.java @@ -34,6 +34,7 @@ import org.fisco.bcos.sdk.crypto.signature.Signature; import org.fisco.bcos.sdk.crypto.signature.SignatureResult; import org.fisco.bcos.sdk.model.ConstantConfig; +import org.fisco.bcos.sdk.model.CryptoType; import org.fisco.bcos.sdk.utils.Hex; import org.junit.Assert; import org.junit.Test; @@ -47,7 +48,7 @@ public class SignatureTest { @Test public void testCryptoInterfaceForECDSA() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); // generate keyPair CryptoKeyPair keyPair = cryptoInterface.createKeyPair(); // test signature @@ -70,7 +71,7 @@ public void testCryptoInterfaceForECDSA() { @Test public void testCryptoInterfaceForSM2() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.SM_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.SM_TYPE); // generate keyPair CryptoKeyPair keyPair = cryptoInterface.createKeyPair(); // test signature @@ -106,7 +107,7 @@ public void testValidGetAddressForECDSA() { keyPair, hexPublicKey, expectedHash, hexPublicKey2, expectedHash2); // create keyPair with cryptoInterface - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); keyPair = cryptoInterface.createKeyPair(); testValidGetAddressForKeyPair( keyPair, hexPublicKey, expectedHash, hexPublicKey2, expectedHash2); @@ -128,7 +129,7 @@ public void testValidGetAddressForSM() { keyPair, hexPublicKey, expectedHash, hexPublicKey2, expectedHash2); // create keyPair with cryptoInterface - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.SM_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.SM_TYPE); keyPair = cryptoInterface.createKeyPair(); testValidGetAddressForKeyPair( keyPair, hexPublicKey, expectedHash, hexPublicKey2, expectedHash2); @@ -194,14 +195,14 @@ public void testInvalidCaseForECDSAKeyPair() { @Test(expected = KeyPairException.class) public void testInvalidCaseForECDSACryptoInterface() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); CryptoKeyPair keyPair = cryptoInterface.createKeyPair(); testInvalidPublicKey(keyPair); } @Test(expected = KeyPairException.class) public void testInvalidCaseForSM2CryptoInterface() { - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.SM_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.SM_TYPE); CryptoKeyPair keyPair = cryptoInterface.createKeyPair(); testInvalidPublicKey(keyPair); } @@ -304,7 +305,7 @@ public void testSignAndVerifyWithKeyManager() { KeyManager signKeyManager = new P12Manager( getClass().getClassLoader().getResource(keyPairPem).getPath(), "123456"); - CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE); + CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE); // sign and verify message with keyManager for (int i = 0; i < 10; i++) { String message = cryptoInterface.hash("abcd----" + Integer.toString(i)); @@ -327,26 +328,26 @@ public String getKeyStoreFilePath( @Test public void testSMLoadAndStoreKeyPairWithPEM() throws ConfigException { - testLoadAndStoreKeyPairWithPEM(CryptoInterface.SM_TYPE); + testLoadAndStoreKeyPairWithPEM(CryptoType.SM_TYPE); } @Test public void testECDSALoadAndStoreKeyPairWithPEM() throws ConfigException { - testLoadAndStoreKeyPairWithPEM(CryptoInterface.ECDSA_TYPE); + testLoadAndStoreKeyPairWithPEM(CryptoType.ECDSA_TYPE); } @Test public void testSMLoadAndStoreKeyPairWithP12() throws ConfigException { - testLoadAndStoreKeyPairWithP12(CryptoInterface.SM_TYPE); + testLoadAndStoreKeyPairWithP12(CryptoType.SM_TYPE); } @Test public void testECDSALoadAndStoreKeyPairWithP12() throws ConfigException { - testLoadAndStoreKeyPairWithP12(CryptoInterface.ECDSA_TYPE); + testLoadAndStoreKeyPairWithP12(CryptoType.ECDSA_TYPE); } public void testLoadAndStoreKeyPairWithPEM(int cryptoType) throws ConfigException { - ConfigOption configOption = Config.load(configFile, CryptoInterface.ECDSA_TYPE); + ConfigOption configOption = Config.load(configFile, CryptoType.ECDSA_TYPE); CryptoInterface cryptoInterface = new CryptoInterface(cryptoType); cryptoInterface.getCryptoKeyPair().setConfig(configOption); cryptoInterface.getCryptoKeyPair().storeKeyPairWithPemFormat(); @@ -374,7 +375,7 @@ public void testLoadAndStoreKeyPairWithPEM(int cryptoType) throws ConfigExceptio } public void testLoadAndStoreKeyPairWithP12(int cryptoType) throws ConfigException { - ConfigOption configOption = Config.load(configFile, CryptoInterface.ECDSA_TYPE); + ConfigOption configOption = Config.load(configFile, CryptoType.ECDSA_TYPE); CryptoInterface cryptoInterface = new CryptoInterface(cryptoType); cryptoInterface.getCryptoKeyPair().setConfig(configOption); String password = "123";