svn commit: r1554192 - /httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c

[fu...@apache.org]

Author: fuankg
Date: Mon Dec 30 11:31:37 2013
New Revision: 1554192

URL: http://svn.apache.org/r1554192
Log:
CodeWarrior compiler doesnt allow vars as struct inits.

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=1554192&r1=1554191&r2=1554192&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c Mon Dec 30 11:31:37 2013
@@ -144,18 +144,24 @@ apr_status_t ssl_load_encrypted_pkey(ser
     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);