You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by kb...@apache.org on 2014/01/05 08:58:54 UTC
svn commit: r1555467 - /httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
Author: kbrand
Date: Sun Jan 5 07:58:54 2014
New Revision: 1555467
URL: http://svn.apache.org/r1555467
Log:
make the ppcb_arg initialization a bit more uniform and easier to read
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c?rev=1555467&r1=1555466&r2=1555467&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c Sun Jan 5 07:58:54 2014
@@ -143,24 +143,10 @@ apr_status_t ssl_load_encrypted_pkey(ser
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
- };
-
- 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 *);
+ pphrase_cb_arg_t ppcb_arg;
+
+ 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(ser
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