ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

swanctl: Allow specifying pubkeys directly via 0x/0s prefix

This commit is contained in:
Tobias Brunner 2017-01-18 17:46:27 +01:00
parent bd6ef6be7e
commit 75665375b7
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/swanctl/commands/load_conns.c
View File

@ -98,13 +98,23 @@ static void add_list_key(vici_req_t *req, char *key, char *value)
static bool add_file_list_key(vici_req_t *req, char *key, char *value) static bool add_file_list_key(vici_req_t *req, char *key, char *value)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
chunk_t *map; chunk_t *map, blob;
char *token, buf[PATH_MAX]; char *token, buf[PATH_MAX];
bool ret = TRUE; bool ret = TRUE;
vici_begin_list(req, key); vici_begin_list(req, key);
enumerator = enumerator_create_token(value, ",", " "); enumerator = enumerator_create_token(value, ",", " ");
while (enumerator->enumerate(enumerator, &token)) while (enumerator->enumerate(enumerator, &token))
{
if (strcasepfx(token, "0x") || strcasepfx(token, "0s"))
{
blob = chunk_from_str(token + 2);
blob = strcasepfx(token, "0x") ? chunk_from_hex(blob, NULL)
: chunk_from_base64(blob, NULL);
vici_add_list_item(req, blob.ptr, blob.len);
chunk_free(&blob);
}
else
{ {
if (!path_absolute(token)) if (!path_absolute(token))
{ {
@ -127,7 +137,6 @@ static bool add_file_list_key(vici_req_t *req, char *key, char *value)
token = buf; token = buf;
} }
} }
map = chunk_map(token, FALSE); map = chunk_map(token, FALSE);
if (map) if (map)
{ {
@ -142,6 +151,7 @@ static bool add_file_list_key(vici_req_t *req, char *key, char *value)
break; break;
} }
} }
}
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
vici_end_list(req); vici_end_list(req);