summaryrefslogtreecommitdiffstats
path: root/security-utils/src/main/java/com/yahoo/security/hpke
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2022-12-01 12:55:17 +0100
committerTor Brede Vekterli <vekterli@yahooinc.com>2022-12-01 12:55:17 +0100
commit3c336179c9a2ed3bc50265adf823fd4d0d257909 (patch)
treec50a1b6e04fd82c70aa64b4508deca9ff4968752 /security-utils/src/main/java/com/yahoo/security/hpke
parentced78a22d4eb39927845db9a2446b988ba1f5802 (diff)
Correct class name to reflect actual cipher name order
No functional changes, just bugged me to have used the wrong order.
Diffstat (limited to 'security-utils/src/main/java/com/yahoo/security/hpke')
-rw-r--r--security-utils/src/main/java/com/yahoo/security/hpke/Aead.java4
-rw-r--r--security-utils/src/main/java/com/yahoo/security/hpke/Aes128Gcm.java (renamed from security-utils/src/main/java/com/yahoo/security/hpke/AesGcm128.java)6
-rw-r--r--security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/hpke/Aead.java b/security-utils/src/main/java/com/yahoo/security/hpke/Aead.java
index 48662d97bb3..d105dd534f0 100644
--- a/security-utils/src/main/java/com/yahoo/security/hpke/Aead.java
+++ b/security-utils/src/main/java/com/yahoo/security/hpke/Aead.java
@@ -35,8 +35,8 @@ public interface Aead {
/** Predefined AEAD ID, as given in RFC 9180 section 7.3 */
short aeadId();
- static Aead aesGcm128() {
- return AesGcm128.getInstance();
+ static Aead aes128Gcm() {
+ return Aes128Gcm.getInstance();
}
}
diff --git a/security-utils/src/main/java/com/yahoo/security/hpke/AesGcm128.java b/security-utils/src/main/java/com/yahoo/security/hpke/Aes128Gcm.java
index 9ccc7d51de9..9283c2b1657 100644
--- a/security-utils/src/main/java/com/yahoo/security/hpke/AesGcm128.java
+++ b/security-utils/src/main/java/com/yahoo/security/hpke/Aes128Gcm.java
@@ -16,13 +16,13 @@ import java.security.NoSuchAlgorithmException;
*
* @author vekterli
*/
-final class AesGcm128 implements Aead {
+final class Aes128Gcm implements Aead {
private static final String AEAD_CIPHER_SPEC = "AES/GCM/NoPadding";
- private static final AesGcm128 INSTANCE = new AesGcm128();
+ private static final Aes128Gcm INSTANCE = new Aes128Gcm();
- public static AesGcm128 getInstance() { return INSTANCE; }
+ public static Aes128Gcm getInstance() { return INSTANCE; }
/**
* @param key Symmetric key bytes for encryption/decryption
diff --git a/security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java b/security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java
index f18753c810e..a2b3ebec9a3 100644
--- a/security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java
+++ b/security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java
@@ -22,7 +22,7 @@ public record Ciphersuite(Kem kem, Kdf kdf, Aead aead) {
* Returns a Ciphersuite of DHKEM(X25519, HKDF-SHA256), HKDF-SHA256, AES-128-GCM
*/
public static Ciphersuite defaultSuite() {
- return Ciphersuite.of(Kem.dHKemX25519HkdfSha256(), Kdf.hkdfSha256(), Aead.aesGcm128());
+ return Ciphersuite.of(Kem.dHKemX25519HkdfSha256(), Kdf.hkdfSha256(), Aead.aes128Gcm());
}
}