hotfix 兼容 fingerprint.data 文件是否存在两种逻辑。修改 tms cmep 完整性保护文件名字。
This commit is contained in:
@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.security.PublicKey;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -153,22 +155,21 @@ public class SelfCheckServiceImpl implements SelfCheckService {
|
||||
log.info("硬盘序列号: " + fingerprint.getHardDiskSerialNumber());
|
||||
|
||||
String plainText = buildPlainText(fingerprint);
|
||||
log.info("\n当前拼接原文: " + plainText);
|
||||
|
||||
String savedPlainText = SM3Util.readFile(FINGERPRINT_DATA_FILE).trim();
|
||||
log.info("保存的拼接原文: " + savedPlainText);
|
||||
|
||||
byte[] signature = SM3Util.readFileBytes(SIGN_FILE);
|
||||
PublicKey publicKey = SM2Util.loadPublicKey(FINGERPRINT_PUBLIC_KEY_PATH);
|
||||
|
||||
boolean dataMatch = plainText.equals(savedPlainText);
|
||||
boolean signatureVerified = SM2Util.verify(savedPlainText.getBytes(StandardCharsets.UTF_8), signature, publicKey);
|
||||
boolean signatureVerified = SM2Util.verify(plainText.getBytes(StandardCharsets.UTF_8), signature, publicKey);
|
||||
|
||||
log.info("\n=== 验证结果 ===");
|
||||
log.info("设备信息匹配: " + dataMatch);
|
||||
log.info("签名验证: " + signatureVerified);
|
||||
log.info("总体验证: " + (dataMatch && signatureVerified));
|
||||
return (dataMatch && signatureVerified);
|
||||
if( Files.exists( Paths.get(FINGERPRINT_DATA_FILE)) ) {
|
||||
String savedPlainText = SM3Util.readFile(FINGERPRINT_DATA_FILE).trim();
|
||||
// System.out.println("保存的拼接原文: " + savedPlainText);
|
||||
boolean dataMatch = plainText.equals(savedPlainText);
|
||||
log.info("设备信息与保存的信息匹配: " + dataMatch);
|
||||
}
|
||||
|
||||
return signatureVerified;
|
||||
} catch (Exception e) {
|
||||
log.error("[ERROR] {} - {}", CHECK_DEVICE_FINGERPRINT, e.getMessage());
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user