From fe52a7f398b0efb4f109633f04d338191ade8f58 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 17 Aug 2018 17:28:17 +0200
Subject: [PATCH] Fix OpenPgpV4Fingerprint.getKeyId()

---
 .../org/pgpainless/key/OpenPgpV4Fingerprint.java | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java b/pgpainless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java
index f051d086..3ddeef90 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/OpenPgpV4Fingerprint.java
@@ -16,10 +16,8 @@
 package org.pgpainless.key;
 
 import javax.annotation.Nonnull;
-import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
-import java.util.Arrays;
 
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
@@ -89,17 +87,11 @@ public class OpenPgpV4Fingerprint implements CharSequence, Comparable<OpenPgpV4F
      * @return key id
      */
     public long getKeyId() {
+        byte[] bytes = Hex.decode(toString().getBytes(Charset.forName("UTF-8")));
+        ByteBuffer buf = ByteBuffer.wrap(bytes);
+        buf.position(12);
+        return buf.getLong();
 
-        byte[] bytes = new BigInteger(toString(), 16).toByteArray();
-        if (bytes.length != toString().length() / 2) {
-            bytes = Arrays.copyOfRange(bytes, 1, bytes.length);
-        }
-
-        byte[] lower8Bytes = Arrays.copyOfRange(bytes, 12, 20);
-        ByteBuffer byteBuffer = ByteBuffer.allocate(8);
-        byteBuffer.put(lower8Bytes);
-        byteBuffer.flip();
-        return byteBuffer.getLong();
     }
 
     @Override