diff --git a/global.status b/global.status new file mode 100644 index 00000000..ed45772b --- /dev/null +++ b/global.status @@ -0,0 +1 @@ +{"authority_issuer_current_cpt_id":1000,"none_authority_issuer_current_cpt_id":2000007,"authority_issuer_current_policy_id":1000,"none_authority_issuer_current_policy_id":2000000,"presentationId":1} \ No newline at end of file diff --git a/src/main/java/com/webank/weid/constant/CredentialConstant.java b/src/main/java/com/webank/weid/constant/CredentialConstant.java index 1e478745..26588915 100644 --- a/src/main/java/com/webank/weid/constant/CredentialConstant.java +++ b/src/main/java/com/webank/weid/constant/CredentialConstant.java @@ -137,7 +137,8 @@ public final class CredentialConstant { * The Credential Proof Type Enumerate. */ public static enum CredentialProofType { - ECDSA("Secp256k1"); + ECDSA("Secp256k1"), + SM2("SM2"); /** * The Type Name of the Credential Proof. diff --git a/src/main/java/com/webank/weid/service/impl/CredentialPojoServiceImpl.java b/src/main/java/com/webank/weid/service/impl/CredentialPojoServiceImpl.java index 91ea93ac..0d4ec060 100644 --- a/src/main/java/com/webank/weid/service/impl/CredentialPojoServiceImpl.java +++ b/src/main/java/com/webank/weid/service/impl/CredentialPojoServiceImpl.java @@ -25,6 +25,7 @@ import com.webank.weid.util.*; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.fisco.bcos.sdk.model.CryptoType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1047,7 +1048,7 @@ public ResponseData createCredential(CreateCredentialPojoArgs ar String creator = args.getWeIdAuthentication().getWeId(); result.putProofValue(ParamKeyConstant.PROOF_CREATOR, creator); //TODO：目前CredentialProofType只有ECDSA类型，需要添加SM2 - String proofType = CredentialProofType.ECDSA.getTypeName(); + String proofType = DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName(); result.putProofValue(ParamKeyConstant.PROOF_TYPE, proofType); result.putProofValue(ParamKeyConstant.PROOF_SIGNATURE, signature); result.setSalt(saltMap); @@ -1074,7 +1075,7 @@ private ResponseData createLiteCredential(CredentialPojo credent String signature = DataToolUtils.SigBase64Serialization( DataToolUtils.signToRsvSignature(rawData, privateKey) ); - String proofType = CredentialProofType.ECDSA.getTypeName(); + String proofType = DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName(); credentialPojo.putProofValue(ParamKeyConstant.PROOF_TYPE, proofType); credentialPojo.putProofValue(ParamKeyConstant.PROOF_SIGNATURE, signature); ResponseData responseData = new ResponseData<>( @@ -1158,7 +1159,7 @@ public ResponseData addSignature( String creator = callerAuth.getWeId(); result.putProofValue(ParamKeyConstant.PROOF_CREATOR, creator); - String proofType = CredentialProofType.ECDSA.getTypeName(); + String proofType = DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName(); result.putProofValue(ParamKeyConstant.PROOF_TYPE, proofType); result.putProofValue(ParamKeyConstant.PROOF_SIGNATURE, signature); result.setSalt(saltMap); @@ -1896,7 +1897,7 @@ private void generatePresentationProof( WeIdAuthentication weIdAuthentication, PresentationE presentation) { - String proofType = CredentialProofType.ECDSA.getTypeName(); + String proofType = DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName(); presentation.putProofValue(ParamKeyConstant.PROOF_TYPE, proofType); Long proofCreated = DateUtils.getNoMillisecondTimeStamp(); diff --git a/src/main/java/com/webank/weid/service/impl/CredentialServiceImpl.java b/src/main/java/com/webank/weid/service/impl/CredentialServiceImpl.java index d7ee9a0c..343afc78 100644 --- a/src/main/java/com/webank/weid/service/impl/CredentialServiceImpl.java +++ b/src/main/java/com/webank/weid/service/impl/CredentialServiceImpl.java @@ -94,7 +94,6 @@ public ResponseData createCredential(CreateCredentialArgs arg credentialWrapper.setDisclosure(disclosureMap); // Construct Credential Proof - //替换国密 Map credentialProof = CredentialUtils.buildCredentialProof( result, args.getWeIdPrivateKey().getPrivateKey(), diff --git a/src/main/java/com/webank/weid/service/impl/EvidenceServiceImpl.java b/src/main/java/com/webank/weid/service/impl/EvidenceServiceImpl.java index a76cc659..9945fc24 100644 --- a/src/main/java/com/webank/weid/service/impl/EvidenceServiceImpl.java +++ b/src/main/java/com/webank/weid/service/impl/EvidenceServiceImpl.java @@ -411,7 +411,7 @@ private ResponseData addByCustomKey( weIdPrivateKey.getPrivateKey() ); if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) { - return new ResponseData<>(true, ErrorCode.SUCCESS); + return new ResponseData<>(true, ErrorCode.SUCCESS, resp.getTransactionInfo()); } else { return new ResponseData<>(false, resp.getErrorCode(), resp.getErrorMessage()); } @@ -425,7 +425,7 @@ private ResponseData addByCustomKey( weIdPrivateKey.getPrivateKey() ); if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) { - return new ResponseData<>(true, ErrorCode.SUCCESS); + return new ResponseData<>(true, ErrorCode.SUCCESS, resp.getTransactionInfo()); } else { return new ResponseData<>(false, resp.getErrorCode(), resp.getErrorMessage()); } @@ -554,7 +554,7 @@ private ResponseData hashToNewEvidence(String hashValue, String privateK privateKey ); if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) { - return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS); + return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS, resp.getTransactionInfo()); } else { return new ResponseData<>(StringUtils.EMPTY, resp.getErrorCode(), resp.getErrorMessage()); } @@ -812,7 +812,7 @@ public ResponseData createEvidenceWithLogAndCustomKey( privateKey ); if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) { - return new ResponseData<>(hashValue, ErrorCode.SUCCESS); + return new ResponseData<>(hashValue, ErrorCode.SUCCESS, resp.getTransactionInfo()); } else { return new ResponseData<>(StringUtils.EMPTY, resp.getErrorCode(), resp.getErrorMessage()); } @@ -869,7 +869,7 @@ public ResponseData revoke(Hashable object, WeIdAuthentication weIdAuth weIdAuthentication.getWeIdPrivateKey().getPrivateKey() ); if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) { - return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS); + return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS, resp.getTransactionInfo()); } else { return new ResponseData<>(false, resp.getErrorCode(), resp.getErrorMessage()); } @@ -901,7 +901,7 @@ public ResponseData unRevoke(Hashable object, WeIdAuthentication weIdAu weIdAuthentication.getWeIdPrivateKey().getPrivateKey() ); if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) { - return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS); + return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS, resp.getTransactionInfo()); } else { return new ResponseData<>(false, resp.getErrorCode(), resp.getErrorMessage()); } diff --git a/src/main/java/com/webank/weid/util/CredentialPojoUtils.java b/src/main/java/com/webank/weid/util/CredentialPojoUtils.java index 870990e0..21e3b967 100644 --- a/src/main/java/com/webank/weid/util/CredentialPojoUtils.java +++ b/src/main/java/com/webank/weid/util/CredentialPojoUtils.java @@ -968,7 +968,7 @@ private static ErrorCode isCredentialProofValid(Map proof) { } } // If the Proof type is ECDSA or other signature based scheme, check signature - if (type.equalsIgnoreCase(CredentialProofType.ECDSA.getTypeName())) { + if (type.equalsIgnoreCase(CredentialProofType.ECDSA.getTypeName()) || type.equalsIgnoreCase(CredentialProofType.SM2.getTypeName())) { if (proof.get(ParamKeyConstant.PROOF_SIGNATURE) == null) { return ErrorCode.CREDENTIAL_SIGNATURE_BROKEN; } else { diff --git a/src/main/java/com/webank/weid/util/CredentialUtils.java b/src/main/java/com/webank/weid/util/CredentialUtils.java index 3014e777..e65b34c1 100644 --- a/src/main/java/com/webank/weid/util/CredentialUtils.java +++ b/src/main/java/com/webank/weid/util/CredentialUtils.java @@ -11,6 +11,7 @@ import com.webank.weid.protocol.request.CreateCredentialArgs; import org.apache.commons.lang3.StringUtils; import org.fisco.bcos.sdk.abi.datatypes.generated.Bytes32; +import org.fisco.bcos.sdk.model.CryptoType; import java.nio.charset.StandardCharsets; import java.util.*; @@ -453,7 +454,7 @@ private static ErrorCode isCredentialProofValid(Map proof) { return ErrorCode.CREDENTIAL_ISSUER_INVALID; } // If the Proof type is ECDSA or other signature based scheme, check signature - if (type.equalsIgnoreCase(CredentialProofType.ECDSA.getTypeName())) { + if (type.equalsIgnoreCase(CredentialProofType.ECDSA.getTypeName()) || type.equalsIgnoreCase(CredentialProofType.SM2.getTypeName())) { String signature = proof.get(ParamKeyConstant.CREDENTIAL_SIGNATURE); if (StringUtils.isEmpty(signature) || !DataToolUtils.isValidBase64String(signature)) { return ErrorCode.CREDENTIAL_SIGNATURE_BROKEN; @@ -468,7 +469,7 @@ private static ErrorCode isCredentialProofValid(Map proof) { * @return Context value in String. */ public static String getDefaultCredentialProofType() { - return CredentialConstant.CredentialProofType.ECDSA.getTypeName(); + return DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName(); } private static boolean isCredentialProofTypeValid(String type) { diff --git a/src/main/resources/fisco.properties b/src/main/resources/fisco.properties deleted file mode 100644 index f7e3ef9f..00000000 --- a/src/main/resources/fisco.properties +++ /dev/null @@ -1,65 +0,0 @@ -# Fisco-bcos blockchain node related properties - -####################################################################################################### -# # -# fisco bcos version config # -# # -####################################################################################################### -# Version -bcos.version=2 - - -####################################################################################################### -# # -# contract address config # -# # -####################################################################################################### -# contract address -weId.contractaddress= -cpt.contractaddress= -issuer.contractaddress= -evidence.contractaddress= -specificissuer.contractaddress= - -# This variable is used to distinguish the environment. You can use "dev" to set the development environment, -# "stg" to set the test environment, "prd" to set the production environment, -# If you do not set it, the system will use allOrg as the environment by default. -# It is not recommended. Production use default configuration -cns.profile.active=prdabce - -####################################################################################################### -# # -# web3sdk connection config # -# # -####################################################################################################### -# blockchain connection params -web3sdk.timeout=30 -web3sdk.core-pool-size=100 -web3sdk.max-pool-size=200 -web3sdk.queue-capacity=1000 -web3sdk.keep-alive-seconds=60 - - -####################################################################################################### -# # -# fisco bcos 2.0 related config # -# # -####################################################################################################### -# Fisco-Bcos 2.x params, including Group ID and Encrypt Type -group.id=1 - -####################################################################################################### -# # -# fisco bcos node cert related config # -# # -####################################################################################################### -# Fisco-Bcos sdk SSL encrypt type, 0:ECDSA, 1:SM2 -sdk.sm-crypto=0 -# fisco-bcos sdk cert path contains[ca.crt,sdk.crt,sdk.key] -# if sdk.sm-crypto is true, contains [gm] directory, and gm dir contains [gmca.crt,gmsdk.crt,gmsdk.key,gmensdk.crt,gmensdk.key] -sdk.cert-path=resources/conf - -# amop public key of pem and private key of p12 configuration -amop.pub-path=resources/conf/amop/consumer_public_key.pem -amop.pri-path=resources/conf/amop/consumer_private_key.p12 -amop.p12-password=123456 \ No newline at end of file diff --git a/src/test/java/com/webank/weid/util/TestSignatureUtils.java b/src/test/java/com/webank/weid/util/TestSignatureUtils.java index cab1310a..3744e6f3 100644 --- a/src/test/java/com/webank/weid/util/TestSignatureUtils.java +++ b/src/test/java/com/webank/weid/util/TestSignatureUtils.java @@ -28,7 +28,7 @@ public void testSignatureUtils() throws Exception { String privateKey = - "58317564669857453586637110679746175832914889677346286855728850144028639639411"; + "58317564669857453586637110679736175832914889667346286865928840144018638639411"; //CryptoKeyPair keyPair = com.webank.weid.blockchain.service.fisco.CryptoFisco.cryptoSuite.getKeyPairFactory().createKeyPair(new BigInteger(privateKey)); //logger.info("publicKey:{} ", keyPair.getHexPublicKey()); //BigInteger publicKey = DataToolUtils.publicKeyFromPrivate(new BigInteger(privateKey)); @@ -44,7 +44,7 @@ public void testSignatureUtils() //logger.info("privateKey:{}", keyPair.getHexPrivateKey()); String str = "hello world...........................yes"; - String encodedTransaction = "+QO0hAi2YVSFF0h25/+FF0h25/+Cr7KUBpkSD2WtUaFvOjCsTBmdGldzoWuAuQOEY171pQAAAAAAAAAAAAAAACjm35JDYfxrsw1HaGOliu0ub1toAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0xNjk1MzcxNzQ0NTA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcWRpZDp3ZWlkOjEwMToweDI4ZTZkZjkyNDM2MWZjNmJiMzBkNDc2ODYzYTU4YWVkMmU2ZjViNjgja2V5cy0zYTg2MDMzZCxFZDI1NTE5VmVyaWZpY2F0aW9uS2V5MjAyMCxkaWQ6d2VpZDoxMDE6MHgyOGU2ZGY5MjQzNjFmYzZiYjMwZDQ3Njg2M2E1OGFlZDJlNmY1YjY4LHo1cnJmM3VQQ2d3ek1CWjRqMnpuMWhZVzF2QWc2OFdUVTZTZFpFQnl3aUdGTnpUZWVZNHR4cFRZTDJHQnJRWmlIdVRjcXg5RjJ5dzlKUndKSjF0NVI2YzY1dG5KTDh2ZUN5VDg1cms2dXlrRGM2aDk0ZVZOSnh3QUg1NlI0OHRoRDd5RlR5VUVTR2RNenVId3oydThHdWRIWXVlZkJzdG1MRktFSjQ2V0tEdnZ4QjlDRlg0ZkZWaG85ZDFYRW9ranpaeVRSRTFFMktiOFg1NkZrU3NibjZCUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAemRpZDp3ZWlkOjEwMToweDI4ZTZkZjkyNDM2MWZjNmJiMzBkNDc2ODYzYTU4YWVkMmU2ZjViNjgjMDRiOGQ4YWUsV2VJZGVudGl0eSxodHRwczovL2dpdGh1Yi5jb20vV2VCYW5rQmxvY2tjaGFpbi9XZUlkZW50aXR5AAAAAAAAAQGA"; + String encodedTransaction = "+QO0hAi2YVuFF0h25/+FF0h25/+Cr7qUBpkSD2WtUaFvOjCsTBmdGldzoWuAuQOEY171pQAAAAAAAAAAAAAAAFsCVdizVm+rfGFI2R29uQi6Z7wQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0xNjk2MDc0NDI0NjQ1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcmRpZDp3ZWlkOjEwMToweDViMDI1NWQ4YjM1NjZmYWI3YzYxNDhkOTFkYmRiOTA4YmE2N2JjMTAja2V5cy0xZjBlYzc1NyxFZDI1NTE5VmVyaWZpY2F0aW9uS2V5MjAyMCxkaWQ6d2VpZDoxMDE6MHg1YjAyNTVkOGIzNTY2ZmFiN2M2MTQ4ZDkxZGJkYjkwOGJhNjdiYzEwLHpOVDRBd1N4c3pDWldZOVJLakVqcFE0dFdMektEd2NDWndkRG9IaHNwSlZjRXNBenVLaHBkekhpWnNBYkd3YjNaaXFBSk5peVRVaVMyakExRlZnRU5Zb0xRalNkWDVQOG55Y2FyWHc2OWRRd2NxazNDN0V4NlFjOW8zOG5zWnZIbm1kc3J0WXdKN1FlM2p0TkRFUVZ4TndaSjN1cHhmR3E5eXBlZXU4ZDJoZm5VcXV3R3lUUmhMaEpmNTdQcU5XU2czMWRwYVBxNjVqeE1xdmVzTXpENVVobmgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAemRpZDp3ZWlkOjEwMToweDViMDI1NWQ4YjM1NjZmYWI3YzYxNDhkOTFkYmRiOTA4YmE2N2JjMTAjMDRiOGQ4YWUsV2VJZGVudGl0eSxodHRwczovL2dpdGh1Yi5jb20vV2VCYW5rQmxvY2tjaGFpbi9XZUlkZW50aXR5AAAAAAAAAQGA"; byte[] decodeTransaction = DataToolUtils.base64Decode(encodedTransaction.getBytes()); String decodeTransactionStr = new String(decodeTransaction); //address = DataToolUtils.addressFromPublic(new BigInteger(decodeTransaction)); diff --git a/src/test/resources/ca.crt b/src/test/resources/ca.crt deleted file mode 100644 index eb26670d..00000000 --- a/src/test/resources/ca.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDQTCCAimgAwIBAgIJAIJEZzGo1hwvMA0GCSqGSIb3DQEBCwUAMDYxDzANBgNV -BAMMBmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEOMAwGA1UECwwFY2hhaW4w -IBcNMjIwNzIwMTIxNDUzWhgPMjEyMjA2MjYxMjE0NTNaMDYxDzANBgNVBAMMBmFn -ZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEOMAwGA1UECwwFY2hhaW4wggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCszn7/qtoAQbORyx/JQdmYkpKkMkT1 -hjQhS4XPZq9PyamqCxXHjTnk7iNlGysn+geTwCYg8azSbvWMNoVuOo+MHK21ob0D -vzI4gEtM+hear930BbMrg1+TQfp/rcKgE8kkBPT4/6rObzvId2tZob7RW/ij1n57 -c0uhHUbbf+lbqE26Gr/LiKkRUb4oB3c96KoST4kfb+Pt+WLFo3OS6/ecX2nQbBKc -tCBv+A4nv5ZKJFCcITDJi7ZMdQK2EjiedpV9PaeV/GAdViYfHAbp6CD9h2KFYQuA -fqBdQO2UgRhX6aHpXDLh2GxPHqTu8yAWSTCmqWVGPqjSn7mYgbvii04PAgMBAAGj -UDBOMB0GA1UdDgQWBBRu0frHn383VveyYgY/RF/uzjZy1zAfBgNVHSMEGDAWgBRu -0frHn383VveyYgY/RF/uzjZy1zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA -A4IBAQA73AfFySC2hnUZS8peyFvMPS5OuMpv0b0VEHoWn0LDf6Mn9KBdT+CWWNaJ -0ecVR7RmbWMXkwzEq3xJHAztaJtrowMvPxNsraS2Wz1cA9Dwr2jKQruwIMdcYrKs -KoGVYZxD4JvYIAAVBXQ36FU/p3dtqaA2yzfIs7hbsYARDcjJyO2bTJADQcLQCn8e -emFZ57/rHPoa0XA/DupG0HDeGZPKkY4I+NglhYvGg2Fiy6FU+p4BmIaCqMjL93+u -QWaH67xMCnP8aTQOWiIn+5X0P05TMLR31i/knUI45+PhoKVhM4i/oskeekPpK3BF -t4CcsvNr+7Jvr2MeqpL/R2qN2n4g ------END CERTIFICATE----- diff --git a/src/test/resources/gm/gmca.crt b/src/test/resources/gm/gmca.crt deleted file mode 100644 index 5f85b87f..00000000 --- a/src/test/resources/gm/gmca.crt +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBxDCCAWqgAwIBAgIJAIK0FHy8gSBHMAoGCCqBHM9VAYN1MDcxEDAOBgNVBAMM -B2dtY2hhaW4xEzARBgNVBAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMCAX -DTIyMDcyMDEyMTQ1M1oYDzIxMjIwNjI2MTIxNDUzWjA3MRAwDgYDVQQDDAdnbWNo -YWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjBZMBMGByqG -SM49AgEGCCqBHM9VAYItA0IABPzo9TYTFPRUcy4RealZ80US9iKtPDbMb+cVL0TE -TvVj+Pg6Pr0T2Rstib4jyBYDYnzko8RrPTNy5Fo/XnYbzpmjXTBbMB0GA1UdDgQW -BBRnJtxhYmeE28Z0t3KMowmzs8ktkzAfBgNVHSMEGDAWgBRnJtxhYmeE28Z0t3KM -owmzs8ktkzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAKBggqgRzPVQGDdQNI -ADBFAiEAtsYmah+kECom1sHEUe+eTJmJYjHDVzlxpw30MKEWQFYCIBqGAPxit0db -+E+dYAs0QqyXVog8D6vqWBAn3DJmNkKL ------END CERTIFICATE----- diff --git a/src/test/resources/gm/gmensdk.crt b/src/test/resources/gm/gmensdk.crt deleted file mode 100644 index 5bd84096..00000000 --- a/src/test/resources/gm/gmensdk.crt +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBgTCCASagAwIBAgIJAMNVhQGVGV3RMAoGCCqBHM9VAYN1MDoxEjAQBgNVBAMM -CWFnZW5jeS1nbTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5 -MCAXDTIyMDcyMDEyMTQ1M1oYDzIxMjIwNjI2MTIxNDUzWjAzMQwwCgYDVQQDDANz -ZGsxEzARBgNVBAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWVuc2RrMFkwEwYHKoZI -zj0CAQYIKoEcz1UBgi0DQgAEm/yqjgB6Uj248VaGoKlAFHfMArVmdb6Fi8qJ9Eo5 -xtD+q5p2Olq3T9y334SztTKNtoezyfVYx5kiFXaPXFyjj6MaMBgwCQYDVR0TBAIw -ADALBgNVHQ8EBAMCAzgwCgYIKoEcz1UBg3UDSQAwRgIhAMbxf1yfmW21T1KQC4rs -hw9FNU5qqWeEQDS8EZWr4h3fAiEAgRzV3gVsgxKaIPlgipaQE8mOZKAp4zVuglHT -afeLeI4= ------END CERTIFICATE----- diff --git a/src/test/resources/gm/gmensdk.key b/src/test/resources/gm/gmensdk.key deleted file mode 100644 index 68cc246c..00000000 --- a/src/test/resources/gm/gmensdk.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBG0wawIBAQQgwKEROs61A4CO8XUl -bY5XLdNsfBTEpYhenmdkB2aPjkGhRANCAASb/KqOAHpSPbjxVoagqUAUd8wCtWZ1 -voWLyon0SjnG0P6rmnY6WrdP3LffhLO1Mo22h7PJ9VjHmSIVdo9cXKOP ------END PRIVATE KEY----- diff --git a/src/test/resources/gm/gmsdk.crt b/src/test/resources/gm/gmsdk.crt deleted file mode 100644 index 158e75c2..00000000 --- a/src/test/resources/gm/gmsdk.crt +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBfzCCASSgAwIBAgIJAMNVhQGVGV3QMAoGCCqBHM9VAYN1MDoxEjAQBgNVBAMM -CWFnZW5jeS1nbTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5 -MCAXDTIyMDcyMDEyMTQ1M1oYDzIxMjIwNjI2MTIxNDUzWjAxMQwwCgYDVQQDDANz -ZGsxEzARBgNVBAoMCmZpc2NvLWJjb3MxDDAKBgNVBAsMA3NkazBZMBMGByqGSM49 -AgEGCCqBHM9VAYItA0IABJTrIRpey2YTxds+wzs99vygmTCSzfM9zolzhJM2JZ2h -lPJj2EkW7sOi2ipAnl3vqeYMbPSO0FfO62kdSA48ZzSjGjAYMAkGA1UdEwQCMAAw -CwYDVR0PBAQDAgbAMAoGCCqBHM9VAYN1A0kAMEYCIQCbDltY/aWbvzQXFDA39io3 -eYJef74SqvBq15SCHTodRQIhALZyL0wOR5b6mF8CpZ1f6PgCfS65MOD+FMu68ROs -iyP9 ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBxzCCAW2gAwIBAgIJAPuprJr9njTsMAoGCCqBHM9VAYN1MDcxEDAOBgNVBAMM -B2dtY2hhaW4xEzARBgNVBAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMCAX -DTIyMDcyMDEyMTQ1M1oYDzIxMjIwNjI2MTIxNDUzWjA6MRIwEAYDVQQDDAlhZ2Vu -Y3ktZ20xEzARBgNVBAoMCmZpc2NvLWJjb3MxDzANBgNVBAsMBmFnZW5jeTBZMBMG -ByqGSM49AgEGCCqBHM9VAYItA0IABJP6Z3Uy/grdbotZz+tG7Oq98qMAymmo9ZH3 -rFLqVirxVld8Ap4UI5VWhxqmlrd+DEV/71CYhF+29tmtwqovaf+jXTBbMB0GA1Ud -DgQWBBTVg/2i5aCyPW5yGkQlrgQoXIWWdTAfBgNVHSMEGDAWgBRnJtxhYmeE28Z0 -t3KMowmzs8ktkzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAKBggqgRzPVQGD -dQNIADBFAiEAlDh3QzLPvJRxGLWvElV+as4KIJBZkcsxf7qzciogRsoCID6zazCa -wPZ/M/cjX2nVkBZRfOg98swfubSkB4A4RGDs ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIBxDCCAWqgAwIBAgIJAIK0FHy8gSBHMAoGCCqBHM9VAYN1MDcxEDAOBgNVBAMM -B2dtY2hhaW4xEzARBgNVBAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMCAX -DTIyMDcyMDEyMTQ1M1oYDzIxMjIwNjI2MTIxNDUzWjA3MRAwDgYDVQQDDAdnbWNo -YWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjBZMBMGByqG -SM49AgEGCCqBHM9VAYItA0IABPzo9TYTFPRUcy4RealZ80US9iKtPDbMb+cVL0TE -TvVj+Pg6Pr0T2Rstib4jyBYDYnzko8RrPTNy5Fo/XnYbzpmjXTBbMB0GA1UdDgQW -BBRnJtxhYmeE28Z0t3KMowmzs8ktkzAfBgNVHSMEGDAWgBRnJtxhYmeE28Z0t3KM -owmzs8ktkzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAKBggqgRzPVQGDdQNI -ADBFAiEAtsYmah+kECom1sHEUe+eTJmJYjHDVzlxpw30MKEWQFYCIBqGAPxit0db -+E+dYAs0QqyXVog8D6vqWBAn3DJmNkKL ------END CERTIFICATE----- diff --git a/src/test/resources/gm/gmsdk.key b/src/test/resources/gm/gmsdk.key deleted file mode 100644 index c0ba1d3d..00000000 --- a/src/test/resources/gm/gmsdk.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBG0wawIBAQQgkum/NmA9fBXWkDie -QK2kgCQUneLu3cfNgFvn2pYCo/ehRANCAASU6yEaXstmE8XbPsM7Pfb8oJkwks3z -Pc6Jc4STNiWdoZTyY9hJFu7DotoqQJ5d76nmDGz0jtBXzutpHUgOPGc0 ------END PRIVATE KEY----- diff --git a/src/test/resources/gm/gmsdk.publickey b/src/test/resources/gm/gmsdk.publickey deleted file mode 100644 index 915cd46b..00000000 --- a/src/test/resources/gm/gmsdk.publickey +++ /dev/null @@ -1 +0,0 @@ -94eb211a5ecb6613c5db3ec33b3df6fca0993092cdf33dce8973849336259da194f263d84916eec3a2da2a409e5defa9e60c6cf48ed057ceeb691d480e3c6734 diff --git a/src/test/resources/sdk.crt b/src/test/resources/sdk.crt deleted file mode 100644 index f6142d1c..00000000 --- a/src/test/resources/sdk.crt +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC7zCCAdcCCQC5y7aXXQc4qDANBgkqhkiG9w0BAQsFADA2MQ8wDQYDVQQDDAZh -Z2VuY3kxEzARBgNVBAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMCAXDTIy -MDcyMDEyMTQ1M1oYDzIxMjIwNjI2MTIxNDUzWjA7MRMwEQYDVQQDDApGSVNDTy1C -Q09TMRMwEQYDVQQKDApmaXNjby1iY29zMQ8wDQYDVQQLDAZhZ2VuY3kwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7P+9jzusAzawLEAwO0uGK7QINVGsn -xSQZwyYi2utupciqNgc28HDdgPIxr6h176K3dU34DUyTKwXqFX3jiXobR0N2L0rQ -61WiwBHoDP3DLFY91csLBX26AKGkHzYzbXAA/J0W3SlsayG8uD1VANIqF2Bz0zS4 -MIxcqQLJfqSjutT2QRUfDC9LpsAhgyB8VAFnzS2/m46wMXPtU+jloiXJyW8DjHIC -eS68bbxDZy/4laFl6W7PwkkX2NwKHFgsKMDHGGt5UYze4Hmy723wT2ZTCOaz15D6 -XpJ7XDzkSuLLZ5J+1ZKuA6XC0coeCnp8jHRL5T+UTmuBPdi8Y/l2mh2fAgMBAAEw -DQYJKoZIhvcNAQELBQADggEBAE5SO/ZA7u1W2oTnF+okoI2y//E4CjiLTgf6A+P5 -RyOgMpxPSl/xsZ8uaxa1X2jOFsoSg9JaTyZPUw1cvk66fTc3tjhRlO/KJQNfYvT+ -WHh3zrsB01y49Wjf8ef4Zy2/HdSb8CcuVgmxKwQQMlCGAbNU0pkuhj8C7lFLCqa1 -IcNKdlj8qlMUr0JHAJXEENbGc8mMTr2sJlDj7NcVDIMiEhJLv4APv6Kb4/KWLoH2 -11T/rw0xaFfBqMjpxnzgfL4x2tWMq4DgnHhY5p+lWFcbno/94T8hmmyOKvlmuOr+ -Ye+W2gfu5zlowG4aeYarhAvpp02huOFBjJ5kM12//WF1rK8= ------END CERTIFICATE----- diff --git a/src/test/resources/sdk.key b/src/test/resources/sdk.key deleted file mode 100644 index 9eaed9b9..00000000 --- a/src/test/resources/sdk.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7P+9jzusAzawL -EAwO0uGK7QINVGsnxSQZwyYi2utupciqNgc28HDdgPIxr6h176K3dU34DUyTKwXq -FX3jiXobR0N2L0rQ61WiwBHoDP3DLFY91csLBX26AKGkHzYzbXAA/J0W3SlsayG8 -uD1VANIqF2Bz0zS4MIxcqQLJfqSjutT2QRUfDC9LpsAhgyB8VAFnzS2/m46wMXPt -U+jloiXJyW8DjHICeS68bbxDZy/4laFl6W7PwkkX2NwKHFgsKMDHGGt5UYze4Hmy -723wT2ZTCOaz15D6XpJ7XDzkSuLLZ5J+1ZKuA6XC0coeCnp8jHRL5T+UTmuBPdi8 -Y/l2mh2fAgMBAAECggEAWI7FVivfQvMCofzF5yDfIIg1Bz7cquN2zmRYHfXxkNQB -UlbZFKekiW3ZnZwZDSX3i9KDvIP1qkiXtHzTnBBB2rLaegOl26bhSmaSUXALeAn5 -A6egLqc7LgPsbqWASdRBO4Y9eTnBxI/qVcnA3/nSa6vApybFcTMsvwoD0m39yZzc -roBhgwZ+W38yJ836Z7xfR8gP9gpE252W81T87wQu9dYnIaNcaIk+SuAMQvZ8x3Rl -VnDZh3a+uxBguDF2yTincaDXJZr/M+bnQf6G4gYgY/2oMnj0jA3twm1Smwrvat2V -+DCnkUP+ZqMwAOmoDm/pxft79vqtwOfhqDVG4iA+GQKBgQDi8qhUFGeZe67APGc4 -8NrwGd5I/SP+o/XwmnDAtC7YLrvmbkOAabCPWW8rSAwXy3Ml059t06XymKonvRFL -r04nOXgHuo05WhkEd8VaaBUq5v/ejRktxJ4Tm0+JL1zzLSvnPza0AhzxNfFJr4M2 -h6+p8NyjrSODmLd0H8X4TBa05QKBgQDTOFL8oThNJXLtU+yZ5o0WltPpin2/9Adb -xSozv36aKW+IEqI8VkHSiUHjNlrS8k9RAPz8N2+IfhVCRneYDKE9tvRGH5Da8uaa -UQ/SGL33UGYhVUra3R/q/vr6H5QcfBrwNUQzPXfqno4zI7WVm62A8E23PvwE/jm1 -R9OoJraEMwKBgC2FEGA064aseSOTufyAytknxx8KryKPDnBg+cadHVw9G3Efoqhq -CoDmJlcfD1Xid8kZhjvIHNvo5RAtav+sPNe/PiUGtPbQ7H2p7Eqy37QIO0APOwKk -EjTKjQxuFI2t/MVYN4epeNakxC3MZ1wToRdL+WVW/+2QPxOqn9GqqU9FAoGBAIwH -czz4xRKgGSkt0lXVewPWynax0dxIM/irJedYtN4PSlmzwMqvhMPHK18u0de3vM2/ -EflD5zVeIUnm3bJ37Q21FQzIMIh3MFpuE0b+EDK9onfGy/F9V4O7tzfLZ63auSE2 -rxgpUC7DHxLYQbIFm2k35s3te7bzs95y1+dKgwXxAoGANfcf3wav+/guwjd5y5Fd -LMMuj3s9SXe3qZhC8YBUCwD1VJ4M5mT/l+DP//+20tk4QeGPycSFZohMnUbbKT+Q -CQmx5NsoJQ8KT5chYJ8P4JKvezdxYP9Vv3gGt4JJHKERgvy057NA6KxbbjL7AnUU -7GbmJqjLpYS+9KZGaLgVnNo= ------END PRIVATE KEY-----