Fix verifying detached signatures

horde · Apr 15, 2015 · 5f1df5b · 5f1df5b
1 parent e635500
commit 5f1df5b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/framework/Pgp/lib/Horde/Pgp.php b/framework/Pgp/lib/Horde/Pgp.php
@@ -274,7 +274,12 @@ public function verifyDetached($text, $sig, $key)
             $sig = Horde_Pgp_Element_Signature::create($sig);
             $data = new Horde_Pgp_Element_SignedMessage(
                 new OpenPGP_Message(array(
-                    new OpenPGP_LiteralDataPacket($text),
+                    new OpenPGP_LiteralDataPacket(
+                        $text,
+                        array(
+                            'format' => ($sig->message[0]->signature_type === 0x00) ? 'b' : 't'
+                        )
+                    ),
                     $sig->message[0]
                 ))
             );

diff --git a/framework/Pgp/test/Horde/Pgp/Backend/TestBase.php b/framework/Pgp/test/Horde/Pgp/Backend/TestBase.php
@@ -380,12 +380,11 @@ public function testSignDetached($text, $privkey)
             $result
         );
 
-        /* TODO: DSA signing is not working properly
         $this->testVerifyDetached(
             $text,
             strval($result),
             $privkey->getPublicKey()
-        ); */
+        );
     }
 
     public function signProvider()