Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TKSS-483: Add tests for algorithm aliases #487

Merged
merged 1 commit into from
Oct 21, 2023
Merged

TKSS-483: Add tests for algorithm aliases #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kona-crypto/src/main/java/com/tencent/kona/crypto/KonaCryptoProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ private static void putEntries(Provider provider) {
provider.put("Alg.Alias.KeyGenerator.SM3HMac", "HmacSM3");

provider.put("Alg.Alias.Cipher.OID.1.2.156.10197.1.301", "SM2");
provider.put("Alg.Alias.Signature.OID.1.2.156.10197.1.501", "SM3withSM2");
provider.put("Alg.Alias.Signature.OID.1.2.156.10197.1.501", "SM2");
provider.put("KeyPairGenerator.SM2",
"com.tencent.kona.crypto.provider.SM2KeyPairGenerator");
provider.put("KeyFactory.SM2", "com.tencent.kona.crypto.provider.SM2KeyFactory");
Expand Down
2 changes: 1 addition & 1 deletion kona-crypto/src/main/java/com/tencent/kona/crypto/provider/SM3MessageDigest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected byte[] engineDigest() {
protected int engineDigest(byte[] buf, int offset, int length)
throws DigestException {
if (length != SM3_DIGEST_LEN) {
throw new DigestException("THe length must be 32-bytes");
throw new DigestException("The length must be 32-bytes");
}

engine.doFinal(buf, offset);
Expand Down
11 changes: 10 additions & 1 deletion kona-crypto/src/test/java/com/tencent/kona/crypto/provider/SM2CipherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,22 @@ public static void setup() {

@Test
public void testCipher() throws Exception {
testCipher("SM2");
}

@Test
public void testAlias() throws Exception {
testCipher("OID.1.2.156.10197.1.301");
}

private void testCipher(String name) throws Exception {
KeyFactory keyFactory = KeyFactory.getInstance("SM2", PROVIDER);
SM2PublicKeySpec pubKeySpec = new SM2PublicKeySpec(toBytes(PUB_KEY));
PublicKey pubKey = keyFactory.generatePublic(pubKeySpec);
SM2PrivateKeySpec privateKeySpec = new SM2PrivateKeySpec(toBytes(PRI_KEY));
PrivateKey priKey = keyFactory.generatePrivate(privateKeySpec);

Cipher cipher = Cipher.getInstance("SM2", PROVIDER);
Cipher cipher = Cipher.getInstance(name, PROVIDER);

cipher.init(Cipher.ENCRYPT_MODE, pubKey);
byte[] ciphertext = cipher.doFinal(MESSAGE);
Expand Down
5 changes: 5 additions & 0 deletions kona-crypto/src/test/java/com/tencent/kona/crypto/provider/SM2SignatureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ public void testParameterSpec() throws Exception {
@Test
public void testSignature() throws Exception {
testSignature("SM2");
}

@Test
public void testAlias() throws Exception {
testSignature("SM3withSM2");
testSignature("OID.1.2.156.10197.1.501");
}

private void testSignature(String name) throws Exception {
Expand Down
172 changes: 95 additions & 77 deletions kona-crypto/src/test/java/com/tencent/kona/crypto/provider/SM3HMacTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,123 +51,141 @@ public static void setup() {
}

@Test
public void testSM3HMacKeyGen() throws Exception {
KeyGenerator sm3HMacKeyGen
= KeyGenerator.getInstance("HmacSM3", PROVIDER);
public void testHmacSM3KeyGen() throws Exception {
testHmacSM3KeyGen("HmacSM3");
}

@Test
public void testHmacSM3KeyGenAlias() throws Exception {
testHmacSM3KeyGen("SM3Hmac");
}

private void testHmacSM3KeyGen(String name) throws Exception {
KeyGenerator hmacSM3KeyGen
= KeyGenerator.getInstance(name, PROVIDER);

Assertions.assertThrows(
InvalidParameterException.class, ()-> sm3HMacKeyGen.init(127));
InvalidParameterException.class, ()-> hmacSM3KeyGen.init(127));

sm3HMacKeyGen.init(128);
SecretKey key = sm3HMacKeyGen.generateKey();
hmacSM3KeyGen.init(128);
SecretKey key = hmacSM3KeyGen.generateKey();
Assertions.assertEquals(16, key.getEncoded().length);

sm3HMacKeyGen.init(new SecureRandom());
key = sm3HMacKeyGen.generateKey();
hmacSM3KeyGen.init(new SecureRandom());
key = hmacSM3KeyGen.generateKey();
Assertions.assertEquals(32, key.getEncoded().length);
}

@Test
public void testSM3HMacKeyGenParallelly() throws Exception {
public void testHmacSM3KeyGenParallelly() throws Exception {
TestUtils.repeatTaskParallelly(() -> {
testSM3HMacKeyGen();
testHmacSM3KeyGen();
return null;
});
}

@Test
public void testSM3HMacKeyGenSerially() throws Exception {
public void testHmacSM3KeyGenSerially() throws Exception {
TestUtils.repeatTaskSerially(() -> {
testSM3HMacKeyGen();
testHmacSM3KeyGen();
return null;
});
}

@Test
public void testSM3HMac() throws Exception {
Mac sm3HMac = Mac.getInstance("HmacSM3", PROVIDER);
public void testHmacSM3() throws Exception {
testHmacSM3("HmacSM3");
}

@Test
public void testAlias() throws Exception {
testHmacSM3("hmacSM3");
}

public void testHmacSM3(String name) throws Exception {
Mac hmacSM3 = Mac.getInstance(name, PROVIDER);
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");
sm3HMac.init(keySpec);
byte[] mac = sm3HMac.doFinal(toBytes("616263"));
hmacSM3.init(keySpec);
byte[] mac = hmacSM3.doFinal(toBytes("616263"));
Assertions.assertEquals(SM3_HMAC_LEN, mac.length);
}

@Test
public void testUpdateByte() throws Exception {
Mac sm3HMac = Mac.getInstance("HmacSM3", PROVIDER);
Mac hmacSM3 = Mac.getInstance("HmacSM3", PROVIDER);
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");
sm3HMac.init(keySpec);
hmacSM3.init(keySpec);
for (byte b : MESSAGE) {
sm3HMac.update(b);
hmacSM3.update(b);
}
byte[] mac = sm3HMac.doFinal();
byte[] mac = hmacSM3.doFinal();
Assertions.assertEquals(SM3_HMAC_LEN, mac.length);
}

@Test
public void testUpdateBytes() throws Exception {
Mac sm3HMac = Mac.getInstance("HmacSM3", PROVIDER);
Mac hmacSM3 = Mac.getInstance("HmacSM3", PROVIDER);
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");
sm3HMac.init(keySpec);
sm3HMac.update(MESSAGE, 0, MESSAGE.length / 2);
sm3HMac.update(MESSAGE, MESSAGE.length / 2, MESSAGE.length - MESSAGE.length / 2);
byte[] mac = sm3HMac.doFinal();
hmacSM3.init(keySpec);
hmacSM3.update(MESSAGE, 0, MESSAGE.length / 2);
hmacSM3.update(MESSAGE, MESSAGE.length / 2, MESSAGE.length - MESSAGE.length / 2);
byte[] mac = hmacSM3.doFinal();
Assertions.assertEquals(SM3_HMAC_LEN, mac.length);
}

@Test
public void testNullBytes() throws Exception {
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");

Mac sm3HMac1 = Mac.getInstance("HmacSM3", PROVIDER);
sm3HMac1.init(keySpec);
sm3HMac1.update((byte[]) null);
byte[] mac1 = sm3HMac1.doFinal();
Mac hmacSM31 = Mac.getInstance("HmacSM3", PROVIDER);
hmacSM31.init(keySpec);
hmacSM31.update((byte[]) null);
byte[] mac1 = hmacSM31.doFinal();

Mac sm3HMac2 = Mac.getInstance("HmacSM3", PROVIDER);
sm3HMac2.init(keySpec);
sm3HMac2.update(new byte[0]);
byte[] mac2 = sm3HMac2.doFinal();
Mac hmacSM32 = Mac.getInstance("HmacSM3", PROVIDER);
hmacSM32.init(keySpec);
hmacSM32.update(new byte[0]);
byte[] mac2 = hmacSM32.doFinal();

Assertions.assertArrayEquals(mac1, mac2);
}

@Test
public void testByteBuffer() throws Exception {
Mac sm3HMac = Mac.getInstance("HmacSM3", PROVIDER);
Mac hmacSM3 = Mac.getInstance("HmacSM3", PROVIDER);
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");
sm3HMac.init(keySpec);
hmacSM3.init(keySpec);
ByteBuffer buffer = ByteBuffer.wrap(toBytes("616263"));
sm3HMac.update(buffer);
byte[] mac = sm3HMac.doFinal();
hmacSM3.update(buffer);
byte[] mac = hmacSM3.doFinal();
Assertions.assertEquals(SM3_HMAC_LEN, mac.length);
}

@Test
public void testNullByteBuffer() throws Exception {
Mac sm3HMac = Mac.getInstance("HmacSM3", PROVIDER);
Mac hmacSM3 = Mac.getInstance("HmacSM3", PROVIDER);
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");
sm3HMac.init(keySpec);
hmacSM3.init(keySpec);
Assertions.assertThrows(
IllegalArgumentException.class,
() -> {
sm3HMac.update((ByteBuffer) null);
hmacSM3.update((ByteBuffer) null);
});
}

@Test
public void testEmptyInput() throws Exception {
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");

Mac sm3HMac1 = Mac.getInstance("HmacSM3", PROVIDER);
sm3HMac1.init(keySpec);
sm3HMac1.update(new byte[0]);
byte[] mac1 = sm3HMac1.doFinal();
Mac hmacSM31 = Mac.getInstance("HmacSM3", PROVIDER);
hmacSM31.init(keySpec);
hmacSM31.update(new byte[0]);
byte[] mac1 = hmacSM31.doFinal();

Mac sm3HMac2 = Mac.getInstance("HmacSM3", PROVIDER);
sm3HMac2.init(keySpec);
sm3HMac2.update(ByteBuffer.wrap(new byte[0]));
byte[] mac2 = sm3HMac2.doFinal();
Mac hmacSM32 = Mac.getInstance("HmacSM3", PROVIDER);
hmacSM32.init(keySpec);
hmacSM32.update(ByteBuffer.wrap(new byte[0]));
byte[] mac2 = hmacSM32.doFinal();

Assertions.assertArrayEquals(mac1, mac2);
}
Expand All @@ -176,24 +194,24 @@ public void testEmptyInput() throws Exception {
public void testNoInput() throws Exception {
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");

Mac sm3HMac1 = Mac.getInstance("HmacSM3", PROVIDER);
sm3HMac1.init(keySpec);
byte[] mac1 = sm3HMac1.doFinal();
Mac hmacSM31 = Mac.getInstance("HmacSM3", PROVIDER);
hmacSM31.init(keySpec);
byte[] mac1 = hmacSM31.doFinal();

Mac sm3HMac2 = Mac.getInstance("HmacSM3", PROVIDER);
sm3HMac2.init(keySpec);
sm3HMac2.update(new byte[0]);
byte[] mac2 = sm3HMac2.doFinal();
Mac hmacSM32 = Mac.getInstance("HmacSM3", PROVIDER);
hmacSM32.init(keySpec);
hmacSM32.update(new byte[0]);
byte[] mac2 = hmacSM32.doFinal();

Assertions.assertArrayEquals(mac1, mac2);
}

@Test
public void testBigData() throws Exception {
Mac sm3HMac = Mac.getInstance("HmacSM3", PROVIDER);
Mac hmacSM3 = Mac.getInstance("HmacSM3", PROVIDER);
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");
sm3HMac.init(keySpec);
byte[] mac = sm3HMac.doFinal(TestUtils.dataMB(10));
hmacSM3.init(keySpec);
byte[] mac = hmacSM3.doFinal(TestUtils.dataMB(10));
Assertions.assertEquals(SM3_HMAC_LEN, mac.length);
}

Expand All @@ -202,55 +220,55 @@ public void testBigByteBuffer() throws Exception {
byte[] data = TestUtils.dataMB(10);
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");

Mac sm3HMac = Mac.getInstance("HmacSM3", PROVIDER);
sm3HMac.init(keySpec);
byte[] mac = sm3HMac.doFinal(data);
Mac hmacSM3 = Mac.getInstance("HmacSM3", PROVIDER);
hmacSM3.init(keySpec);
byte[] mac = hmacSM3.doFinal(data);

Mac sm3HMacBuffer = Mac.getInstance("HmacSM3", PROVIDER);
sm3HMacBuffer.init(keySpec);
Mac hmacSM3Buffer = Mac.getInstance("HmacSM3", PROVIDER);
hmacSM3Buffer.init(keySpec);
ByteBuffer buffer = ByteBuffer.wrap(data);
sm3HMacBuffer.update(buffer);
byte[] macBuffer = sm3HMacBuffer.doFinal();
hmacSM3Buffer.update(buffer);
byte[] macBuffer = hmacSM3Buffer.doFinal();

Assertions.assertArrayEquals(mac, macBuffer);
}

@Test
public void testSM3HMacParallelly() throws Exception {
public void testHmacSM3Parallelly() throws Exception {
TestUtils.repeatTaskParallelly(() -> {
testSM3HMac();
testHmacSM3();
return null;
});
}

@Test
public void testSM3HMacSerially() throws Exception {
public void testHmacSM3Serially() throws Exception {
TestUtils.repeatTaskSerially(() -> {
testSM3HMac();
testHmacSM3();
return null;
});
}

@Test
public void testClone() throws Exception {
Mac sm3HMac = Mac.getInstance("HmacSM3", PROVIDER);
Mac hmacSM3 = Mac.getInstance("HmacSM3", PROVIDER);
SecretKeySpec keySpec = new SecretKeySpec(KEY, "HmacSM3");
sm3HMac.init(keySpec);
hmacSM3.init(keySpec);

sm3HMac.update(MESSAGE, 0, MESSAGE.length / 3);
sm3HMac.update(MESSAGE[MESSAGE.length / 3]);
hmacSM3.update(MESSAGE, 0, MESSAGE.length / 3);
hmacSM3.update(MESSAGE[MESSAGE.length / 3]);

Mac clone = (Mac) sm3HMac.clone();
Mac clone = (Mac) hmacSM3.clone();

sm3HMac.update(MESSAGE, MESSAGE.length / 3 + 1,
hmacSM3.update(MESSAGE, MESSAGE.length / 3 + 1,
MESSAGE.length - MESSAGE.length / 3 - 2);
clone.update(MESSAGE, MESSAGE.length / 3 + 1,
MESSAGE.length - MESSAGE.length / 3 - 2);

sm3HMac.update(MESSAGE[MESSAGE.length - 1]);
hmacSM3.update(MESSAGE[MESSAGE.length - 1]);
clone.update(MESSAGE[MESSAGE.length - 1]);

byte[] mac = sm3HMac.doFinal();
byte[] mac = hmacSM3.doFinal();
byte[] macClone = clone.doFinal();

Assertions.assertArrayEquals(mac, macClone);
Expand Down
16 changes: 11 additions & 5 deletions kona-crypto/src/test/java/com/tencent/kona/crypto/provider/SM3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,19 @@ public static void setup() {

@Test
public void testKAT() throws Exception {
checkDigest(MESSAGE_SHORT, DIGEST_SHORT);
checkDigest(MESSAGE_LONG, DIGEST_LONG);
checkDigest("SM3", MESSAGE_SHORT, DIGEST_SHORT);
checkDigest("SM3", MESSAGE_LONG, DIGEST_LONG);
}

private static void checkDigest(byte[] message, byte[] expectedDigest)
throws Exception {
MessageDigest md = MessageDigest.getInstance("SM3", PROVIDER);
@Test
public void testAlias() throws Exception {
checkDigest("OID.1.2.156.10197.1.401", MESSAGE_SHORT, DIGEST_SHORT);
checkDigest("OID.1.2.156.10197.1.401", MESSAGE_LONG, DIGEST_LONG);
}

private static void checkDigest(String name, byte[] message,
byte[] expectedDigest) throws Exception {
MessageDigest md = MessageDigest.getInstance(name, PROVIDER);
byte[] digest = md.digest(message);
Assertions.assertArrayEquals(expectedDigest, digest);
}
Expand Down