Use FingerprintUtil for deriving key-ID from fingerprint

Author: vanitasvitae

pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java

@@ -74,15 +74,7 @@ else if (version == VERSION_6)
             fingerprint = new byte[32];
             in.readFully(fingerprint);
 
-            // TODO: Replace with FingerprintUtil
-            keyID = ((fingerprint[0] & 0xffL) << 56) |
-                    ((fingerprint[1] & 0xffL) << 48) |
-                    ((fingerprint[2] & 0xffL) << 40) |
-                    ((fingerprint[3] & 0xffL) << 32) |
-                    ((fingerprint[4] & 0xffL) << 24) |
-                    ((fingerprint[5] & 0xffL) << 16) |
-                    ((fingerprint[6] & 0xffL) << 8) |
-                    ((fingerprint[7] & 0xffL));
+            keyID = FingerprintUtil.keyIdFromV6Fingerprint(fingerprint);
         }
         else
         {
@@ -154,15 +146,7 @@ public OnePassSignaturePacket(
         this.salt = salt;
         this.fingerprint = fingerprint;
         this.isContaining = (isNested) ? 0 : 1;
-        // TODO: Replace with FingerprintUtil
-        keyID = ((fingerprint[0] & 0xffL) << 56) |
-                ((fingerprint[1] & 0xffL) << 48) |
-                ((fingerprint[2] & 0xffL) << 40) |
-                ((fingerprint[3] & 0xffL) << 32) |
-                ((fingerprint[4] & 0xffL) << 24) |
-                ((fingerprint[5] & 0xffL) << 16) |
-                ((fingerprint[6] & 0xffL) << 8) |
-                ((fingerprint[7] & 0xffL));
+        keyID = FingerprintUtil.keyIdFromV6Fingerprint(fingerprint);
     }
 
     /**