add API for HSM #729

LucasLi1024 · 2023-02-09T04:42:51Z

(crud): crud adapt new condition data structure. (#709)

作者： LucasLi
日期： Tue Jan 5 11:43:33 2023 +0800

bxq2011hust · 2023-02-16T03:04:28Z

src/main/java/org/fisco/bcos/sdk/v3/client/ClientImpl.java

-                this.cryptoSuite = new CryptoSuite(CryptoType.SM_TYPE, configOption);
-
+            // init hsm crypto suite
+            if(configOption.getCryptoMaterialConfig() != null && configOption.getCryptoMaterialConfig().getUseSmCrypto()) {


Suggested change

if(configOption.getCryptoMaterialConfig() != null && configOption.getCryptoMaterialConfig().getUseSmCrypto()) {

if(configOption.getCryptoMaterialConfig() != null && configOption.getCryptoMaterialConfig().getEnableHsm()) {

bxq2011hust · 2023-02-16T03:05:17Z

src/main/java/org/fisco/bcos/sdk/v3/client/ClientImpl.java

-                this.cryptoSuite = new CryptoSuite(CryptoType.SM_TYPE, configOption);
-
+            // init hsm crypto suite
+            if(configOption.getCryptoMaterialConfig() != null && configOption.getCryptoMaterialConfig().getUseSmCrypto()) {


这里应该再保持原本逻辑的基础上，在国密的分支判断是否使用密码机，来创建CryptoSuite

bxq2011hust · 2023-02-16T03:05:46Z

src/main/java/org/fisco/bcos/sdk/v3/config/model/CryptoMaterialConfig.java


    private Boolean useSmCrypto = false;
    private Boolean disableSsl = false;
+    private Boolean hsmEnable = false;


Suggested change

private Boolean hsmEnable = false;

private Boolean enableHsm = false;

bxq2011hust · 2023-02-16T03:06:26Z

src/main/java/org/fisco/bcos/sdk/v3/config/model/CryptoMaterialConfig.java

        Map<String, Object> cryptoMaterialProperty = configProperty.getCryptoMaterial();
        String useSMCrypto = (String) cryptoMaterialProperty.get("useSMCrypto");
        String disableSsl = (String) cryptoMaterialProperty.get("disableSsl");
+        String hsmEnable = (String) cryptoMaterialProperty.get("hsmEnable");


Suggested change

String hsmEnable = (String) cryptoMaterialProperty.get("hsmEnable");

String enableHsm = (String) cryptoMaterialProperty.get("enableHsm");

bxq2011hust · 2023-02-16T03:31:01Z

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

+    public int cryptoTypeConfig;
+    public Signature signatureImpl;
+    public Hash hashImpl;
+    private CryptoKeyPair keyPairFactory;


Suggested change

private CryptoKeyPair keyPairFactory;

private CryptoKeyPair hsmSM2KeyPair;

has rename to keyPair

ywy2090 · 2023-02-16T09:12:07Z

src/main/java/org/fisco/bcos/sdk/v3/crypto/signature/HsmSM2Signature.java

+    @Override
+    public String signWithStringSignature(final String message, final CryptoKeyPair keyPair) {
+        byte[] signMessageBytes = signMessage(message, keyPair);
+        String signMessageStr = new String(signMessageBytes, 0, SIGNATURE_R_AND_S_LENGTH);


remove this and use toHex() directly

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

+    /**
+     * Create key pair from a private key string
+     *
+     * @param hexedPrivateKey a hex string of private key


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

作者： LucasLi Date： Thu Feb 16 20:00:33 2023 +0800

sonarqubecloud · 2023-02-16T12:46:08Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

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

+        } else if (this.cryptoTypeConfig == CryptoType.HSM_TYPE) {
+            String hsmLibPath = this.config.getCryptoMaterialConfig().getHsmLibPath();
+            int hsmKeyIndex =
+                    Integer.parseInt(this.config.getCryptoMaterialConfig().getHsmKeyIndex());


codecov · 2023-02-16T12:49:46Z

Codecov Report

❗ No coverage uploaded for pull request base (release-3.3.0@a2d6b01). Click here to learn what that means.
Patch has no changes to coverable lines.

❗ Current head 3f0257b differs from pull request most recent head 38a9ec0. Consider uploading reports for the commit 38a9ec0 to get more accurate results

Additional details and impacted files

@@               Coverage Diff                @@
##             release-3.3.0     #729   +/-   ##
================================================
  Coverage                 ?   31.69%           
  Complexity               ?     1504           
================================================
  Files                    ?      383           
  Lines                    ?    14009           
  Branches                 ?     1554           
================================================
  Hits                     ?     4440           
  Misses                   ?     9178           
  Partials                 ?      391

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

ywy2090 approved these changes Feb 9, 2023

View reviewed changes

LucasLi1024 force-pushed the release-3.3.0 branch 2 times, most recently from 8387881 to 16a95bd Compare February 16, 2023 02:39

bxq2011hust reviewed Feb 16, 2023

View reviewed changes

LucasLi1024 force-pushed the release-3.3.0 branch from 16a95bd to aa12cea Compare February 16, 2023 08:46

ywy2090 reviewed Feb 16, 2023

View reviewed changes

LucasLi1024 force-pushed the release-3.3.0 branch from aa12cea to 7193586 Compare February 16, 2023 12:01

github-advanced-security bot found potential problems Feb 16, 2023

View reviewed changes

add API for HSM

38a9ec0

作者： LucasLi Date： Thu Feb 16 20:00:33 2023 +0800

LucasLi1024 force-pushed the release-3.3.0 branch from 7193586 to 38a9ec0 Compare February 16, 2023 12:45

github-advanced-security bot found potential problems Feb 16, 2023

View reviewed changes

bxq2011hust approved these changes Feb 16, 2023

View reviewed changes

LucasLi1024 merged commit 147c2e8 into FISCO-BCOS:release-3.3.0 Feb 16, 2023

	if(configOption.getCryptoMaterialConfig() != null && configOption.getCryptoMaterialConfig().getUseSmCrypto()) {
	if(configOption.getCryptoMaterialConfig() != null && configOption.getCryptoMaterialConfig().getEnableHsm()) {

	private Boolean hsmEnable = false;
	private Boolean enableHsm = false;

	String hsmEnable = (String) cryptoMaterialProperty.get("hsmEnable");
	String enableHsm = (String) cryptoMaterialProperty.get("enableHsm");

	private CryptoKeyPair keyPairFactory;
	private CryptoKeyPair hsmSM2KeyPair;

add API for HSM #729

add API for HSM #729

Uh oh!

Conversation

LucasLi1024 commented Feb 9, 2023

Uh oh!

bxq2011hust Feb 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Check notice

Uh oh!

sonarqubecloud bot commented Feb 16, 2023

Uh oh!

Check notice

codecov bot commented Feb 16, 2023

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bxq2011hust Feb 16, 2023 •

edited

Loading