XEd25519 signature algorithm. (Signatures using montgomery cv25519 keys).

2 files changed, 14 insertions, 2 deletions

diff --git a/Data/OpenPGP/Util/Cv25519.hs b/Data/OpenPGP/Util/Cv25519.hs
index aef3521..4900b2f 100644
--- a/Data/OpenPGP/Util/Cv25519.hs
+++ b/Data/OpenPGP/Util/Cv25519.hs
@@ -17,7 +17,7 @@ import Numeric
 import Data.Int
 
 import Data.OpenPGP.Internal
-import Data.OpenPGP.Util
+import Data.OpenPGP.Util.Fingerprint
 import Data.OpenPGP.Util.Base
 import Data.OpenPGP as OpenPGP
 import Crypto.Cipher.SBox
diff --git a/Data/OpenPGP/Util/Verify.hs b/Data/OpenPGP/Util/Verify.hs
index 5eea260..66db2ab 100644
--- a/Data/OpenPGP/Util/Verify.hs
+++ b/Data/OpenPGP/Util/Verify.hs
@@ -20,7 +20,8 @@ import Crypto.PubKey.HashDescr
 
 import Data.OpenPGP.Util.Base
 import Data.OpenPGP.Util.Ed25519
-
+import Data.OpenPGP.Util.Cv25519 as Cv25519
+import Crypto.XEd25519 as Xed25519
 
 dsaKey :: OpenPGP.Packet -> Vincent.DSA.PublicKey
 dsaKey k = Vincent.DSA.PublicKey
@@ -55,9 +56,20 @@ verifyOne keys sig over = fmap (const sig) $ maybeKey >>= verification >>= guard
         OpenPGP.DSA -> dsaVerify
         OpenPGP.ECDSA -> ecdsaVerify
         OpenPGP.Ed25519 -> ed25519Verify sig over
+        OpenPGP.ECC ->  xed25519Verify
         alg | alg `elem` [OpenPGP.RSA,OpenPGP.RSA_S] -> rsaVerify
             | otherwise -> const Nothing
 
+    xed25519Verify k = do
+        guard $ oid_cv25519 == keyParam 'c' k
+        cvk <- cv25519Key $ OpenPGP.key k
+        let xed = Xed25519.toSigningKey cvk
+        -- verify :: ByteArrayAccess dta => PublicKey -> dta -> Signature -> Bool
+        let hashbs = hashBySymbol (OpenPGP.hash_algorithm sig) $ LZ.fromChunks [over]
+        edsig <- ed25519sig sig
+        xedsig <- Xed25519.signatureDecode edsig
+        Just $ Xed25519.verify xed hashbs xedsig
+
 #if defined(VERSION_cryptonite)
     dsaVerify k = let k' = dsaKey k in
         -- XXX: What happened to dsaTruncate?