From 22ca568e881ca3ad28d38c9071b77cf7e2663e82 Mon Sep 17 00:00:00 2001 From: cheney Date: Thu, 14 May 2026 16:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20mac=20=E6=A0=A1=E9=AA=8C=E5=AF=86=E9=92=A5?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/sunyard/cisd/device/tool/Main.java | 10 +++++----- .../{sm2_public_key.pem => fingerprint_public_key.pem} | 0 ...private_key.pem => fingerprint_sm2_private_key.pem} | 0 .../src/main/resources/mac_sm2_private_key.pem | 6 ++++++ .../src/main/resources/mac_sm2_public_key.pem | 4 ++++ .../src/test/java/com/sunyard/cisd/SM2UtilTest.java | 4 ++-- 6 files changed, 17 insertions(+), 7 deletions(-) rename device-fingerprint-tool/src/main/resources/{sm2_public_key.pem => fingerprint_public_key.pem} (100%) rename device-fingerprint-tool/src/main/resources/{sm2_private_key.pem => fingerprint_sm2_private_key.pem} (100%) create mode 100644 device-fingerprint-tool/src/main/resources/mac_sm2_private_key.pem create mode 100644 device-fingerprint-tool/src/main/resources/mac_sm2_public_key.pem diff --git a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/Main.java b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/Main.java index fcb5b40..2f72af1 100644 --- a/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/Main.java +++ b/device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/Main.java @@ -13,8 +13,8 @@ public class Main { private static final String PUBLIC_KEY_FILE = DEVICE_DIR + "/dev.fingerprint.pub"; private static final String PUBLIC_KEY_SM3_FILE = DEVICE_DIR + "/dev.fingerprint.pub.sm3"; private static final String FINGERPRINT_DATA_FILE = DEVICE_DIR + "/dev.fingerprint.data"; - private static final String PRIVATE_KEY_PATH = "/sm2_private_key.pem"; - private static final String PUBLIC_KEY_PATH = "/sm2_public_key.pem"; + private static final String FINGERPRINT_PRIVATE_KEY_PATH = "/fingerprint.sm2_private_key.pem"; + private static final String FINGERPRINT_PUBLIC_KEY_PATH = "/fingerprint.sm2_public_key.pem"; public static void main(String[] args) { if (args.length == 0) { @@ -119,10 +119,10 @@ public class Main { String plainText = buildPlainText(fingerprint); System.out.println("\n拼接后的原文: " + plainText); - byte[] signature = SM2Util.sign(plainText.getBytes(StandardCharsets.UTF_8), PRIVATE_KEY_PATH); + byte[] signature = SM2Util.sign(plainText.getBytes(StandardCharsets.UTF_8), FINGERPRINT_PRIVATE_KEY_PATH); System.out.println("签名结果(Base64): " + Base64.getEncoder().encodeToString(signature)); - PublicKey publicKey = SM2Util.loadPublicKey(PUBLIC_KEY_PATH); + PublicKey publicKey = SM2Util.loadPublicKey(FINGERPRINT_PUBLIC_KEY_PATH); String publicKeyPEM = SM2Util.publicKeyToPEM(publicKey); SM3Util.writeFile(SIGN_FILE, signature); @@ -166,7 +166,7 @@ public class Main { System.out.println("保存的拼接原文: " + savedPlainText); byte[] signature = SM3Util.readFileBytes(SIGN_FILE); - PublicKey publicKey = SM2Util.loadPublicKey(PUBLIC_KEY_PATH); + PublicKey publicKey = SM2Util.loadPublicKey(FINGERPRINT_PUBLIC_KEY_PATH); boolean dataMatch = plainText.equals(savedPlainText); boolean signatureVerified = SM2Util.verify(savedPlainText.getBytes(StandardCharsets.UTF_8), signature, publicKey); diff --git a/device-fingerprint-tool/src/main/resources/sm2_public_key.pem b/device-fingerprint-tool/src/main/resources/fingerprint_public_key.pem similarity index 100% rename from device-fingerprint-tool/src/main/resources/sm2_public_key.pem rename to device-fingerprint-tool/src/main/resources/fingerprint_public_key.pem diff --git a/device-fingerprint-tool/src/main/resources/sm2_private_key.pem b/device-fingerprint-tool/src/main/resources/fingerprint_sm2_private_key.pem similarity index 100% rename from device-fingerprint-tool/src/main/resources/sm2_private_key.pem rename to device-fingerprint-tool/src/main/resources/fingerprint_sm2_private_key.pem diff --git a/device-fingerprint-tool/src/main/resources/mac_sm2_private_key.pem b/device-fingerprint-tool/src/main/resources/mac_sm2_private_key.pem new file mode 100644 index 0000000..ac6f572 --- /dev/null +++ b/device-fingerprint-tool/src/main/resources/mac_sm2_private_key.pem @@ -0,0 +1,6 @@ +-----BEGIN PRIVATE KEY----- +MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgh9tzISMZY6ob2KVM +0Am9+Zm2jG+CLhp+g72hN3t7dl2gCgYIKoEcz1UBgi2hRANCAAT+73yu5EIYMSjc +60mEZXmYpR2O8yTWOY4WmG1eZqKhB/46DarhZVN8AAvpOYohZ1l3luk26jnpQNYx +psC8QVu5 +-----END PRIVATE KEY----- diff --git a/device-fingerprint-tool/src/main/resources/mac_sm2_public_key.pem b/device-fingerprint-tool/src/main/resources/mac_sm2_public_key.pem new file mode 100644 index 0000000..9ac23b4 --- /dev/null +++ b/device-fingerprint-tool/src/main/resources/mac_sm2_public_key.pem @@ -0,0 +1,4 @@ +-----BEGIN PUBLIC KEY----- +MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE/u98ruRCGDEo3OtJhGV5mKUdjvMk +1jmOFphtXmaioQf+Og2q4WVTfAAL6TmKIWdZd5bpNuo56UDWMabAvEFbuQ== +-----END PUBLIC KEY----- diff --git a/device-fingerprint-tool/src/test/java/com/sunyard/cisd/SM2UtilTest.java b/device-fingerprint-tool/src/test/java/com/sunyard/cisd/SM2UtilTest.java index d0bf792..f4ce940 100644 --- a/device-fingerprint-tool/src/test/java/com/sunyard/cisd/SM2UtilTest.java +++ b/device-fingerprint-tool/src/test/java/com/sunyard/cisd/SM2UtilTest.java @@ -25,13 +25,13 @@ public class SM2UtilTest { resourcesDir.mkdirs(); } - File privateKeyFile = new File(resourcesPath + "/sm2_private_key.pem"); + File privateKeyFile = new File(resourcesPath + "/mac_sm2_private_key.pem"); try (Writer writer = new OutputStreamWriter(new FileOutputStream(privateKeyFile), StandardCharsets.UTF_8)) { writer.write(privateKeyPEM); } System.out.println("Private key saved to: " + privateKeyFile.getAbsolutePath()); - File publicKeyFile = new File(resourcesPath + "/sm2_public_key.pem"); + File publicKeyFile = new File(resourcesPath + "/mac_sm2_public_key.pem"); try (Writer writer = new OutputStreamWriter(new FileOutputStream(publicKeyFile), StandardCharsets.UTF_8)) { writer.write(publicKeyPEM); }