From 140deb0669e05163d7d614fd91926d5ff3ff01d3 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Thu, 14 Sep 2023 11:26:41 -0700 Subject: [PATCH] PBKDF2SHA512: move dkLen check out of try/catch It throws an exception so doesn't need an if/else and it also doesn't need to be in the try. --- .../java/org/bitcoinj/crypto/PBKDF2SHA512.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java b/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java index 2a0e9eddc..4b95b5824 100644 --- a/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java +++ b/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java @@ -43,17 +43,16 @@ public class PBKDF2SHA512 { public static byte[] derive(String P, String S, int c, int dkLen) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); + if (dkLen > ((Math.pow(2, 32)) - 1) * H_LEN) { + throw new IllegalArgumentException("derived key too long"); + } try { - if (dkLen > ((Math.pow(2, 32)) - 1) * H_LEN) { - throw new IllegalArgumentException("derived key too long"); - } else { - int l = (int) Math.ceil((double) dkLen / (double) H_LEN); - // int r = dkLen - (l-1)*hLen; + int l = (int) Math.ceil((double) dkLen / (double) H_LEN); + // int r = dkLen - (l-1)*hLen; - for (int i = 1; i <= l; i++) { - byte[] T = F(P, S, c, i); - baos.write(T); - } + for (int i = 1; i <= l; i++) { + byte[] T = F(P, S, c, i); + baos.write(T); } } catch (Exception e) { throw new RuntimeException(e);