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

stroke: Add second password if provided

Browse Source
This commit is contained in:
Tobias Brunner
2013-05-08 15:02:41 +02:00
parent b7aa6b789e
commit 6040eff900
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_cred.c
+13
View File
@@ -921,6 +921,19 @@ static bool load_from_file(chunk_t line, int line_nr, FILE *prompt,
shared = shared_key_create(SHARED_PRIVATE_KEY_PASS, secret); shared = shared_key_create(SHARED_PRIVATE_KEY_PASS, secret);
mem = mem_cred_create(); mem = mem_cred_create();
mem->add_shared(mem, shared, NULL); mem->add_shared(mem, shared, NULL);
if (eat_whitespace(&line))
{ /* if there is a second passphrase add that too, could be needed for
* PKCS#12 files using different passwords for MAC and encryption */
ugh = extract_secret(&secret, &line);
if (ugh != NULL)
{
DBG1(DBG_CFG, "line %d: malformed passphrase: %s", line_nr, ugh);
mem->destroy(mem);
return FALSE;
}
shared = shared_key_create(SHARED_PRIVATE_KEY_PASS, secret);
mem->add_shared(mem, shared, NULL);
}
lib->credmgr->add_local_set(lib->credmgr, &mem->set, FALSE); lib->credmgr->add_local_set(lib->credmgr, &mem->set, FALSE);
*result = lib->creds->create(lib->creds, type, subtype, *result = lib->creds->create(lib->creds, type, subtype,