Skip to content

Fix: Replace IllegalArgumentException with GeneralSecurityException in HpkePrimitiveFactory #1

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
LuisCastellanos-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Replace IllegalArgumentException with GeneralSecurityException in HpkePrimitiveFactory #1

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
16 changes: 8 additions & 8 deletions src/main/java/com/google/crypto/tink/hybrid/internal/HpkePrimitiveFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static HpkeKem createKem(byte[] kemId) throws GeneralSecurityException {
} else if (Arrays.equals(kemId, HpkeUtil.P521_HKDF_SHA512_KEM_ID)) {
return NistCurvesHpkeKem.fromCurve(EllipticCurves.CurveType.NIST_P521);
}
throw new IllegalArgumentException("Unrecognized HPKE KEM identifier");
throw new GeneralSecurityException("Unrecognized HPKE KEM identifier");
}

/** Returns an {@link HpkeKem} primitive corresponding to {@code kemId}. */
Expand All @@ -51,31 +51,31 @@ public static HpkeKem createKem(HpkeParameters.KemId kemId) throws GeneralSecuri
} else if (kemId == HpkeParameters.KemId.DHKEM_P521_HKDF_SHA512) {
return NistCurvesHpkeKem.fromCurve(EllipticCurves.CurveType.NIST_P521);
}
throw new IllegalArgumentException("Unrecognized HPKE KEM identifier");
throw new GeneralSecurityException("Unrecognized HPKE KEM identifier");
}

/** Returns an {@link HpkeKdf} primitive corresponding to {@code kdfId}. */
public static HpkeKdf createKdf(byte[] kdfId) {
public static HpkeKdf createKdf(byte[] kdfId) throws GeneralSecurityException {
if (Arrays.equals(kdfId, HpkeUtil.HKDF_SHA256_KDF_ID)) {
return new HkdfHpkeKdf("HmacSha256");
} else if (Arrays.equals(kdfId, HpkeUtil.HKDF_SHA384_KDF_ID)) {
return new HkdfHpkeKdf("HmacSha384");
} else if (Arrays.equals(kdfId, HpkeUtil.HKDF_SHA512_KDF_ID)) {
return new HkdfHpkeKdf("HmacSha512");
}
throw new IllegalArgumentException("Unrecognized HPKE KDF identifier");
throw new GeneralSecurityException("Unrecognized HPKE KDF identifier");
}

/** Returns an {@link HpkeKdf} primitive corresponding to {@code kdfId}. */
public static HpkeKdf createKdf(HpkeParameters.KdfId kdfId) {
public static HpkeKdf createKdf(HpkeParameters.KdfId kdfId) throws GeneralSecurityException {
if (kdfId == HpkeParameters.KdfId.HKDF_SHA256) {
return new HkdfHpkeKdf("HmacSha256");
} else if (kdfId == HpkeParameters.KdfId.HKDF_SHA384) {
return new HkdfHpkeKdf("HmacSha384");
} else if (kdfId == HpkeParameters.KdfId.HKDF_SHA512) {
return new HkdfHpkeKdf("HmacSha512");
}
throw new IllegalArgumentException("Unrecognized HPKE KDF identifier");
throw new GeneralSecurityException("Unrecognized HPKE KDF identifier");
}

/** Returns an {@link HpkeAead} primitive corresponding to {@code aeadId}. */
Expand All @@ -87,7 +87,7 @@ public static HpkeAead createAead(byte[] aeadId) throws GeneralSecurityException
} else if (Arrays.equals(aeadId, HpkeUtil.CHACHA20_POLY1305_AEAD_ID)) {
return new ChaCha20Poly1305HpkeAead();
}
throw new IllegalArgumentException("Unrecognized HPKE AEAD identifier");
throw new GeneralSecurityException("Unrecognized HPKE AEAD identifier");
}

/** Returns an {@link HpkeAead} primitive corresponding to {@code aeadId}. */
Expand All @@ -99,7 +99,7 @@ public static HpkeAead createAead(HpkeParameters.AeadId aeadId) throws GeneralSe
} else if (aeadId == HpkeParameters.AeadId.CHACHA20_POLY1305) {
return new ChaCha20Poly1305HpkeAead();
}
throw new IllegalArgumentException("Unrecognized HPKE AEAD identifier");
throw new GeneralSecurityException("Unrecognized HPKE AEAD identifier");
}

private HpkePrimitiveFactory() {}
Expand Down
8 changes: 5 additions & 3 deletions src/test/java/com/google/crypto/tink/hybrid/internal/HpkePrimitiveFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import static org.junit.Assert.assertThrows;

import java.security.GeneralSecurityException;

import com.google.common.truth.Expect;
import com.google.crypto.tink.hybrid.HpkeParameters;
import org.junit.Rule;
Expand Down Expand Up @@ -147,7 +149,7 @@ public void createKem_fromInvalidKemBytesId_fails() {
byte[] invalidKemId = new byte[] {0, 0};

assertThrows(
IllegalArgumentException.class, () -> HpkePrimitiveFactory.createKem(invalidKemId));
GeneralSecurityException.class, () -> HpkePrimitiveFactory.createKem(invalidKemId));
}

@Theory
Expand All @@ -173,7 +175,7 @@ public void createKdf_fromInvalidKdfBytesId_fails() {
byte[] invalidKdfId = new byte[] {0, 0};

assertThrows(
IllegalArgumentException.class, () -> HpkePrimitiveFactory.createKdf(invalidKdfId));
GeneralSecurityException.class, () -> HpkePrimitiveFactory.createKdf(invalidKdfId));
}

@Theory
Expand Down Expand Up @@ -201,7 +203,7 @@ public void createAead_fromInvalidAeadBytesId_fails() {
byte[] invalidAeadId = new byte[] {0, 0};

assertThrows(
IllegalArgumentException.class, () -> HpkePrimitiveFactory.createAead(invalidAeadId));
GeneralSecurityException.class, () -> HpkePrimitiveFactory.createAead(invalidAeadId));
}

@Theory
Expand Down