1 files changed, 12 insertions, 9 deletions

diff --git a/lib/Transforms.hs b/lib/Transforms.hs
index 473ecbc..261d7f0 100644
--- a/lib/Transforms.hs
+++ b/lib/Transforms.hs
@@ -341,10 +341,10 @@ accBindings bs = as
 
 sigpackets ::
   Monad m =>
-  Word8 -> KeyAlgorithm -> [SignatureSubpacket] -> [SignatureSubpacket] -> m Packet
-sigpackets typ alg hashed unhashed = return $
+  Word8 -> Word8 -> KeyAlgorithm -> [SignatureSubpacket] -> [SignatureSubpacket] -> m Packet
+sigpackets pgpver typ alg hashed unhashed = return $
     signaturePacket
-        4 -- version
+        pgpver -- version
         typ -- 0x18 subkey binding sig, or 0x19 back-signature
         alg
         SHA256
@@ -409,7 +409,8 @@ makeInducerSig
 makeInducerSig topk wkun uid extras
     = CertificationSignature (secretToPublic topk)
                              uid
-                             (sigpackets 0x13
+                             (sigpackets (version wkun)
+                                         0x13
                                          (key_algorithm wkun)
                                          subpackets
                                          subpackets_unh)
@@ -577,7 +578,8 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
     back_sig <- pgpSign (Message parsedkey)
                         (SubkeySignature wk
                                          (head parsedkey)
-                                         (sigpackets 0x19
+                                         (sigpackets (version $ head parsedkey)
+                                                     0x19
                                                      (key_algorithm $ head parsedkey)
                                                      hashed0
                                                      [IssuerPacket subgrip]))
@@ -590,10 +592,11 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
     new_sig <- pgpSign (Message [wkun])
                        (SubkeySignature wk
                                         (head parsedkey)
-                                        (sigpackets 0x18
-                                                   (key_algorithm wkun)
-                                                   hashed0
-                                                   unhashed0))
+                                        (sigpackets (version wkun)
+                                                    0x18
+                                                    (key_algorithm wkun)
+                                                    hashed0
+                                                    unhashed0))
                       SHA256
                       grip
     let newSig = do