diff --git a/CHANGES.md b/CHANGES.md --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,10 @@ Changelog for lol project ================================ +0.2.0.1 +---- + * Fixed compile error in KHPRFTests. + 0.2.0.0 ---- * Added [BPF14] key-homomorphic PRF. diff --git a/benchmarks/SHEBenches.hs b/benchmarks/SHEBenches.hs --- a/benchmarks/SHEBenches.hs +++ b/benchmarks/SHEBenches.hs @@ -28,8 +28,7 @@ import Crypto.Lol.Benchmarks import Control.Applicative -import Control.Monad.Random -import Control.Monad.State +import Control.Monad.Random hiding (lift) import Crypto.Lol.Utils.ShowType import Crypto.Random.DRBG diff --git a/lol-apps.cabal b/lol-apps.cabal --- a/lol-apps.cabal +++ b/lol-apps.cabal @@ -5,8 +5,8 @@ -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -version: 0.2.0.0 -synopsis: Lattice-based cryptographic applications using Lol. +version: 0.2.0.1 +synopsis: Lattice-based cryptographic applications using . homepage: https://github.com/cpeikert/Lol Bug-Reports: https://github.com/cpeikert/Lol/issues license: GPL-2 @@ -21,7 +21,7 @@ cabal-version: >= 1.10 description: This library contains example cryptographic applications built using - (Lol), + , a general-purpose library for ring-based lattice cryptography. source-repository head @@ -66,16 +66,16 @@ build-depends: base >= 4.9 && < 5, - containers, - deepseq >= 1.4.1.1, - lol >= 0.6.0.0, - MonadRandom >= 0.2, - mtl, - numeric-prelude >= 0.4.2, - protocol-buffers, - protocol-buffers-descriptor, - singletons, - split + containers < 0.6, + deepseq >= 1.4.1.1 && < 1.5, + lol >= 0.6.0.0 && < 0.7, + MonadRandom >= 0.2 && < 0.6, + mtl < 2.3, + numeric-prelude >= 0.4.2 && < 0.5, + protocol-buffers < 2.5, + protocol-buffers-descriptor < 2.5, + singletons < 2.3, + split < 0.3 test-suite test-apps type: exitcode-stdio-1.0 @@ -88,26 +88,26 @@ ghc-options: -threaded -rtsopts build-depends: - arithmoi, + arithmoi < 0.5, base >= 4.9 && < 5, - constraints, - deepseq, - DRBG, - lol >= 0.6.0.0, + constraints < 0.10, + deepseq < 1.5, + DRBG < 0.6, + lol >= 0.6.0.0 && < 0.7, lol-apps, - lol-cpp, - lol-repa, - lol-tests, - MonadRandom, - mtl, - numeric-prelude, - QuickCheck >= 2.8, - random, - repa, - singletons, - test-framework >= 0.8, - test-framework-quickcheck2 >= 0.3, - vector + lol-cpp < 0.1, + lol-repa < 0.1, + lol-tests < 0.1, + MonadRandom < 0.6, + mtl < 2.3, + numeric-prelude < 0.5, + QuickCheck >= 2.8 && < 3.0, + random < 1.2, +-- repa < 3.5, + singletons < 2.3, + test-framework >= 0.8 && < 0.9, + test-framework-quickcheck2 >= 0.3 && < 0.4, + vector < 0.13 Benchmark bench-apps type: exitcode-stdio-1.0 @@ -119,29 +119,29 @@ -- if flag(llvm) -- ghc-options: -fllvm -optlo-O3 - ghc-options: -threaded -rtsopts + ghc-options: -threaded -rtsopts -O2 -- ghc-options: -O2 -Odph -funbox-strict-fields -fwarn-dodgy-imports -rtsopts -- ghc-options: -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000 build-depends: - arithmoi, + arithmoi < 0.5, base >= 4.9 && < 5, - containers, - criterion, - deepseq, - DRBG, - lol >= 0.6.0.0, + containers < 0.6, + criterion < 1.2, + deepseq < 1.5, + DRBG < 0.6, + lol >= 0.6.0.0 && < 0.7, lol-apps, - lol-benches, - lol-cpp, - lol-repa, - MonadRandom, - mtl, - numeric-prelude, - singletons, - transformers, - vector, - repa + lol-benches >= 0.0.0.3 && < 0.1, + lol-cpp < 0.1, + lol-repa < 0.1, + MonadRandom < 0.6, + mtl < 2.3, + numeric-prelude < 0.5, + singletons < 2.3, + transformers < 0.6, + vector < 0.13, + repa >=3.4 && < 3.5 executable homomprf hs-source-dirs: examples @@ -150,22 +150,22 @@ ghc-options: -main-is HomomPRFMain other-modules: HomomPRFParams - ghc-options: -threaded -rtsopts + ghc-options: -threaded -rtsopts -O2 build-depends: - arithmoi, + arithmoi < 0.5, base >= 4.9 && < 5, - deepseq, - DRBG, - filepath, - lol >= 0.6.0.0, + deepseq < 1.5, + DRBG < 0.6, + filepath < 1.5, + lol >= 0.6.0.0 && < 0.7, lol-apps, - lol-cpp, - MonadRandom, - mtl, - numeric-prelude, - singletons, - time + lol-cpp < 0.1, + MonadRandom < 0.6, + mtl < 2.3, + numeric-prelude < 0.5, + singletons < 2.3, + time < 1.9 executable khprf hs-source-dirs: examples @@ -173,18 +173,18 @@ main-is: KHPRFMain.hs ghc-options: -main-is KHPRFMain - ghc-options: -threaded -rtsopts + ghc-options: -threaded -rtsopts -O2 build-depends: - arithmoi, + arithmoi < 0.5, base >= 4.9 && < 5, - deepseq, - lol >= 0.6.0.0, + deepseq < 1.5, + lol >= 0.6.0.0 && < 0.7, lol-apps, - lol-cpp, - MonadRandom, - mtl, - numeric-prelude + lol-cpp < 0.1, + MonadRandom < 0.6, + mtl < 2.3, + numeric-prelude < 0.5 executable symmshe hs-source-dirs: examples @@ -192,13 +192,13 @@ main-is: SHEMain.hs ghc-options: -main-is SHEMain - ghc-options: -threaded -rtsopts + ghc-options: -threaded -rtsopts -O2 build-depends: - arithmoi, + arithmoi < 0.5, base >= 4.9 && < 5, - lol >= 0.6.0.0, + lol >= 0.6.0.0 && < 0.7, lol-apps, - lol-cpp, - MonadRandom, - numeric-prelude + lol-cpp < 0.1, + MonadRandom < 0.6, + numeric-prelude < 0.5 diff --git a/tests/KHPRFTests.hs b/tests/KHPRFTests.hs --- a/tests/KHPRFTests.hs +++ b/tests/KHPRFTests.hs @@ -22,7 +22,7 @@ module KHPRFTests (khprfTests) where import Control.Applicative -import Control.Monad.Random +import Control.Monad.Random hiding (lift) import Crypto.Lol import Crypto.Lol.Applications.KeyHomomorphicPRF