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

stroke: Add certificates extracted from PKCS#12 files to correct credential set

Browse Source 
Only keys and shared secrets are moved from the temporary credential set after
loading all secrets.
This commit is contained in:
Tobias Brunner
2013-07-15 10:59:13 +02:00
parent e0b868f79e
commit 591f923134
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_cred.c
+4 -4
View File
@@ -975,8 +975,8 @@ static bool load_private(mem_cred_t *secrets, chunk_t line, int line_nr,
/** /**
* Load a PKCS#12 container * Load a PKCS#12 container
*/ */
static bool load_pkcs12(mem_cred_t *secrets, chunk_t line, int line_nr, static bool load_pkcs12(private_stroke_cred_t *this, mem_cred_t *secrets,
FILE *prompt) chunk_t line, int line_nr, FILE *prompt)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
char path[PATH_MAX]; char path[PATH_MAX];
@@ -1009,7 +1009,7 @@ static bool load_pkcs12(mem_cred_t *secrets, chunk_t line, int line_nr,
DBG1(DBG_CFG, " loaded certificate \"%Y\" from '%s'", DBG1(DBG_CFG, " loaded certificate \"%Y\" from '%s'",
cert->get_subject(cert), path); cert->get_subject(cert), path);
} }
secrets->add_cert(secrets, TRUE, cert->get_ref(cert)); this->creds->add_cert(this->creds, TRUE, cert->get_ref(cert));
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
enumerator = pkcs12->create_key_enumerator(pkcs12); enumerator = pkcs12->create_key_enumerator(pkcs12);
@@ -1243,7 +1243,7 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
} }
else if (match("P12", &token)) else if (match("P12", &token))
{ {
if (!load_pkcs12(secrets, line, line_nr, prompt)) if (!load_pkcs12(this, secrets, line, line_nr, prompt))
{ {
break; break;
} }