From 842817086a35fabd878d24dcc521765e5ad54756 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Fri, 3 Apr 2015 07:40:54 +0100 Subject: [PATCH] remove some warnings --- tests/KAT_PubKey.hs | 8 +++----- tests/Utils.hs | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/KAT_PubKey.hs b/tests/KAT_PubKey.hs index 68e3064..385d862 100644 --- a/tests/KAT_PubKey.hs +++ b/tests/KAT_PubKey.hs @@ -3,14 +3,11 @@ module KAT_PubKey (tests) where import Test.Tasty import Test.Tasty.HUnit -import Test.Tasty.QuickCheck -import System.IO (hFlush, stdout) import Data.ByteString (ByteString) import qualified Data.ByteString as B -import qualified Data.ByteString.Char8 as BC +import Data.ByteString.Char8 () -import Crypto.PubKey.RSA import Crypto.PubKey.MaskGenFunction import qualified Crypto.Hash.SHA1 as SHA1 @@ -19,6 +16,7 @@ import KAT_PubKey.PSS import KAT_PubKey.DSA import KAT_PubKey.ECC import KAT_PubKey.ECDSA +import Utils data VectorMgf = VectorMgf { seed :: ByteString , dbMask :: ByteString @@ -35,7 +33,7 @@ vectorsMGF = ] tests = testGroup "PubKey" - [ testGroup "MGF1" $ map doMGFTest (zip [0..] vectorsMGF) + [ testGroup "MGF1" $ map doMGFTest (zip [katZero..] vectorsMGF) , pssTests , oaepTests , dsaTests diff --git a/tests/Utils.hs b/tests/Utils.hs index d78532d..2b8aa18 100644 --- a/tests/Utils.hs +++ b/tests/Utils.hs @@ -1,14 +1,14 @@ module Utils where import Data.Char -import Data.Bits import Data.Word import Data.ByteString (ByteString) -import Data.Byteable -import Data.Foldable (foldl') import Data.Monoid (mconcat) import qualified Data.ByteString as B +katZero :: Int +katZero = 0 + --hexalise :: String -> [Word8] hexalise s = concatMap (\c -> [ hex $ c `div` 16, hex $ c `mod` 16 ]) s where hex i