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

Load ipsec.conf %smartcard leftcerts with pkcs11 builder

Browse Source
This commit is contained in:
Martin Willi
2012-10-24 13:07:52 +02:00
parent fbd3863571
commit 9687cb5100
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_cred.c
+20 -8
View File
@@ -133,20 +133,32 @@ METHOD(stroke_cred_t, load_peer, certificate_t*,
{ {
certificate_t *cert; certificate_t *cert;
char path[PATH_MAX]; char path[PATH_MAX];
chunk_t keyid;
if (*filename == '/') if (strneq(filename, "%smartcard:", strlen("%smartcard:")))
{ {
snprintf(path, sizeof(path), "%s", filename); keyid = chunk_create(filename, strlen(filename));
keyid = chunk_from_hex(chunk_skip(keyid, strlen("%smartcard:")), NULL);
cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509,
BUILD_PKCS11_KEYID, keyid, BUILD_END);
free(keyid.ptr);
} }
else else
{ {
snprintf(path, sizeof(path), "%s/%s", CERTIFICATE_DIR, filename); if (*filename == '/')
} {
snprintf(path, sizeof(path), "%s", filename);
}
else
{
snprintf(path, sizeof(path), "%s/%s", CERTIFICATE_DIR, filename);
}
cert = lib->creds->create(lib->creds, cert = lib->creds->create(lib->creds,
CRED_CERTIFICATE, CERT_ANY, CRED_CERTIFICATE, CERT_ANY,
BUILD_FROM_FILE, path, BUILD_FROM_FILE, path,
BUILD_END); BUILD_END);
}
if (cert) if (cert)
{ {
cert = this->creds->add_cert_ref(this->creds, TRUE, cert); cert = this->creds->add_cert_ref(this->creds, TRUE, cert);