mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-10 09:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

PBKDF2SHA512: declare/catch specific exceptions

Browse source 
Make it more clear which exceptions are thrown by `F` and caught by
the `try` in `derive()`.
This commit is contained in:
Sean Gilligan 2023-09-14 11:35:29 -07:00 • committed by Andreas Schildbach
parent ee23c2d6ff
commit 5a11957eb3
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java
View file

@ -28,9 +28,12 @@ import org.bitcoinj.base.internal.Preconditions;
import javax.crypto.Mac; import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
/** /**
* This is a clean-room implementation of PBKDF2 using RFC 2898 as a reference. * This is a clean-room implementation of PBKDF2 using RFC 2898 as a reference.
@ -58,7 +61,7 @@ public class PBKDF2SHA512 {
byte[] T = F(P, S, c, i); byte[] T = F(P, S, c, i);
baos.write(T); baos.write(T);
} }
} catch (Exception e) { } catch (IOException | NoSuchAlgorithmException | InvalidKeyException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -68,7 +71,7 @@ public class PBKDF2SHA512 {
return baDerived; return baDerived;
} }
private static byte[] F(String P, String S, int c, int i) throws Exception { private static byte[] F(String P, String S, int c, int i) throws NoSuchAlgorithmException, InvalidKeyException {
byte[] U_LAST = null; byte[] U_LAST = null;
byte[] U_XOR = null; byte[] U_XOR = null;