diff options
| author | Guenter Knauf <fuankg@apache.org> | 2013-12-30 12:31:37 +0100 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2013-12-30 12:31:37 +0100 |
| commit | 162153718f8fd0d5b3a4c1bf8cc1098b73b57a98 (patch) | |
| tree | ec8eb1083d707cb3589c7becd7802f808ab82461 /modules/ssl/ssl_engine_pphrase.c | |
| parent | [trunk][doc] Introducing .fr translation for mod/mod_charset_lite.xml (diff) | |
| download | apache2-162153718f8fd0d5b3a4c1bf8cc1098b73b57a98.tar.xz apache2-162153718f8fd0d5b3a4c1bf8cc1098b73b57a98.zip | |
CodeWarrior compiler doesnt allow vars as struct inits.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554192 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/ssl_engine_pphrase.c')
| -rw-r--r-- | modules/ssl/ssl_engine_pphrase.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c index 4d06c4fe03..64fdae7aff 100644 --- a/modules/ssl/ssl_engine_pphrase.c +++ b/modules/ssl/ssl_engine_pphrase.c @@ -144,18 +144,24 @@ apr_status_t ssl_load_encrypted_pkey(server_rec *s, apr_pool_t *p, int idx, apr_time_t pkey_mtime = 0; apr_status_t rv; pphrase_cb_arg_t ppcb_arg = { - s, - p, - *pphrases, + NULL, + NULL, + NULL, 0, NULL, 0, 0, TRUE, - key_id, - APR_ARRAY_IDX(sc->server->pks->key_files, idx, const char *) + 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 *); + if (!ppcb_arg.pkey_file) { ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02573) "Init: No private key specified for %s", key_id); |