From daa2c1ccaa62d1711fec154853ff1b91eeef5b35 Mon Sep 17 00:00:00 2001 From: aar Date: Fri, 6 Oct 2023 14:57:32 +0530 Subject: [PATCH] Accepting hmac key of all sizes --- .../org/shredzone/acme4j/toolbox/JoseUtils.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JoseUtils.java b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JoseUtils.java index 8f1c22d0..23056774 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JoseUtils.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/toolbox/JoseUtils.java @@ -245,16 +245,15 @@ public final class JoseUtils { } var size = macKey.getEncoded().length * 8; - if (size >= 256) { - if (size >= 512) { - return AlgorithmIdentifiers.HMAC_SHA512; - } else if (size >= 384) { - return AlgorithmIdentifiers.HMAC_SHA384; - } else { - return AlgorithmIdentifiers.HMAC_SHA256; - } - } else { + if(size < 256) { throw new IllegalArgumentException("Bad key size: " + size); } + if (size >= 512) { + return AlgorithmIdentifiers.HMAC_SHA512; + } else if (size >= 384) { + return AlgorithmIdentifiers.HMAC_SHA384; + } else { + return AlgorithmIdentifiers.HMAC_SHA256; + } } }