From a784c9e030876758de8bd9cd3714c6dc6dcde470 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 9 Nov 2010 14:19:59 +0100 Subject: [PATCH] Specify the type of the certificate to load, currently X509 only --- src/conftest/conftest.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c index 0d610c5b4..38ec833ca 100644 --- a/src/conftest/conftest.c +++ b/src/conftest/conftest.c @@ -110,6 +110,12 @@ static bool load_certs(settings_t *settings, char *dir) enumerator = settings->create_key_value_enumerator(settings, "certs.trusted"); while (enumerator->enumerate(enumerator, &key, &value)) { + if (!strcaseeq(key, "x509")) + { + fprintf(stderr, "certificate type '%s' not supported\n", key); + enumerator->destroy(enumerator); + return FALSE; + } cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509, BUILD_FROM_FILE, value, BUILD_END); if (!cert) @@ -126,6 +132,12 @@ static bool load_certs(settings_t *settings, char *dir) enumerator = settings->create_key_value_enumerator(settings, "certs.untrusted"); while (enumerator->enumerate(enumerator, &key, &value)) { + if (!strcaseeq(key, "x509")) + { + fprintf(stderr, "certificate type '%s' not supported\n", key); + enumerator->destroy(enumerator); + return FALSE; + } cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509, BUILD_FROM_FILE, value, BUILD_END); if (!cert)