Remove unnecessary crypto tests

Considering security strength of HMAC & HKDF algorithms,
using empty input values has no much sense.

Additionally CTAP will use well-defined input parameters,
so such scenario will not occur in real use-case.

Change-Id: Iea2156e9ce7a9e1014dd5e9eec4273de696e4e66

diff --git a/srcs/crypto/hkdf.cpp b/srcs/crypto/hkdf.cpp
index d44e61bbb3e1c893094bd15038da51ace70e9718..44ac565c05862ad1ad2764950e9ce45a74f9b00d 100644 (file)
--- a/srcs/crypto/hkdf.cpp
+++ b/srcs/crypto/hkdf.cpp
@@ -19,6 +19,7 @@
 #include "crypto/openssl_error.h"
 #include "log/log.h"
 
+#include <cassert>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/kdf.h>
@@ -31,6 +32,7 @@ CryptoBuffer HkdfSha256(const CryptoBuffer &secret,
                         const CryptoBuffer &info,
                         size_t derivedKeySize)
 {
+    assert(!secret.empty() || !salt.empty() || !info.empty());
     CryptoBuffer derivedKey(derivedKeySize);
 
     if (derivedKeySize == 0)

diff --git a/srcs/crypto/hmac.cpp b/srcs/crypto/hmac.cpp
index 84e0165d742823531481f8d7b34817488d4cd90e..d9dc8b8dae0c907c9f1fa29cfb66d59a8caece32 100644 (file)
--- a/srcs/crypto/hmac.cpp
+++ b/srcs/crypto/hmac.cpp
@@ -18,12 +18,14 @@
 #include "crypto/openssl_error.h"
 #include "log/log.h"
 
+#include <cassert>
 #include <openssl/hmac.h>
 
 namespace Crypto {
 
 CryptoBuffer HmacSha256(const CryptoBuffer &key, const CryptoBuffer &data)
 {
+    assert(!key.empty() || !data.empty());
     CryptoBuffer digest(EVP_MAX_MD_SIZE);
 
     unsigned int digestLen;

diff --git a/tests/crypto/hkdf_unittest.cpp b/tests/crypto/hkdf_unittest.cpp
index ce5365a38f3d0f6f668b65032eb3d1a921829ca7..f295031ddb6ff39b4c8000a6f8775102ad48ae0d 100644 (file)
--- a/tests/crypto/hkdf_unittest.cpp
+++ b/tests/crypto/hkdf_unittest.cpp
@@ -76,22 +76,6 @@ TEST(HkdfSha256Test, EmptyBufferTestCase4)
     EXPECT_TRUE(derivedKey.empty());
 }
 
-TEST(HkdfSha256Test, empty_input)
-{
-    const CryptoBuffer secret;
-    const CryptoBuffer salt;
-    const CryptoBuffer info;
-    size_t derivedKeySize = 42;
-
-    const CryptoBuffer expected = {0xeb, 0x70, 0xf0, 0x1d, 0xed, 0xe9, 0xaf, 0xaf, 0xa4, 0x49, 0xee,
-                                   0xe1, 0xb1, 0x28, 0x65, 0x04, 0xe1, 0xf6, 0x23, 0x88, 0xb3, 0xf7,
-                                   0xdd, 0x4f, 0x95, 0x66, 0x97, 0xb0, 0xe8, 0x28, 0xfe, 0x18, 0x1e,
-                                   0x59, 0xc2, 0xec, 0x0f, 0xe6, 0xe7, 0xe7, 0xac, 0x26};
-
-    auto derivedKey = Crypto::HkdfSha256(secret, salt, info, derivedKeySize);
-    EXPECT_EQ(derivedKey, expected);
-}
-
 TEST(HkdfSha256Test, empty_secret)
 {
     const CryptoBuffer secret;

diff --git a/tests/crypto/hmac_unittest.cpp b/tests/crypto/hmac_unittest.cpp
index 8fedbdf3eff9af825cfead14f325ae7b1ec06997..37a0e479d0c85b2d8968d02897b96ceca09e9f3d 100644 (file)
--- a/tests/crypto/hmac_unittest.cpp
+++ b/tests/crypto/hmac_unittest.cpp
@@ -47,15 +47,3 @@ TEST(HmacSha256Test, RFC4231TestCase6)
     EXPECT_EQ(digest, expected);
 }
 
-TEST(HmacSha256Test, EmptyKeyDataTestCase7)
-{
-    const CryptoBuffer key;
-    const CryptoBuffer data;
-
-    const CryptoBuffer expected = {0xb6, 0x13, 0x67, 0x9a, 0x08, 0x14, 0xd9, 0xec, 0x77, 0x2f, 0x95,
-                                   0xd7, 0x78, 0xc3, 0x5f, 0xc5, 0xff, 0x16, 0x97, 0xc4, 0x93, 0x71,
-                                   0x56, 0x53, 0xc6, 0xc7, 0x12, 0x14, 0x42, 0x92, 0xc5, 0xad};
-
-    auto digest = Crypto::HmacSha256(key, data);
-    EXPECT_EQ(digest, expected);
-}