Move HashUtils class out to #1637

bcgit · Apr 24, 2024 · 96dce35 · 96dce35
1 parent c7926d2
commit 96dce35
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 54 deletions.
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/HashUtils.java b/pg/src/main/java/org/bouncycastle/bcpg/HashUtils.java
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java b/pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java
@@ -131,7 +131,6 @@ public OnePassSignaturePacket(
      * @param hashAlgorithm hash algorithm tag
      * @param keyAlgorithm public key algorithm tag
      * @param salt random salt. The length of this array depends on the hash algorithm in use.
-     *             See {@link HashUtils#getV6SignatureSaltSizeInBytes(int)}.
      * @param fingerprint 32 octet fingerprint of the (v6) signing key
      * @param isNested if false, there is another OPS packet after this one, which applies to the same data.
      *                 it true, the corresponding signature is calculated also over succeeding additional OPS packets.

diff --git a/pg/src/test/java/org/bouncycastle/bcpg/test/OnePassSignaturePacketTest.java b/pg/src/test/java/org/bouncycastle/bcpg/test/OnePassSignaturePacketTest.java
@@ -106,7 +106,7 @@ private void roundtripV3Packet() throws IOException {
     }
 
     private void roundtripV6Packet() throws IOException {
-        byte[] salt = new byte[HashUtils.getV6SignatureSaltSizeInBytes(HashAlgorithmTags.SHA512)];
+        byte[] salt = new byte[32];
         byte[] fingerprint = Hex.decode("CB186C4F0609A697E4D52DFA6C722B0C1F1E27C18A56708F6525EC27BAD9ACC9");
         long keyID = ((fingerprint[0] & 0xffL) << 56) |
                         ((fingerprint[1] & 0xffL) << 48) |