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

(krb5_get_init_creds_opt_set_pkinit): add prompter argument and use it

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13607 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-03-21 18:47:29 +00:00
parent c14cf91ac5
commit c762fbde59
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/krb5/pkinit.c
View File

@@ -1589,6 +1589,7 @@ ssl_pass_cb(char *buf, int size, int rwflag, void *u)
krb5_error_code ret; krb5_error_code ret;
krb5_prompt prompt; krb5_prompt prompt;
krb5_data password_data; krb5_data password_data;
krb5_prompter_fct prompter = u;
password_data.data = buf; password_data.data = buf;
password_data.length = size; password_data.length = size;
@@ -1597,7 +1598,7 @@ ssl_pass_cb(char *buf, int size, int rwflag, void *u)
prompt.reply = &password_data; prompt.reply = &password_data;
prompt.type = KRB5_PROMPT_TYPE_PASSWORD; prompt.type = KRB5_PROMPT_TYPE_PASSWORD;
ret = krb5_prompter_posix(NULL, NULL, NULL, NULL, 1, &prompt); ret = (*prompter)(NULL, NULL, NULL, NULL, 1, &prompt);
if (ret) { if (ret) {
memset (buf, 0, size); memset (buf, 0, size);
return 0; return 0;
@@ -1612,11 +1613,13 @@ _krb5_pk_load_openssl_id(krb5_context context,
const char *cert_file, const char *cert_file,
const char *key_file, const char *key_file,
const char *x509_anchors, const char *x509_anchors,
krb5_prompter_fct prompter,
char *password) char *password)
{ {
struct krb5_pk_identity *id = NULL; struct krb5_pk_identity *id = NULL;
STACK_OF(X509) *certificate = NULL, *trusted_certs = NULL; STACK_OF(X509) *certificate = NULL, *trusted_certs = NULL;
EVP_PKEY *private_key = NULL; EVP_PKEY *private_key = NULL;
int no_password;
krb5_error_code ret; krb5_error_code ret;
struct dirent *file; struct dirent *file;
char *dirname; char *dirname;
@@ -1679,9 +1682,12 @@ _krb5_pk_load_openssl_id(krb5_context context,
krb5_set_error_string(context, "open %s: %s", key_file, strerror(ret)); krb5_set_error_string(context, "open %s: %s", key_file, strerror(ret));
goto out; goto out;
} }
private_key = PEM_read_PrivateKey(f, NULL, if (password == NULL || password[0] == '\0') {
(password == NULL||password[0] == '\0') ? if (prompter == NULL)
ssl_pass_cb : NULL, password); prompter = krb5_prompter_posix;
private_key = PEM_read_PrivateKey(f, NULL, ssl_pass_cb, prompter);
else
private_key = PEM_read_PrivateKey(f, NULL, NULL, password);
fclose(f); fclose(f);
if (private_key == NULL) { if (private_key == NULL) {
krb5_set_error_string(context, "Can't read private key"); krb5_set_error_string(context, "Can't read private key");
@@ -1811,6 +1817,7 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
const char *key_file, const char *key_file,
const char *x509_anchors, const char *x509_anchors,
int flags, int flags,
krb5_prompter_fct prompter,
char *password) char *password)
{ {
#ifdef PKINIT #ifdef PKINIT
@@ -1833,6 +1840,7 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
cert_file, cert_file,
key_file, key_file,
x509_anchors, x509_anchors,
prompter,
password); password);
if (ret) { if (ret) {
free(opt->private->pk_init_ctx); free(opt->private->pk_init_ctx);