1 files changed, 13 insertions, 3 deletions

diff --git a/Data/OpenPGP/Util/Gen.hs b/Data/OpenPGP/Util/Gen.hs
index c5d0159..ca3c684 100644
--- a/Data/OpenPGP/Util/Gen.hs
+++ b/Data/OpenPGP/Util/Gen.hs
@@ -14,6 +14,8 @@ import qualified Crypto.PubKey.RSA as Vincent.RSA
 import qualified Crypto.PubKey.RSA.PKCS15 as Vincent.RSA
 import qualified Crypto.PubKey.ECC.ECDSA as Vincent.ECDSA
 #if defined(VERSION_cryptonite)
+import qualified Crypto.PubKey.Ed25519 as Ed25519
+import Data.OpenPGP.Util.Ed25519
 import Control.Arrow (second)
 import Data.Binary
 #endif
@@ -22,7 +24,7 @@ import Data.OpenPGP.Util.Base
 
 data GenerateKeyParams = GenRSA Int -- keysize
                        | GenDSA (Maybe DSAParams)
-
+                       | GenEd25519
  deriving (Eq,Ord,Show)
 
 data DSAParams = DSAParams
@@ -32,8 +34,9 @@ data DSAParams = DSAParams
  deriving (Eq,Ord,Show)
 
 genKeyAlg :: GenerateKeyParams -> KeyAlgorithm
-genKeyAlg (GenRSA _) = RSA
-genKeyAlg (GenDSA _) = DSA
+genKeyAlg (GenRSA _)      = RSA
+genKeyAlg (GenDSA _)      = DSA
+genKeyAlg (GenEd25519 {}) = Ed25519
 
 -- | Generate a secret key pgp packet from system entropy.
 generateKey :: GenerateKeyParams -> IO Packet
@@ -115,6 +118,13 @@ generateKey' (GenDSA mbparams) g =
         vincent (DSAParams p g q) = Vincent.DSA.Params p g q
         (priv,g') = withDRG g $ Vincent.DSA.generatePrivate dsa_params
     in ( dsaFields (Vincent.DSA.PrivateKey dsa_params priv), g' )
+generateKey' (GenEd25519 {}) g = withDRG g $ do
+    k <- Ed25519.generateSecretKey
+    return $ importSecretEd25519 k
+    -- file:///usr/share/doc/libghc-cryptonite-doc/html/Crypto-PubKey-Ed25519.html#v:generateSecretKey
+    -- generateSecretKey :: MonadRandom m => m SecretKey
+    -- n = public key used to verify signatures.
+    -- public_key_fields Ed25519 = ['c','l','x', 'y', 'n', 'f']
 
 #endif