Skip to content

test: exercise SPHINCS+ OID round-trip for -simple variants #2345

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

Open
major wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −16
Open

test: exercise SPHINCS+ OID round-trip for -simple variants #2345

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
17 changes: 9 additions & 8 deletions core/src/test/java/org/bouncycastle/pqc/crypto/test/SphincsPlusTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,15 @@ else if (simple)
SPHINCSPlusPublicKeyParameters pubParams = (SPHINCSPlusPublicKeyParameters)kp.getPublic();
SPHINCSPlusPrivateKeyParameters privParams = (SPHINCSPlusPrivateKeyParameters)kp.getPrivate();

// FIXME No OIDs for simple variants of SPHINCS+
if (name.indexOf("-simple") < 0)
{
pubParams = (SPHINCSPlusPublicKeyParameters)PublicKeyFactory.createKey(
SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(pubParams));
privParams = (SPHINCSPlusPrivateKeyParameters)PrivateKeyFactory.createKey(
PrivateKeyInfoFactory.createPrivateKeyInfo(privParams));
}
// OID encode/decode round-trip runs for all variants including "-simple"
// (OIDs for simple variants were wired correctly; the former FIXME guard was stale).
// The getParameters() assertions below catch any future OID<->parameters mapping regression.
pubParams = (SPHINCSPlusPublicKeyParameters)PublicKeyFactory.createKey(
SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(pubParams));
privParams = (SPHINCSPlusPrivateKeyParameters)PrivateKeyFactory.createKey(
PrivateKeyInfoFactory.createPrivateKeyInfo(privParams));
assertTrue(name + " " + count + ": public key parameters", parameters == pubParams.getParameters());
assertTrue(name + " " + count + ": private key parameters", parameters == privParams.getParameters());

// System.err.println(Hex.toHexString(pubParams.getEncoded()));
// System.err.println(Hex.toHexString(Arrays.concatenate(pubParams.getParameters().getEncoded(), pk)));
Expand Down
17 changes: 9 additions & 8 deletions core/src/test/jdk1.3/org/bouncycastle/pqc/crypto/test/SphincsPlusTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,15 @@ else if (simple)
SPHINCSPlusPublicKeyParameters pubParams = (SPHINCSPlusPublicKeyParameters)kp.getPublic();
SPHINCSPlusPrivateKeyParameters privParams = (SPHINCSPlusPrivateKeyParameters)kp.getPrivate();

// FIXME No OIDs for simple variants of SPHINCS+
if (name.indexOf("-simple") < 0)
{
pubParams = (SPHINCSPlusPublicKeyParameters)PublicKeyFactory.createKey(
SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(pubParams));
privParams = (SPHINCSPlusPrivateKeyParameters)PrivateKeyFactory.createKey(
PrivateKeyInfoFactory.createPrivateKeyInfo(privParams));
}
// OID encode/decode round-trip runs for all variants including "-simple"
// (OIDs for simple variants were wired correctly; the former FIXME guard was stale).
// The getParameters() assertions below catch any future OID<->parameters mapping regression.
pubParams = (SPHINCSPlusPublicKeyParameters)PublicKeyFactory.createKey(
SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(pubParams));
privParams = (SPHINCSPlusPrivateKeyParameters)PrivateKeyFactory.createKey(
PrivateKeyInfoFactory.createPrivateKeyInfo(privParams));
assertTrue(name + " " + count + ": public key parameters", parameters == pubParams.getParameters());
assertTrue(name + " " + count + ": private key parameters", parameters == privParams.getParameters());

// System.err.println(Hex.toHexString(pubParams.getEncoded()));
// System.err.println(Hex.toHexString(Arrays.concatenate(pubParams.getParameters().getEncoded(), pk)));
Expand Down