1 files changed, 8 insertions, 5 deletions

diff --git a/lib/Transforms.hs b/lib/Transforms.hs
index 6250dea..118b494 100644
--- a/lib/Transforms.hs
+++ b/lib/Transforms.hs
@@ -340,13 +340,13 @@ accBindings bs = as
 
 sigpackets ::
   Monad m =>
-  Word8 -> [SignatureSubpacket] -> [SignatureSubpacket] -> m Packet
-sigpackets typ hashed unhashed = return $
+  Word8 -> KeyAlgorithm -> [SignatureSubpacket] -> [SignatureSubpacket] -> m Packet
+sigpackets typ alg hashed unhashed = return $
     signaturePacket
         4 -- version
         typ -- 0x18 subkey binding sig, or 0x19 back-signature
-        RSA
-        SHA1
+        alg
+        SHA256
         hashed
         unhashed
         0 -- Word16 -- Left 16 bits of the signed hash value
@@ -409,6 +409,7 @@ makeInducerSig topk wkun uid extras
     = CertificationSignature (secretToPublic topk)
                              uid
                              (sigpackets 0x13
+                                         (key_algorithm wkun)
                                          subpackets
                                          subpackets_unh)
    where
@@ -578,6 +579,7 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
                         (SubkeySignature wk
                                          (head parsedkey)
                                          (sigpackets 0x19
+                                                     (key_algorithm $ head parsedkey)
                                                      hashed0
                                                      [IssuerPacket subgrip]))
                         SHA256
@@ -590,6 +592,7 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
                        (SubkeySignature wk
                                         (head parsedkey)
                                         (sigpackets 0x18
+                                                   (key_algorithm wkun)
                                                    hashed0
                                                    unhashed0))
                       SHA256
@@ -636,7 +639,7 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
 candidateSignerKeys :: KeyDB -> Packet -> [Packet]
 candidateSignerKeys db sig =
     case issuerGrip sig of
-        Just g -> concatMap (map packet . associatedKeys) $ lookupByGrip g db
+        Just g -> concatMap (map packet . associatedKeys . snd) $ lookupByGrip g db
         _      -> map keyPacket $ keyData db
 
 issuerGrip :: Packet -> Maybe KeyGrip