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

Support loading of certificate revocation lists

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:46 +01:00
parent 00d8b9a638
commit 90994a8a5c
1 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conftest/conftest.c
+47 -44
View File
@@ -86,14 +86,55 @@ static bool load_configs(char *suite_file, char *test_file)
return TRUE; return TRUE;
} }
/**
* Load trusted/untrusted certificates
*/
static bool load_trusted_cert(settings_t *settings, bool trusted)
{
enumerator_t *enumerator;
char *key, *value;
enumerator = settings->create_key_value_enumerator(settings,
trusted ? "certs.trusted" : "certs.untrusted");
while (enumerator->enumerate(enumerator, &key, &value))
{
certificate_t *cert = NULL;
if (strcaseeq(key, "x509"))
{
cert = lib->creds->create(lib->creds, CRED_CERTIFICATE,
CERT_X509, BUILD_FROM_FILE, value, BUILD_END);
}
else if (strcaseeq(key, "crl"))
{
cert = lib->creds->create(lib->creds, CRED_CERTIFICATE,
CERT_X509_CRL, BUILD_FROM_FILE, value, BUILD_END);
}
else
{
fprintf(stderr, "certificate type '%s' not supported\n", key);
enumerator->destroy(enumerator);
return FALSE;
}
if (!cert)
{
fprintf(stderr, "loading %strusted certificate '%s' from '%s' "
"failed\n", trusted ? "" : "un", key, value);
enumerator->destroy(enumerator);
return FALSE;
}
conftest->creds->add_cert(conftest->creds, trusted, cert);
}
enumerator->destroy(enumerator);
return TRUE;
}
/** /**
* Load certificates from the confiuguration file * Load certificates from the confiuguration file
*/ */
static bool load_certs(settings_t *settings, char *dir) static bool load_certs(settings_t *settings, char *dir)
{ {
enumerator_t *enumerator; char wd[PATH_MAX];
char *key, *value, wd[PATH_MAX];
certificate_t *cert;
if (getcwd(wd, sizeof(wd)) == NULL) if (getcwd(wd, sizeof(wd)) == NULL)
{ {
@@ -107,49 +148,11 @@ static bool load_certs(settings_t *settings, char *dir)
return FALSE; return FALSE;
} }
enumerator = settings->create_key_value_enumerator(settings, "certs.trusted"); if (!load_trusted_cert(settings, TRUE) ||
while (enumerator->enumerate(enumerator, &key, &value)) !load_trusted_cert(settings, FALSE))
{ {
if (!strcaseeq(key, "x509")) return FALSE;
{
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)
{
fprintf(stderr, "loading trusted certificate "
"'%s' from '%s' failed\n", key, value);
enumerator->destroy(enumerator);
return FALSE;
}
conftest->creds->add_cert(conftest->creds, TRUE, cert);
} }
enumerator->destroy(enumerator);
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)
{
fprintf(stderr, "loading untrusted certificate "
"'%s' from '%s' failed\n", key, value);
enumerator->destroy(enumerator);
return FALSE;
}
conftest->creds->add_cert(conftest->creds, FALSE, cert);
}
enumerator->destroy(enumerator);
if (chdir(wd) != 0) if (chdir(wd) != 0)
{ {