YACA: add new key types to tests' infrastructure

Change-Id: Iaba1057f1322ce7a15aa6454a4836bee361de6f6

diff --git a/src/yaca/yaca-test-common.cpp b/src/yaca/yaca-test-common.cpp
index 2fb89d8..cb10e3c 100644 (file)
--- a/src/yaca/yaca-test-common.cpp
+++ b/src/yaca/yaca-test-common.cpp
@@ -296,6 +296,13 @@ const char* keytype2str(yaca_key_type_e key_type)
     ENUM_DESCRIBE(YACA_KEY_TYPE_RSA_PUB);
     ENUM_DESCRIBE(YACA_KEY_TYPE_DSA_PRIV);
     ENUM_DESCRIBE(YACA_KEY_TYPE_DSA_PUB);
+    ENUM_DESCRIBE(YACA_KEY_TYPE_DSA_PARAMS);
+    ENUM_DESCRIBE(YACA_KEY_TYPE_DH_PRIV);
+    ENUM_DESCRIBE(YACA_KEY_TYPE_DH_PUB);
+    ENUM_DESCRIBE(YACA_KEY_TYPE_DH_PARAMS);
+    ENUM_DESCRIBE(YACA_KEY_TYPE_EC_PRIV);
+    ENUM_DESCRIBE(YACA_KEY_TYPE_EC_PUB);
+    ENUM_DESCRIBE(YACA_KEY_TYPE_EC_PARAMS);
     default: return "Unknown key type";
     }
 }

diff --git a/src/yaca/yaca-test-key.cpp b/src/yaca/yaca-test-key.cpp
index fc0baad..fa84d7f 100644 (file)
--- a/src/yaca/yaca-test-key.cpp
+++ b/src/yaca/yaca-test-key.cpp
@@ -185,6 +185,13 @@ void assert_keys_equal(const KeyPtr &key1,
     case YACA_KEY_TYPE_RSA_PRIV:
     case YACA_KEY_TYPE_DSA_PUB:
     case YACA_KEY_TYPE_DSA_PRIV:
+    case YACA_KEY_TYPE_DSA_PARAMS:
+    case YACA_KEY_TYPE_DH_PUB:
+    case YACA_KEY_TYPE_DH_PRIV:
+    case YACA_KEY_TYPE_DH_PARAMS:
+    case YACA_KEY_TYPE_EC_PUB:
+    case YACA_KEY_TYPE_EC_PRIV:
+    case YACA_KEY_TYPE_EC_PARAMS:
         key_file_fmt = YACA_KEY_FILE_FORMAT_DER;
         break;
     default:

diff --git a/src/yaca/yaca-test-vector.cpp b/src/yaca/yaca-test-vector.cpp
index f05cbfc..f415963 100644 (file)
--- a/src/yaca/yaca-test-vector.cpp
+++ b/src/yaca/yaca-test-vector.cpp
@@ -66,13 +66,20 @@ std::unordered_map<std::string, yaca_key_file_format_e> str2keyfileformat = {
 };
 
 std::unordered_map<std::string, yaca_key_type_e> str2keytype = {
-    std::make_pair("SYMMETRIC", YACA_KEY_TYPE_SYMMETRIC),
-    std::make_pair("DES",       YACA_KEY_TYPE_DES),
-    std::make_pair("IV",        YACA_KEY_TYPE_IV),
-    std::make_pair("RSA_PRIV",  YACA_KEY_TYPE_RSA_PRIV),
-    std::make_pair("RSA_PUB",   YACA_KEY_TYPE_RSA_PUB),
-    std::make_pair("DSA_PRIV",  YACA_KEY_TYPE_DSA_PRIV),
-    std::make_pair("DSA_PUB",   YACA_KEY_TYPE_DSA_PUB)
+    std::make_pair("SYMMETRIC",  YACA_KEY_TYPE_SYMMETRIC),
+    std::make_pair("DES",        YACA_KEY_TYPE_DES),
+    std::make_pair("IV",         YACA_KEY_TYPE_IV),
+    std::make_pair("RSA_PRIV",   YACA_KEY_TYPE_RSA_PRIV),
+    std::make_pair("RSA_PUB",    YACA_KEY_TYPE_RSA_PUB),
+    std::make_pair("DSA_PRIV",   YACA_KEY_TYPE_DSA_PRIV),
+    std::make_pair("DSA_PUB",    YACA_KEY_TYPE_DSA_PUB),
+    std::make_pair("DSA_PARAMS", YACA_KEY_TYPE_DSA_PARAMS),
+    std::make_pair("DH_PRIV",    YACA_KEY_TYPE_DH_PRIV),
+    std::make_pair("DH_PUB",     YACA_KEY_TYPE_DH_PUB),
+    std::make_pair("DH_PARAMS",  YACA_KEY_TYPE_DH_PARAMS),
+    std::make_pair("EC_PRIV",    YACA_KEY_TYPE_EC_PRIV),
+    std::make_pair("EC_PUB",     YACA_KEY_TYPE_EC_PUB),
+    std::make_pair("EC_PARAMS",  YACA_KEY_TYPE_EC_PARAMS)
 };
 
 std::unordered_map<std::string, yaca_digest_algorithm_e> str2digest = {