Egothor/ZeroEcho
2
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects 1 Releases 4 Wiki Activity

chore: extract shared classic-leg wiring in HybridKexBuilder

Browse Source 
Extract duplicated classic-leg construction from
HybridKexBuilder.buildInitiator() and buildResponder()
into a private buildClassicLeg() helper with JavaDoc.

This keeps classic mode validation and context creation
in one place, reduces asymmetry risk between initiator
and responder paths, and preserves existing behavior.

Closes #18 spent @30m
This commit is contained in:
Leo Galambos
2026-04-05 22:56:47 +02:00
parent 14fbf31989
commit e74e833c5b
2 changed files with 510 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
lib/src/main/java/zeroecho/sdk/builders/HybridKexBuilder.java
View File

@@ -232,6 +232,43 @@ public final class HybridKexBuilder {
return new PqcKem(this);
}
/**
* Builds the configured classic agreement leg for the current builder state.
*
* <p>
* This method validates the classic-leg inputs required by the selected
* {@link ClassicMode} and returns the resulting {@link AgreementContext} ready
* for inclusion into a {@link HybridKexContext}. For
* {@link ClassicMode#CLASSIC_AGREEMENT}, the returned context is also bound to
* the configured peer public key.
* </p>
*
* @return classic agreement context derived from the configured classic-leg
* state
* @throws IOException if underlying context creation fails
* @throws IllegalStateException if the selected classic mode is missing
* required state
*/
private AgreementContext buildClassicLeg() throws IOException {
if (classicMode == ClassicMode.CLASSIC_AGREEMENT) {
if (classicPrivate == null || classicPeerPublic == null) {
throw new IllegalStateException(
"classic private key and peer public must be set for CLASSIC_AGREEMENT");
}
AgreementContext classic = CryptoAlgorithms.create(classicAlgId, KeyUsage.AGREEMENT, classicPrivate,
classicSpec);
classic.setPeerPublic(classicPeerPublic);
return classic;
}
if (classicMode == ClassicMode.PAIR_MESSAGE) {
if (classicKeyPair == null) {
throw new IllegalStateException("classic key pair must be set for PAIR_MESSAGE");
}
return CryptoAlgorithms.create(classicAlgId, KeyUsage.AGREEMENT, classicKeyPair, classicSpec);
}
throw new IllegalStateException("classic mode must be selected");
}
/**
* Builds initiator-side context.
*
@@ -241,22 +278,7 @@ public final class HybridKexBuilder {
public HybridKexContext buildInitiator() throws IOException {
validateCommon();
AgreementContext classic;
if (classicMode == ClassicMode.CLASSIC_AGREEMENT) {
if (classicPrivate == null || classicPeerPublic == null) {
throw new IllegalStateException(
"classic private key and peer public must be set for CLASSIC_AGREEMENT");
}
classic = CryptoAlgorithms.create(classicAlgId, KeyUsage.AGREEMENT, classicPrivate, classicSpec);
classic.setPeerPublic(classicPeerPublic);
} else if (classicMode == ClassicMode.PAIR_MESSAGE) {
if (classicKeyPair == null) {
throw new IllegalStateException("classic key pair must be set for PAIR_MESSAGE");
}
classic = CryptoAlgorithms.create(classicAlgId, KeyUsage.AGREEMENT, classicKeyPair, classicSpec);
} else {
throw new IllegalStateException("classic mode must be selected");
}
AgreementContext classic = buildClassicLeg();
if (pqcPeerPublic == null) {
throw new IllegalStateException("pqc peer public must be set for initiator");
@@ -279,22 +301,7 @@ public final class HybridKexBuilder {
public HybridKexContext buildResponder() throws IOException {
validateCommon();
AgreementContext classic;
if (classicMode == ClassicMode.CLASSIC_AGREEMENT) {
if (classicPrivate == null || classicPeerPublic == null) {
throw new IllegalStateException(
"classic private key and peer public must be set for CLASSIC_AGREEMENT");
}
classic = CryptoAlgorithms.create(classicAlgId, KeyUsage.AGREEMENT, classicPrivate, classicSpec);
classic.setPeerPublic(classicPeerPublic);
} else if (classicMode == ClassicMode.PAIR_MESSAGE) {
if (classicKeyPair == null) {
throw new IllegalStateException("classic key pair must be set for PAIR_MESSAGE");
}
classic = CryptoAlgorithms.create(classicAlgId, KeyUsage.AGREEMENT, classicKeyPair, classicSpec);
} else {
throw new IllegalStateException("classic mode must be selected");
}
AgreementContext classic = buildClassicLeg();
if (pqcPrivate == null) {
throw new IllegalStateException("pqc private key must be set for responder");