VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

make the ppcb_arg initialization a bit more uniform and easier to read

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1555467 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kaspar Brand
2014-01-05 07:58:54 +00:00
parent 43c947e307
commit 4c079f6ff3
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/ssl/ssl_engine_pphrase.c
View File

@ -143,24 +143,10 @@ apr_status_t ssl_load_encrypted_pkey(server_rec *s, apr_pool_t *p, int idx,
int nPassPhraseRetry = 0;
apr_time_t pkey_mtime = 0;
apr_status_t rv;
pphrase_cb_arg_t ppcb_arg = {
NULL,
NULL,
NULL,
0,
NULL,
0,
0,
TRUE,
NULL,
NULL
};
pphrase_cb_arg_t ppcb_arg;
ppcb_arg.s = s;
ppcb_arg.p = p;
ppcb_arg.aPassPhrase = *pphrases;
ppcb_arg.key_id = key_id;
ppcb_arg.pkey_file = APR_ARRAY_IDX(sc->server->pks->key_files, idx, const char *);
ppcb_arg.pkey_file = APR_ARRAY_IDX(sc->server->pks->key_files, idx,
const char *);
if (!ppcb_arg.pkey_file) {
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02573)
@ -175,6 +161,16 @@ apr_status_t ssl_load_encrypted_pkey(server_rec *s, apr_pool_t *p, int idx,
return ssl_die(s);
}
ppcb_arg.s = s;
ppcb_arg.p = p;
ppcb_arg.aPassPhrase = *pphrases;
ppcb_arg.nPassPhraseCur = 0;
ppcb_arg.cpPassPhraseCur = NULL;
ppcb_arg.nPassPhraseDialog = 0;
ppcb_arg.nPassPhraseDialogCur = 0;
ppcb_arg.bPassPhraseDialogOnce = TRUE;
ppcb_arg.key_id = key_id;
/*
* if the private key is encrypted and SSLPassPhraseDialog
* is configured to "builtin" it isn't possible to prompt for