1 files changed, 10 insertions, 3 deletions

diff --git a/lib/KeyDB.hs b/lib/KeyDB.hs
index fc20b91..f785f8e 100644
--- a/lib/KeyDB.hs
+++ b/lib/KeyDB.hs
@@ -76,11 +76,18 @@ fingerprintGrip (Fingerprint bs) =
     -- -- The above was removed because Int is encoded as 8 bytes even when we are
     -- -- using 32-bit GHC.
     -- Presumably, the extra 4 bytes will be truncated.
-    case decode $ L.fromStrict $ S.drop (S.length bs - 8) bs of
-        i -> KeyInt i
+    case S.length bs of
+        -- v5 from the front
+        32 -> case decode $ L.fromStrict bs of
+            i -> KeyInt i
+        -- v4 from the back
+        l -> case decode $ L.fromStrict $ S.drop (l - 8) bs of
+            i -> KeyInt i
 
 smallprGrip :: String -> Maybe KeyGrip
-smallprGrip pr = KeyInt <$> readMaybe ("0x" ++ drop (length pr - 2 * sizeOf (0::Int)) pr)
+smallprGrip pr = case length pr of
+    64 -> KeyInt <$> readMaybe ("0x" ++ take (2 * sizeOf (0::Int)) pr)
+    l  -> KeyInt <$> readMaybe ("0x" ++ drop (l - 2 * sizeOf (0::Int)) pr)
 
 data KeyDB = KeyDB
     { byKeyKey :: Map.Map KeyKey KeyData