Fix EmbeddedSignaturePacket

3 files changed, 3 insertions, 2 deletions

diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index d6da9de..12bef74 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -887,7 +887,7 @@ put_signature_subpacket (FeaturesPacket supports_mdc) =
 put_signature_subpacket (SignatureTargetPacket kalgo halgo hash) =
         (B.concat [encode kalgo, encode halgo, hash], 31)
 put_signature_subpacket (EmbeddedSignaturePacket packet) =
-        (encode (assertProp isSignaturePacket packet), 32)
+        (fst $ put_packet (assertProp isSignaturePacket packet), 32)
 put_signature_subpacket (UnsupportedSignatureSubpacket tag bytes) =
         (bytes, tag)
 
@@ -1002,7 +1002,7 @@ parse_signature_subpacket 31 =
         liftM3 SignatureTargetPacket get get getRemainingByteString
 -- EmbeddedSignaturePacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.26
 parse_signature_subpacket 32 =
-        fmap (EmbeddedSignaturePacket . forceSignature) get
+        fmap (EmbeddedSignaturePacket . forceSignature) (parse_packet 2)
         where
         forceSignature x@(SignaturePacket {}) = x
         forceSignature _ = error "EmbeddedSignature must contain signature"
diff --git a/tests/data/002182-002.sig b/tests/data/002182-002.sig
new file mode 100644
index 0000000..2bc6679
--- /dev/null
+++ b/tests/data/002182-002.sig
diff --git a/tests/suite.hs b/tests/suite.hs
index 0ddc770..3094214 100644
--- a/tests/suite.hs
+++ b/tests/suite.hs
@@ -130,6 +130,7 @@ tests =
                         testCase "000076-007.secret_subkey" (testSerialization "000076-007.secret_subkey"),
                         testCase "000077-002.sig" (testSerialization "000077-002.sig"),
                         testCase "000078-012.ring_trust" (testSerialization "000078-012.ring_trust"),
+                        testCase "002182-002.sig" (testSerialization "002182-002.sig"),
                         testCase "pubring.gpg" (testSerialization "pubring.gpg"),
                         testCase "secring.gpg" (testSerialization "secring.gpg"),
                         testCase "compressedsig.gpg" (testSerialization "compressedsig.gpg"),