Disabled curve 25519 backport for newer cryptonite library.

4 files changed, 23 insertions, 2 deletions

diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index a43e3379..8bb822d8 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -63,7 +63,6 @@ import Control.Monad
 import qualified Crypto.Cipher.ChaChaPoly1305 as Symmetric
 import qualified Crypto.Cipher.Salsa    as Salsa
 import qualified Crypto.Cipher.XSalsa   as XSalsa
-import Crypto.ECC.Class
 import qualified Crypto.Error           as Cryptonite
 import qualified Crypto.MAC.Poly1305    as Poly1305
 import Crypto.PubKey.Curve25519
@@ -90,7 +89,13 @@ import Foreign.Storable
 import System.Endian
 import qualified Data.ByteString.Internal
 import Control.Concurrent.STM
+#ifdef CRYPTONITE_BACKPORT
+import Crypto.ECC.Class
 import Crypto.Error.Types                     (CryptoFailable (..), throwCryptoError)
+#else
+import Crypto.ECC
+import Crypto.Error
+#endif
 import Network.Socket (SockAddr)
 import GHC.Exts (Word(..),inline)
 import GHC.Prim
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index aa95df81..b3c4cedc 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE DeriveFoldable             #-}
 {-# LANGUAGE DeriveFunctor              #-}
@@ -25,9 +26,14 @@ import Control.Monad.Fix
 import qualified Crypto.Cipher.ChaChaPoly1305 as Symmetric
 import qualified Crypto.Cipher.Salsa          as Salsa
 import qualified Crypto.Cipher.XSalsa         as XSalsa
-import Crypto.ECC.Class
 import qualified Crypto.Error                 as Cryptonite
+#ifdef CRYPTONITE_BACKPORT
+import Crypto.ECC.Class
 import Crypto.Error.Types
+#else
+import Crypto.ECC
+import Crypto.Error
+#endif
 import qualified Crypto.MAC.Poly1305          as Poly1305
 import Crypto.PubKey.Curve25519
 import Crypto.PubKey.ECC.Types
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index 0ffc3d22..fbf6702a 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -37,8 +37,13 @@ import Debug.Trace
 import Control.Applicative
 import Control.Arrow
 import Control.Monad
+#ifdef CRYPTONITE_BACKPORT
 import Crypto.Error.Types                     (CryptoFailable (..),
                                                throwCryptoError)
+#else
+import Crypto.Error
+#endif
+
 import Crypto.PubKey.Curve25519
 import qualified Data.Aeson                   as JSON
          ;import Data.Aeson                   (FromJSON, ToJSON, (.=))
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index e792aa50..af515315 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP             #-}
 {-# LANGUAGE LambdaCase      #-}
 {-# LANGUAGE PatternSynonyms #-}
 module Network.Tox.Onion.Handlers where
@@ -11,8 +12,12 @@ import qualified Network.QueryResponse as QR (Client)
 import Crypto.Tox
 import qualified Data.Wrapper.PSQ             as PSQ
          ;import Data.Wrapper.PSQ             (PSQ)
+#ifdef CRYPTONITE_BACKPORT
 import Crypto.Error.Types                     (CryptoFailable (..),
                                                throwCryptoError)
+#else
+import Crypto.Error
+#endif
 import Control.Arrow
 
 import System.IO