1 files changed, 12 insertions, 8 deletions

diff --git a/Data/OpenPGP/Util/Fingerprint.hs b/Data/OpenPGP/Util/Fingerprint.hs
index d88661b..cda25f6 100644
--- a/Data/OpenPGP/Util/Fingerprint.hs
+++ b/Data/OpenPGP/Util/Fingerprint.hs
@@ -1,11 +1,12 @@
 {-# LANGUAGE CPP #-}
-module Data.OpenPGP.Util.Fingerprint (fingerprint,Fingerprint(..),hex) where
+module Data.OpenPGP.Util.Fingerprint (fingerprint,fingerprintv,Fingerprint(..),hex) where
 
 import qualified Data.OpenPGP as OpenPGP
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as LZ
 import Data.Char (toUpper)
 import Data.Word (Word8)
+import GHC.Stack
 import Numeric (showHex)
 
 #if defined(VERSION_cryptonite)
@@ -39,12 +40,15 @@ hex (Fingerprint bs) = hexify bs
 
 -- | Generate a key fingerprint from a PublicKeyPacket or SecretKeyPacket
 -- <http://tools.ietf.org/html/rfc4880#section-12.2>
-fingerprint :: OpenPGP.Packet -> Fingerprint
-fingerprint p
-    | OpenPGP.version p == 5 = Fingerprint $ sha256 material
-    | OpenPGP.version p == 4 = Fingerprint $ sha1 material
-    | OpenPGP.version p `elem` [2, 3] = Fingerprint $ md5 material
-    | otherwise = error "Unsupported Packet version or type in fingerprint"
+fingerprint :: HasCallStack => OpenPGP.Packet -> Fingerprint
+fingerprint p = fingerprintv (OpenPGP.auto_fp_version p) p
+
+fingerprintv :: HasCallStack => Word8 -> OpenPGP.Packet -> Fingerprint
+fingerprintv v p = case v of
+    5 -> Fingerprint $ sha256 material
+    4 -> Fingerprint $ sha1 material
+    3 -> Fingerprint $ md5 material
+    _ -> error "Unsupported Packet version or type in fingerprint"
     where
 
 #if defined(VERSION_cryptonite)
@@ -57,4 +61,4 @@ fingerprint p
     md5 = MD5.hashlazy
 #endif
 
-    material = LZ.concat $ OpenPGP.fingerprint_material p
+    material = LZ.concat $ OpenPGP.fingerprint_materialv v p