From f257c261d2dbecd27bda6a9e0310dcfa59734ae0 Mon Sep 17 00:00:00 2001 From: Daniel Gollub Date: Thu, 29 Jul 2021 19:28:26 +0200 Subject: [PATCH] load-tester: support ECDSA certificates --- src/libcharon/plugins/load_tester/load_tester_creds.c | 6 +++--- src/libcharon/plugins/load_tester/load_tester_plugin.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libcharon/plugins/load_tester/load_tester_creds.c b/src/libcharon/plugins/load_tester/load_tester_creds.c index 827d0b326a2..d3f26ed8eba 100644 --- a/src/libcharon/plugins/load_tester/load_tester_creds.c +++ b/src/libcharon/plugins/load_tester/load_tester_creds.c @@ -220,7 +220,7 @@ static private_key_t *load_issuer_key() BUILD_END); } DBG1(DBG_CFG, "loading load-tester private key from '%s'", path); - return lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, + return lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_ANY, BUILD_FROM_FILE, path, BUILD_END); } @@ -289,7 +289,7 @@ METHOD(credential_set_t, create_private_enumerator, enumerator_t*, { return NULL; } - if (type != KEY_ANY && type != KEY_RSA) + if (type != KEY_ANY && type != KEY_RSA && type != KEY_ECDSA) { return NULL; } @@ -324,7 +324,7 @@ METHOD(credential_set_t, create_cert_enumerator, enumerator_t*, { return NULL; } - if (key != KEY_ANY && key != KEY_RSA) + if (key != KEY_ANY && key != KEY_RSA && key != KEY_ECDSA) { return NULL; } diff --git a/src/libcharon/plugins/load_tester/load_tester_plugin.c b/src/libcharon/plugins/load_tester/load_tester_plugin.c index 961c10406b1..34e7d393e3d 100644 --- a/src/libcharon/plugins/load_tester/load_tester_plugin.c +++ b/src/libcharon/plugins/load_tester/load_tester_plugin.c @@ -236,6 +236,7 @@ METHOD(plugin_t, get_features, int, PLUGIN_CALLBACK((plugin_feature_callback_t)register_load_tester, NULL), PLUGIN_PROVIDE(CUSTOM, "load-tester"), PLUGIN_DEPENDS(CUSTOM, "kernel-net"), + PLUGIN_SDEPEND(PRIVKEY, KEY_ECDSA), PLUGIN_SDEPEND(PRIVKEY, KEY_RSA), PLUGIN_SDEPEND(CERT_DECODE, CERT_ANY), PLUGIN_SDEPEND(CERT_DECODE, CERT_X509),