Remove third party caveats

[ci skip]

diff --git a/default.nix b/default.nix
index b9cfdb7c2ffc8eaf15799bc092b114e349c0ba1b..d96897489c4b94ff52988ac69a076d59974d5998 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, attoparsec, base, base64-bytestring, byteable
-, bytestring, cereal, cipher-aes, cryptohash, deepseq, hex
-, QuickCheck, stdenv, tasty, tasty-hunit, tasty-quickcheck
+, bytestring, cereal, cryptohash, deepseq, hex, QuickCheck, stdenv
+, tasty, tasty-hunit, tasty-quickcheck
 }:
 mkDerivation {
   pname = "hmacaroons";
@@ -8,7 +8,7 @@ mkDerivation {
   src = ./.;
   buildDepends = [
     attoparsec base base64-bytestring byteable bytestring cereal
-    cipher-aes cryptohash deepseq hex
+    cryptohash deepseq hex
   ];
   testDepends = [
     attoparsec base base64-bytestring byteable bytestring cereal

diff --git a/hmacaroons.cabal b/hmacaroons.cabal
index c26ea197828acade9701957c47cde1e52109d5f0..e80cfa42ca200512d7dcecc6e3f9ad9619e888a3 100644 (file)
--- a/hmacaroons.cabal
+++ b/hmacaroons.cabal
@@ -64,12 +64,12 @@ library
                   byteable >= 0.1 && <0.2,
                   cereal >= 0.4,
                   cryptohash >=0.11 && <0.12,
-                  cipher-aes >=0.2 && <0.3,
+                  -- cipher-aes >=0.2 && <0.3,
                   deepseq >= 1.1,
                   hex >= 0.1
   hs-source-dirs:      src
   default-language:    Haskell2010
- 
+
 benchmark bench
   default-language: Haskell2010
   type:             exitcode-stdio-1.0
@@ -83,7 +83,7 @@ benchmark bench
                   byteable >= 0.1 && <0.2,
                   cereal >= 0.4,
                   cryptohash >=0.11 && <0.12,
-                  cipher-aes >=0.2 && <0.3,
+                  -- cipher-aes >=0.2 && <0.3,
                   hex >= 0.1,
                   deepseq >= 1.1,
                   criterion >= 1.1

diff --git a/src/Crypto/Macaroon.hs b/src/Crypto/Macaroon.hs
index f955ab87c19dec8cf6f80f744494be9bf5c60b24..bfcf8dfa218447008840892ce43558e4f7a2f149 100644 (file)
--- a/src/Crypto/Macaroon.hs
+++ b/src/Crypto/Macaroon.hs
@@ -44,7 +44,7 @@ module Crypto.Macaroon (
     -- , addThirdPartyCaveat
     ) where
 
-import           Crypto.Cipher.AES
+-- import           Crypto.Cipher.AES
 import           Crypto.Hash
 import           Data.Byteable
 import qualified Data.ByteString            as BS
@@ -81,13 +81,13 @@ addFirstPartyCaveat ident m = addCaveat (location m) ident BS.empty m
 
 -- |Add a third party Caveat to a Macaroon, using its location, identifier and
 -- verification key
-addThirdPartyCaveat :: Key
-                    -> Key
-                    -> Location
-                    -> Macaroon
-                    -> Macaroon
-addThirdPartyCaveat key cid loc m = addCaveat loc cid vid m
-  where
-    vid = encryptECB (initAES (signature m)) key
+-- addThirdPartyCaveat :: Key
+--                     -> Key
+--                     -> Location
+--                     -> Macaroon
+--                     -> Macaroon
+-- addThirdPartyCaveat key cid loc m = addCaveat loc cid vid m
+--   where
+--     vid = encryptECB (initAES (signature m)) key
 
 

diff --git a/src/Crypto/Macaroon/Internal.hs b/src/Crypto/Macaroon/Internal.hs
index 02b7963c19c5deca88e5abb3f3c545bce6c9961c..116f5ede53de2bbbc73afa6ccacb0da178c5ec36 100644 (file)
--- a/src/Crypto/Macaroon/Internal.hs
+++ b/src/Crypto/Macaroon/Internal.hs
@@ -15,7 +15,6 @@ module Crypto.Macaroon.Internal where
 
 
 import           Control.DeepSeq
-import           Crypto.Cipher.AES
 import           Crypto.Hash
 import           Data.Byteable
 import qualified Data.ByteString        as BS