oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Implement prompter.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16031 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-09-04 15:25:59 +00:00
parent 758311a77f
commit f1778e69af
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/hx509/lock.c
View File

@@ -33,11 +33,12 @@
#include "hx_locl.h" #include "hx_locl.h"
RCSID("$Id$"); RCSID("$Id$");
#include <openssl/ui.h>
struct hx509_lock_data { struct hx509_lock_data {
struct _hx509_password password; struct _hx509_password password;
hx509_certs certs; hx509_certs certs;
hx509_prompter_fct *prompt; hx509_prompter_fct prompt;
void *prompt_data; void *prompt_data;
}; };
@@ -147,7 +148,7 @@ _hx509_lock_find_cert(hx509_lock lock, const hx509_query *q, hx509_cert *c)
} }
int int
hx509_lock_set_prompter(hx509_lock lock, hx509_prompter_fct *prompt, void *data) hx509_lock_set_prompter(hx509_lock lock, hx509_prompter_fct prompt, void *data)
{ {
lock->prompt = prompt; lock->prompt = prompt;
lock->prompt_data = data; lock->prompt_data = data;
@@ -164,7 +165,24 @@ hx509_lock_reset_promper(hx509_lock lock)
static int static int
default_prompter(void *data, const hx509_prompt *prompter) default_prompter(void *data, const hx509_prompt *prompter)
{ {
return 1; if (prompter->hidden) {
if(UI_UTIL_read_pw_string(prompter->reply->data,
prompter->reply->length,
prompter->prompt,
0))
return 1;
} else {
char *s = prompter->reply->data;
fputs (prompter->prompt, stdout);
fflush (stdout);
if(fgets(prompter->reply->data,
prompter->reply->length,
stdin) == NULL)
return 1;
s[strcspn(s, "\n")] = '\0';
}
return 0;
} }
int int
@@ -189,7 +207,7 @@ hx509_lock_command_string(hx509_lock lock, const char *string)
{ {
if (strncasecmp(string, "PASS:", 5) == 0) { if (strncasecmp(string, "PASS:", 5) == 0) {
hx509_lock_add_password(lock, string + 5); hx509_lock_add_password(lock, string + 5);
} else if (strncasecmp(string, "PROMPT:", 8) == 0) { } else if (strncasecmp(string, "PROMPT", 6) == 0) {
hx509_lock_set_prompter(lock, default_prompter, NULL); hx509_lock_set_prompter(lock, default_prompter, NULL);
} else } else
return HX509_UNKNOWN_LOCK_COMMAND; return HX509_UNKNOWN_LOCK_COMMAND;