1 files changed, 60 insertions, 53 deletions
diff --git a/tests/Codec/Crypto/HKDFTests.hs b/tests/Codec/Crypto/HKDFTests.hs
index b1825a2..f098640 100644
--- a/tests/Codec/Crypto/HKDFTests.hs
+++ b/tests/Codec/Crypto/HKDFTests.hs
@@ -13,10 +13,10 @@
 -- the License.
 
 {-# LANGUAGE OverloadedStrings #-}
+{-# OPTIONS_GHC -Wno-missing-fields #-}
 
 module Codec.Crypto.HKDFTests (tests) where
 
-import Data.ByteString (ByteString)
 import qualified Data.ByteString as ByteString
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.HUnit (testCase)
@@ -24,70 +24,77 @@ import Test.Tasty.HUnit (testCase)
 import BTLS.Assertions (isRightAndHolds)
 import BTLS.TestUtilities (hex)
 import Codec.Crypto.HKDF
-  (AssociatedData(AssociatedData), Salt(Salt), SecretKey(SecretKey), noSalt)
-import qualified Codec.Crypto.HKDF as HKDF
+  (ExpandParams(..), ExtractParams(..), HKDFParams(..), expand, extract, hkdf)
 import Data.Digest (sha1, sha256)
 
 tests :: TestTree
 tests = testGroup "Codec.Crypto.HKDF" [testRFC5869]
 
-hkdfTestCase name hash ikm salt info prk okm@(SecretKey k) = testGroup name $
-  let len = ByteString.length k in
-  [ testCase "hkdf" $ HKDF.hkdf hash salt info len ikm `isRightAndHolds` okm
-  , testCase "extract" $ HKDF.extract hash salt ikm `isRightAndHolds` prk
-  , testCase "expand" $ HKDF.expand hash info len prk `isRightAndHolds` okm ]
+hkdfTestCase name
+    params@(HKDFParams {algorithm = hash, salt = salt, associatedData = info})
+    ikm
+    prk
+    okm =
+  testGroup name $
+    let secretLen = ByteString.length okm
+        params' = params { secretLen = secretLen }
+        extractParams = ExtractParams { extractAlgorithm = hash
+                                      , extractSalt = salt }
+        expandParams = ExpandParams { expandAlgorithm = hash
+                                    , expandAssociatedData = info
+                                    , expandSecretLen = secretLen } in
+    [ testCase "hkdf" $ hkdf params' ikm `isRightAndHolds` okm
+    , testCase "extract" $ extract extractParams ikm `isRightAndHolds` prk
+    , testCase "expand" $ expand expandParams prk `isRightAndHolds` okm ]
 
 -- | Tests from RFC 5869.
 testRFC5869 = testGroup "RFC 5869 examples"
   [ hkdfTestCase "test case 1"
-      sha256
-      (SecretKey $ ByteString.replicate 22 0x0b)
-      (Salt $ ByteString.pack [0x00 .. 0x0c])
-      (AssociatedData $ ByteString.pack [0xf0 .. 0xf9])
-      (hexKey "077709362c2e32df0ddc3f0dc47bba6390b6c73bb50f9c3122ec844ad7c2b3e5")
-      (hexKey "3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865")
+      HKDFParams { algorithm = sha256
+                 , salt = ByteString.pack [0x00 .. 0x0c]
+                 , associatedData = ByteString.pack [0xf0 .. 0xf9] }
+      (ByteString.replicate 22 0x0b)
+      (hex "077709362c2e32df0ddc3f0dc47bba6390b6c73bb50f9c3122ec844ad7c2b3e5")
+      (hex "3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865")
   , hkdfTestCase "test case 2"
-      sha256
-      (SecretKey $ ByteString.pack [0x00 .. 0x4f])
-      (Salt $ ByteString.pack [0x60 .. 0xaf])
-      (AssociatedData $ ByteString.pack [0xb0 .. 0xff])
-      (hexKey "06a6b88c5853361a06104c9ceb35b45cef760014904671014a193f40c15fc244")
-      (hexKey "b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30c58179ec3e87c14c01d5c1f3434f1d87")
+      HKDFParams { algorithm = sha256
+                 , salt = ByteString.pack [0x60 .. 0xaf]
+                 , associatedData = ByteString.pack [0xb0 .. 0xff] }
+      (ByteString.pack [0x00 .. 0x4f])
+      (hex "06a6b88c5853361a06104c9ceb35b45cef760014904671014a193f40c15fc244")
+      (hex "b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30c58179ec3e87c14c01d5c1f3434f1d87")
   , hkdfTestCase "test case 3"
-      sha256
-      (SecretKey $ ByteString.replicate 22 0x0b)
-      (Salt "")
-      (AssociatedData "")
-      (hexKey "19ef24a32c717b167f33a91d6f648bdf96596776afdb6377ac434c1c293ccb04")
-      (hexKey "8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4b61a96c8")
+      HKDFParams { algorithm = sha256
+                 , salt = ""
+                 , associatedData = "" }
+      (ByteString.replicate 22 0x0b)
+      (hex "19ef24a32c717b167f33a91d6f648bdf96596776afdb6377ac434c1c293ccb04")
+      (hex "8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4b61a96c8")
   , hkdfTestCase "test case 4"
-      sha1
-      (SecretKey $ ByteString.replicate 11 0x0b)
-      (Salt $ ByteString.pack [0x00 .. 0x0c])
-      (AssociatedData $ ByteString.pack [0xf0 .. 0xf9])
-      (hexKey "9b6c18c432a7bf8f0e71c8eb88f4b30baa2ba243")
-      (hexKey "085a01ea1b10f36933068b56efa5ad81a4f14b822f5b091568a9cdd4f155fda2c22e422478d305f3f896")
+      HKDFParams { algorithm = sha1
+                 , salt = ByteString.pack [0x00 .. 0x0c]
+                 , associatedData = ByteString.pack [0xf0 .. 0xf9] }
+      (ByteString.replicate 11 0x0b)
+      (hex "9b6c18c432a7bf8f0e71c8eb88f4b30baa2ba243")
+      (hex "085a01ea1b10f36933068b56efa5ad81a4f14b822f5b091568a9cdd4f155fda2c22e422478d305f3f896")
   , hkdfTestCase "test case 5"
-      sha1
-      (SecretKey $ ByteString.pack [0x00 .. 0x4f])
-      (Salt $ ByteString.pack [0x60 .. 0xaf])
-      (AssociatedData $ ByteString.pack [0xb0 .. 0xff])
-      (hexKey "8adae09a2a307059478d309b26c4115a224cfaf6")
-      (hexKey "0bd770a74d1160f7c9f12cd5912a06ebff6adcae899d92191fe4305673ba2ffe8fa3f1a4e5ad79f3f334b3b202b2173c486ea37ce3d397ed034c7f9dfeb15c5e927336d0441f4c4300e2cff0d0900b52d3b4")
+      HKDFParams { algorithm = sha1
+                 , salt = ByteString.pack [0x60 .. 0xaf]
+                 , associatedData = ByteString.pack [0xb0 .. 0xff] }
+      (ByteString.pack [0x00 .. 0x4f])
+      (hex "8adae09a2a307059478d309b26c4115a224cfaf6")
+      (hex "0bd770a74d1160f7c9f12cd5912a06ebff6adcae899d92191fe4305673ba2ffe8fa3f1a4e5ad79f3f334b3b202b2173c486ea37ce3d397ed034c7f9dfeb15c5e927336d0441f4c4300e2cff0d0900b52d3b4")
   , hkdfTestCase "test case 6"
-      sha1
-      (SecretKey $ ByteString.replicate 22 0x0b)
-      (Salt "")
-      (AssociatedData "")
-      (hexKey "da8c8a73c7fa77288ec6f5e7c297786aa0d32d01")
-      (hexKey "0ac1af7002b3d761d1e55298da9d0506b9ae52057220a306e07b6b87e8df21d0ea00033de03984d34918")
+      HKDFParams { algorithm = sha1
+                 , salt = ""
+                 , associatedData = "" }
+      (ByteString.replicate 22 0x0b)
+      (hex "da8c8a73c7fa77288ec6f5e7c297786aa0d32d01")
+      (hex "0ac1af7002b3d761d1e55298da9d0506b9ae52057220a306e07b6b87e8df21d0ea00033de03984d34918")
   , hkdfTestCase "test case 7"
-      sha1
-      (SecretKey $ ByteString.replicate 22 0x0c)
-      noSalt
-      (AssociatedData "")
-      (hexKey "2adccada18779e7c2077ad2eb19d3f3e731385dd")
-      (hexKey "2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48") ]
-
-hexKey :: ByteString -> SecretKey
-hexKey = SecretKey . hex
+      HKDFParams { algorithm = sha1
+                 , salt = ""
+                 , associatedData = "" }
+      (ByteString.replicate 22 0x0c)
+      (hex "2adccada18779e7c2077ad2eb19d3f3e731385dd")
+      (hex "2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48") ]