denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept a suffix to differentiate x509, crl, ecdsa and rsa files

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:59 +01:00
parent c7f7a0ba06
commit 48ef001133
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conftest/conftest.c
+7 -7
View File
@@ -89,7 +89,7 @@ static bool load_configs(char *suite_file, char *test_file)
/** /**
* Load trusted/untrusted certificates * Load trusted/untrusted certificates
*/ */
static bool load_trusted_cert(settings_t *settings, bool trusted) static bool load_cert(settings_t *settings, bool trusted)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
char *key, *value; char *key, *value;
@@ -100,12 +100,12 @@ static bool load_trusted_cert(settings_t *settings, bool trusted)
{ {
certificate_t *cert = NULL; certificate_t *cert = NULL;
if (strncaseeq(key, "x509")) if (strncaseeq(key, "x509", strlen("x509")))
{ {
cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, cert = lib->creds->create(lib->creds, CRED_CERTIFICATE,
CERT_X509, BUILD_FROM_FILE, value, BUILD_END); CERT_X509, BUILD_FROM_FILE, value, BUILD_END);
} }
else if (strcaseeq(key, "crl")) else if (strncaseeq(key, "crl", strlen("crl")))
{ {
cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, cert = lib->creds->create(lib->creds, CRED_CERTIFICATE,
CERT_X509_CRL, BUILD_FROM_FILE, value, BUILD_END); CERT_X509_CRL, BUILD_FROM_FILE, value, BUILD_END);
@@ -148,8 +148,8 @@ static bool load_certs(settings_t *settings, char *dir)
return FALSE; return FALSE;
} }
if (!load_trusted_cert(settings, TRUE) || if (!load_cert(settings, TRUE) ||
!load_trusted_cert(settings, FALSE)) !load_cert(settings, FALSE))
{ {
return FALSE; return FALSE;
} }
@@ -188,11 +188,11 @@ static bool load_keys(settings_t *settings, char *dir)
enumerator = settings->create_key_value_enumerator(settings, "keys"); enumerator = settings->create_key_value_enumerator(settings, "keys");
while (enumerator->enumerate(enumerator, &type, &value)) while (enumerator->enumerate(enumerator, &type, &value))
{ {
if (strcaseeq(type, "ecdsa")) if (strncaseeq(type, "ecdsa", strlen("ecdsa")))
{ {
key_type = KEY_ECDSA; key_type = KEY_ECDSA;
} }
else if (strcaseeq(type, "rsa")) else if (strncaseeq(type, "rsa", strlen("rsa")))
{ {
key_type = KEY_RSA; key_type = KEY_RSA;
} }