diff --git a/chsm-common/src/main/java/com/sunyard/chsm/sdf/BCSdfApiService.java b/chsm-common/src/main/java/com/sunyard/chsm/sdf/BCSdfApiService.java index 6e9cc2f..7520fc1 100644 --- a/chsm-common/src/main/java/com/sunyard/chsm/sdf/BCSdfApiService.java +++ b/chsm-common/src/main/java/com/sunyard/chsm/sdf/BCSdfApiService.java @@ -71,12 +71,12 @@ public class BCSdfApiService implements SdfApiService { } @Override - public byte[] encryptByMK(byte[] data) { + public byte[] encryptByTMK(byte[] data) { return data; } @Override - public byte[] decryptByMK(byte[] data) { + public byte[] decryptByTMK(byte[] data) { return data; } diff --git a/chsm-common/src/main/java/com/sunyard/chsm/sdf/SdfApiService.java b/chsm-common/src/main/java/com/sunyard/chsm/sdf/SdfApiService.java index c5eb725..e151c4b 100644 --- a/chsm-common/src/main/java/com/sunyard/chsm/sdf/SdfApiService.java +++ b/chsm-common/src/main/java/com/sunyard/chsm/sdf/SdfApiService.java @@ -45,7 +45,7 @@ public interface SdfApiService { */ byte[] hash(byte[] pucData); - byte[] encryptByMK(byte[] data); + byte[] encryptByTMK(byte[] data); - byte[] decryptByMK(byte[] data); + byte[] decryptByTMK(byte[] data); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java index 81613a1..1ad88d9 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java @@ -278,14 +278,14 @@ public class KeyInfoServiceImpl implements KeyInfoService { if (KeyCategory.SYM_KEY.getCode().equals(info.getKeyType())) { byte[] symKey = sdfApiService.generateRandom(16); - byte[] encSymKey = sdfApiService.encryptByMK(symKey); + byte[] encSymKey = sdfApiService.encryptByTMK(symKey); record.setKeyData(Hex.toHexString(encSymKey)); String checkHash = Hex.toHexString(sdfApiService.hash(symKey)); record.setCheckValue(checkHash); } else { EccKey eccKey = sdfApiService.genKeyPairEcc(); byte[] d = eccKey.getPriKey().getD(); - byte[] encD = sdfApiService.encryptByMK(d); + byte[] encD = sdfApiService.encryptByTMK(d); record.setKeyData(Hex.toHexString(encD)); String checkHash = Hex.toHexString(sdfApiService.hash(d)); record.setCheckValue(checkHash); @@ -392,7 +392,7 @@ public class KeyInfoServiceImpl implements KeyInfoService { byte[] y = Arrays.copyOfRange(xy, 32, 64); ECPublicKeyParameters pubKeyParam = BCECUtils.createECPublicKeyParameters(x, y); - byte[] priKeyBytes = sdfApiService.decryptByMK(Hex.decode(record.getKeyData())); + byte[] priKeyBytes = sdfApiService.decryptByTMK(Hex.decode(record.getKeyData())); // byte[][] pri18 = LangUtils.splitAverage(priKeyBytes); ECPrivateKeyParameters priKeyParam = BCECUtils.createECPrivateKeyParameters(priKeyBytes); ECDomainParameters domainParams = priKeyParam.getParameters();