Temporarily drop EdDSA support until linking is sorted

Packages which depend on tinfoil currently rely on linking with libsodium, which makes the executables they build nonportable. The right solution to this is linking to a static version of libsodium (#65) and/or split the package (#59), but until this can be fully implemented and pushed through to master, this is a temporary fix so we can build working client executables (ref https://github.com/ambiata/ambiata-cli/issues/59).
haskell-mafia · Nov 29, 2016 · 2896121 · 2896121
1 parent 87ea92a
commit 2896121
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 182 deletions.
diff --git a/ambiata-tinfoil.cabal b/ambiata-tinfoil.cabal
@@ -56,18 +56,11 @@ library
                        Tinfoil.MAC
                        Tinfoil.Random
                        Tinfoil.Random.Internal
-                       Tinfoil.Signing.Ed25519
-                       Tinfoil.Signing.Ed25519.Internal
                        Tinfoil.Token
 
-  extra-libraries:     sodium
-
-  pkgconfig-depends:   libsodium >= 0.4.5
-
   c-sources:
                        -- tinfoil's own c bits
                        cbits/tinfoil/memory.c
-                       cbits/tinfoil/sodium/constants.c
 
                        -- scrypt (https://github.com/Tarsnap/scrypt)
                      , cbits/scrypt/insecure_memzero.c

diff --git a/cbits/tinfoil/sodium/constants.c b/cbits/tinfoil/sodium/constants.c
diff --git a/cbits/tinfoil/sodium/constants.h b/cbits/tinfoil/sodium/constants.h
diff --git a/cbits/tinfoil/tinfoil.h b/cbits/tinfoil/tinfoil.h
@@ -2,6 +2,5 @@
 #define H_TINFOIL
 
 #include "memory.h"
-#include "sodium/constants.h"
 
 #endif
diff --git a/test/Test/IO/Tinfoil/Signing/Ed25519.hs b/test/Test/IO/Tinfoil/Signing/Ed25519.hs
diff --git a/test/Test/IO/Tinfoil/Signing/Ed25519/Internal.hs b/test/Test/IO/Tinfoil/Signing/Ed25519/Internal.hs
diff --git a/test/Test/Tinfoil/Signing/Ed25519/Internal.hs b/test/Test/Tinfoil/Signing/Ed25519/Internal.hs
diff --git a/test/bench.hs b/test/bench.hs
@@ -14,8 +14,6 @@ import           Disorder.Core.Gen (GenSeed(..), genDeterministic)
 
 import           P
 
-import qualified Prelude
-
 import           System.IO
 import qualified System.Random as R
 
@@ -24,12 +22,10 @@ import           Test.QuickCheck
 import           Test.QuickCheck.Instances ()
 
 import           Tinfoil.Comparison
-import           Tinfoil.Data
 import           Tinfoil.Hash
 import qualified Tinfoil.KDF.Scrypt as Scrypt
 import           Tinfoil.MAC
 import           Tinfoil.Random
-import qualified Tinfoil.Signing.Ed25519 as Ed25519
 
 generate' :: Gen a -> IO a
 generate' = pure . genDeterministic (GenSeed 314159)
@@ -43,16 +39,6 @@ bsTriple small big = do
   let big2 = BS.copy big1
   pure (BS.pack $ short1 <> long, big1, big2)
 
-genEd25519 :: IO (SecretKey Ed25519, PublicKey Ed25519, Signature Ed25519, ByteString)
-genEd25519 = do
-  (pk, sk) <- Ed25519.genKeyPair
-  msg <- generate' arbitrary
-  let sig = fromJust' $ Ed25519.signMessage sk msg
-  pure (sk, pk, sig, msg)
-  where
-    fromJust' Nothing' = Prelude.error "impossible: signing valid message failed"
-    fromJust' (Just' x) = x
-
 -- non-CSPRNG, just a performance baseline.
 stdRandom :: Int -> IO ByteString
 stdRandom n = BS.pack <$> R.getStdRandom (genBytes n [])
@@ -116,10 +102,4 @@ main = tinfoilBench [
   , env ((,) <$> generate' arbitrary <*> generate' arbitrary) $ \ ~(sk, bs) ->
       bgroup "mac/hmacSHA256" $ [ bench "hmacSHA256" $ nf (hmacSHA256 sk) bs
                                 ]
-  , env genEd25519 $ \ ~(sk, pk, sig, msg) ->
-      bgroup "signing/ed25519" $ [
-          bench "genKeyPair" $ nfIO Ed25519.genKeyPair
-        , bench "signMessage" $ nf (Ed25519.signMessage sk) msg
-        , bench "verifyMessage" $ nf (Ed25519.verifyMessage pk sig) msg
-        ]
   ]
diff --git a/test/test-io.hs b/test/test-io.hs
@@ -8,8 +8,6 @@ import qualified Test.IO.Tinfoil.KDF.Scrypt
 import qualified Test.IO.Tinfoil.KDF.Scrypt.Compat
 import qualified Test.IO.Tinfoil.MAC
 import qualified Test.IO.Tinfoil.Random
-import qualified Test.IO.Tinfoil.Signing.Ed25519
-import qualified Test.IO.Tinfoil.Signing.Ed25519.Internal
 
 main :: IO ()
 main =
@@ -22,6 +20,4 @@ main =
   , Test.IO.Tinfoil.KDF.Scrypt.Compat.tests
   , Test.IO.Tinfoil.MAC.tests
   , Test.IO.Tinfoil.Random.tests
-  , Test.IO.Tinfoil.Signing.Ed25519.tests
-  , Test.IO.Tinfoil.Signing.Ed25519.Internal.tests
   ]
diff --git a/test/test.hs b/test/test.hs
@@ -11,7 +11,6 @@ import qualified Test.Tinfoil.Hash.TestVectors
 import qualified Test.Tinfoil.KDF.Scrypt
 import qualified Test.Tinfoil.MAC
 import qualified Test.Tinfoil.Random
-import qualified Test.Tinfoil.Signing.Ed25519.Internal
 
 main :: IO ()
 main =
@@ -27,5 +26,4 @@ main =
   , Test.Tinfoil.MAC.tests
   , Test.Tinfoil.KDF.Scrypt.tests
   , Test.Tinfoil.Random.tests
-  , Test.Tinfoil.Signing.Ed25519.Internal.tests
   ]