From 75d83d75e76b6bba1dc18efcf3f3445d635918ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Ch=C3=A9ron?= Date: Thu, 25 Aug 2016 18:11:57 +0200 Subject: [PATCH] Prepare utility functions for more hash algorithms --- tests/KAT_PubKey/ECDSA.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/KAT_PubKey/ECDSA.hs b/tests/KAT_PubKey/ECDSA.hs index d425e34..a655b66 100644 --- a/tests/KAT_PubKey/ECDSA.hs +++ b/tests/KAT_PubKey/ECDSA.hs @@ -77,16 +77,16 @@ vectorToPrivate vector = ECDSA.PrivateKey (curve vector) (d vector) vectorToPublic :: VectorECDSA -> ECDSA.PublicKey vectorToPublic vector = ECDSA.PublicKey (curve vector) (q vector) -doSignatureTest (i, vector) = testCase (show i) (expected @=? actual) +doSignatureTest hashAlg (i, vector) = testCase (show i) (expected @=? actual) where expected = Just $ ECDSA.Signature (r vector) (s vector) - actual = ECDSA.signWith (k vector) (vectorToPrivate vector) SHA1 (msg vector) + actual = ECDSA.signWith (k vector) (vectorToPrivate vector) hashAlg (msg vector) -doVerifyTest (i, vector) = testCase (show i) (True @=? actual) - where actual = ECDSA.verify SHA1 (vectorToPublic vector) (ECDSA.Signature (r vector) (s vector)) (msg vector) +doVerifyTest hashAlg (i, vector) = testCase (show i) (True @=? actual) + where actual = ECDSA.verify hashAlg (vectorToPublic vector) (ECDSA.Signature (r vector) (s vector)) (msg vector) ecdsaTests = testGroup "ECDSA" [ testGroup "SHA1" - [ testGroup "signature" $ map doSignatureTest (zip [katZero..] vectorsSHA1) - , testGroup "verify" $ map doVerifyTest (zip [katZero..] vectorsSHA1) + [ testGroup "signature" $ map (doSignatureTest SHA1) (zip [katZero..] vectorsSHA1) + , testGroup "verify" $ map (doVerifyTest SHA1) (zip [katZero..] vectorsSHA1) ] ]