Skip to content

Change serialization tests for ED-DSA so that they don't hard-code the class path. #1352

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

Merged
miguelaranda0 merged 9 commits into from
Jul 2, 2025
Merged

Change serialization tests for ED-DSA so that they don't hard-code the class path. #1352

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c77c46
Add tests for serialization for Ed25519 private and public key.
juergw Jun 26, 2025
2f154ce
Fix formatting.
juergw Jun 26, 2025
b37059f
Add missing imports.
juergw Jun 26, 2025
969b26a
Merge branch 'google:master' into other
juergw Jul 1, 2025
9562452
Merge branch 'google:master' into other
juergw Jul 2, 2025
772b702
Change serialization tests so that they don't hard-code the class path.
juergw Jul 2, 2025
ead529b
Fix format.
juergw Jul 2, 2025
d99fc12
Fix import error.
juergw Jul 2, 2025
c7cd232
Fix format.
juergw Jul 2, 2025
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
37 changes: 23 additions & 14 deletions common/src/test/java/org/conscrypt/EdDsaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
import java.security.KeyPair;
Expand Down Expand Up @@ -325,14 +326,15 @@ public void serializePrivateKey_isEqualToTestVector() throws Exception {
oos.writeObject(privateKey);
}

String expectedHexEncoding = "aced000573720024"
+ "6f72672e636f6e7363727970742e" // hex("org.conscrypt.")
+ "4f70656e53736c4564447361507269766174654b6579" // hex("OpenSslEdDsaPrivateKey")
String classNameHex = TestUtils.encodeHex(
privateKey.getClass().getName().getBytes(StandardCharsets.UTF_8));
String expectedHexEncoding = "aced000573720024" + classNameHex
+ "d479f95a133abadc" // serialVersionUID
+ "0200015b000f"
+ "707269766174654b65794279746573" // hex("privateKeyBytes")
+ "7400025b427870757200025b42acf317f8060854e0020000787000000020"
+ "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60"; // private key
+ "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60"; // private
// key
assertEquals(expectedHexEncoding, TestUtils.encodeHex(baos.toByteArray()));
}

Expand All @@ -353,22 +355,26 @@ public void serializePublicKey_isEqualToTestVector() throws Exception {
oos.writeObject(publicKey);
}

String expectedHexEncoding = "aced000573720023"
+ "6f72672e636f6e7363727970742e" // hex("org.conscrypt.")
+ "4f70656e53736c45644473615075626c69634b6579" // hex("OpenSslEdDsaPublicKey")
String classNameHex = TestUtils.encodeHex(
publicKey.getClass().getName().getBytes(StandardCharsets.UTF_8));
String expectedHexEncoding = "aced000573720023" + classNameHex
+ "064c7113d078e42d" // serialVersionUID
+ "0200015b000e"
+ "7075626c69634b65794279746573" // hex("publicKeyBytes")
+ "7400025b427870757200025b42acf317f8060854e0020000787000000020"
+ "d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a"; // public key
+ "d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a"; // public
// key
assertEquals(expectedHexEncoding, TestUtils.encodeHex(baos.toByteArray()));
}

@Test
public void deserializeInvalidPrivateKey_fails() throws Exception {
String invalidPrivateKeySerialized = "aced000573720024"
+ "6f72672e636f6e7363727970742e" // hex("org.conscrypt.")
+ "4f70656e53736c4564447361507269766174654b6579" // hex("OpenSslEdDsaPrivateKey")
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("Ed25519", conscryptProvider);
KeyPair keyPair = keyGen.generateKeyPair();
String classNameHex = TestUtils.encodeHex(
keyPair.getPrivate().getClass().getName().getBytes(StandardCharsets.UTF_8));

String invalidPrivateKeySerialized = "aced000573720024" + classNameHex
+ "d479f95a133abadc" // serialVersionUID
+ "0200015b000f"
+ "707269766174654b65794279746573" // hex("privateKeyBytes")
Expand All @@ -389,9 +395,12 @@ public void deserializeInvalidPrivateKey_fails() throws Exception {

@Test
public void deserializeInvalidPublicKey_fails() throws Exception {
String invalidPublicKeySerialized = "aced000573720023"
+ "6f72672e636f6e7363727970742e" // hex("org.conscrypt.")
+ "4f70656e53736c45644473615075626c69634b6579" // hex("OpenSslEdDsaPublicKey")
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("Ed25519", conscryptProvider);
KeyPair keyPair = keyGen.generateKeyPair();
String classNameHex = TestUtils.encodeHex(
keyPair.getPublic().getClass().getName().getBytes(StandardCharsets.UTF_8));

String invalidPublicKeySerialized = "aced000573720023" + classNameHex
+ "064c7113d078e42d" // serialVersionUID
+ "0200015b000e"
+ "7075626c69634b65794279746573" // hex("publicKeyBytes")
Expand Down
Loading