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

stroke: Fix prompt and error messages in passphrase callback

Browse Source
This commit is contained in:
Tobias Brunner
2013-05-08 15:02:41 +02:00
parent 7971278c92
commit e240b03e68
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_cred.c
+13 -11
View File
@@ -602,6 +602,8 @@ static err_t extract_secret(chunk_t *secret, chunk_t *line)
typedef struct { typedef struct {
/** socket we use for prompting */ /** socket we use for prompting */
FILE *prompt; FILE *prompt;
/** type of secret to unlock */
int type;
/** private key file */ /** private key file */
char *path; char *path;
/** number of tries */ /** number of tries */
@@ -609,12 +611,12 @@ typedef struct {
} passphrase_cb_data_t; } passphrase_cb_data_t;
/** /**
* Callback function to receive Passphrases * Callback function to receive passphrases
*/ */
static shared_key_t* passphrase_cb(passphrase_cb_data_t *data, static shared_key_t* passphrase_cb(passphrase_cb_data_t *data,
shared_key_type_t type, shared_key_type_t type, identification_t *me,
identification_t *me, identification_t *other, identification_t *other, id_match_t *match_me,
id_match_t *match_me, id_match_t *match_other) id_match_t *match_other)
{ {
chunk_t secret; chunk_t secret;
char buf[256]; char buf[256];
@@ -628,13 +630,15 @@ static shared_key_t* passphrase_cb(passphrase_cb_data_t *data,
{ {
if (data->try > 5) if (data->try > 5)
{ {
fprintf(data->prompt, "PIN invalid, giving up.\n"); fprintf(data->prompt, "Passphrase invalid, giving up.\n");
return NULL; return NULL;
} }
fprintf(data->prompt, "PIN invalid!\n"); fprintf(data->prompt, "Passphrase invalid!\n");
} }
data->try++; data->try++;
fprintf(data->prompt, "Private key '%s' is encrypted.\n", data->path); fprintf(data->prompt, "%s '%s' is encrypted.\n",
data->type == CRED_PRIVATE_KEY ? "Private key" : "PKCS#12 file",
data->path);
fprintf(data->prompt, "Passphrase:\n"); fprintf(data->prompt, "Passphrase:\n");
if (fgets(buf, sizeof(buf), data->prompt)) if (fgets(buf, sizeof(buf), data->prompt))
{ {
@@ -867,9 +871,10 @@ static bool load_from_file(chunk_t line, int line_nr, FILE *prompt,
} }
if (secret.len == 7 && strneq(secret.ptr, "%prompt", 7)) if (secret.len == 7 && strneq(secret.ptr, "%prompt", 7))
{ {
callback_cred_t *cb = NULL; callback_cred_t *cb;
passphrase_cb_data_t pp_data = { passphrase_cb_data_t pp_data = {
.prompt = prompt, .prompt = prompt,
.type = type,
.path = path, .path = path,
.try = 1, .try = 1,
}; };
@@ -881,9 +886,6 @@ static bool load_from_file(chunk_t line, int line_nr, FILE *prompt,
return TRUE; return TRUE;
} }
/* use callback credential set to prompt for the passphrase */ /* use callback credential set to prompt for the passphrase */
pp_data.prompt = prompt;
pp_data.path = path;
pp_data.try = 1;
cb = callback_cred_create_shared((void*)passphrase_cb, &pp_data); cb = callback_cred_create_shared((void*)passphrase_cb, &pp_data);
lib->credmgr->add_local_set(lib->credmgr, &cb->set, FALSE); lib->credmgr->add_local_set(lib->credmgr, &cb->set, FALSE);