1 files changed, 7 insertions, 4 deletions

diff --git a/Data/OpenPGP/Util/Gen.hs b/Data/OpenPGP/Util/Gen.hs
index ca3c684..c33ef1e 100644
--- a/Data/OpenPGP/Util/Gen.hs
+++ b/Data/OpenPGP/Util/Gen.hs
@@ -14,7 +14,9 @@ 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.Curve25519 as Cv25519
 import qualified Crypto.PubKey.Ed25519 as Ed25519
+import Data.OpenPGP.Util.Cv25519
 import Data.OpenPGP.Util.Ed25519
 import Control.Arrow (second)
 import Data.Binary
@@ -25,6 +27,7 @@ import Data.OpenPGP.Util.Base
 data GenerateKeyParams = GenRSA Int -- keysize
                        | GenDSA (Maybe DSAParams)
                        | GenEd25519
+                       | GenCv25519
  deriving (Eq,Ord,Show)
 
 data DSAParams = DSAParams
@@ -121,10 +124,10 @@ generateKey' (GenDSA mbparams) 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']
+generateKey' (GenCv25519 {}) g = withDRG g $ do
+    k <- Cv25519.generateSecretKey
+    return $ importSecretCv25519 k
+
 
 #endif