haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some warnings

Browse Source
This commit is contained in:
Vincent Hanquez 2015-04-03 07:40:54 +01:00
parent f428843322
commit 842817086a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/KAT_PubKey.hs
View File

@ -3,14 +3,11 @@ module KAT_PubKey (tests) where
import Test.Tasty import Test.Tasty
import Test.Tasty.HUnit import Test.Tasty.HUnit
import Test.Tasty.QuickCheck
import System.IO (hFlush, stdout)
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import qualified Data.ByteString as B 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 Crypto.PubKey.MaskGenFunction
import qualified Crypto.Hash.SHA1 as SHA1 import qualified Crypto.Hash.SHA1 as SHA1
@ -19,6 +16,7 @@ import KAT_PubKey.PSS
import KAT_PubKey.DSA import KAT_PubKey.DSA
import KAT_PubKey.ECC import KAT_PubKey.ECC
import KAT_PubKey.ECDSA import KAT_PubKey.ECDSA
import Utils
data VectorMgf = VectorMgf { seed :: ByteString data VectorMgf = VectorMgf { seed :: ByteString
, dbMask :: ByteString , dbMask :: ByteString
@ -35,7 +33,7 @@ vectorsMGF =
] ]
tests = testGroup "PubKey" tests = testGroup "PubKey"
[ testGroup "MGF1" $ map doMGFTest (zip [0..] vectorsMGF) [ testGroup "MGF1" $ map doMGFTest (zip [katZero..] vectorsMGF)
, pssTests , pssTests
, oaepTests , oaepTests
, dsaTests , dsaTests

6
tests/Utils.hs
View File

@ -1,14 +1,14 @@
module Utils where module Utils where
import Data.Char import Data.Char
import Data.Bits
import Data.Word import Data.Word
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import Data.Byteable
import Data.Foldable (foldl')
import Data.Monoid (mconcat) import Data.Monoid (mconcat)
import qualified Data.ByteString as B import qualified Data.ByteString as B
katZero :: Int
katZero = 0
--hexalise :: String -> [Word8] --hexalise :: String -> [Word8]
hexalise s = concatMap (\c -> [ hex $ c `div` 16, hex $ c `mod` 16 ]) s hexalise s = concatMap (\c -> [ hex $ c `div` 16, hex $ c `mod` 16 ]) s
where hex i where hex i