Commit 9793c737 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Clear up a const warning, and recognize some arrays by changing the
  variable names to the plural [rather than aszFoo, which I hope continues
  to be cleaned up as folks have time.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@93982 13f79535-47bb-0310-9956-ffa450edef68
parent dfb559e6

mod_ssl.h

+2 −2
Changes for mod_ssl.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -519,8 +519,8 @@ typedef struct { 
    const char  *szVHostID;

    int          nVHostID_length;

    BOOL         bEnabled;

    const char  *szPublicCertFile[SSL_AIDX_MAX];

    const char  *szPrivateKeyFile[SSL_AIDX_MAX];

    const char  *szPublicCertFiles[SSL_AIDX_MAX];

    const char  *szPrivateKeyFiles[SSL_AIDX_MAX];

    const char  *szCertificateChain;

    const char  *szCACertificatePath;

    const char  *szCACertificateFile;

ssl_engine_config.c

+6 −6
Changes for ssl_engine_config.c: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s) 
    sc->pSSLProxyCtx                  = NULL;

#endif



    memset(sc->szPublicCertFile, 0, sizeof(sc->szPublicCertFile));

    memset(sc->szPrivateKeyFile, 0, sizeof(sc->szPrivateKeyFile));

    memset((void*)sc->szPublicCertFiles, 0, sizeof(sc->szPublicCertFiles));

    memset((void*)sc->szPrivateKeyFiles, 0, sizeof(sc->szPrivateKeyFiles));

    memset(sc->pPublicCert,       0, sizeof(sc->pPublicCert));

    memset(sc->pPrivateKey,       0, sizeof(sc->pPrivateKey));
@@ -214,8 +214,8 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv) 
    cfgMerge(pRevocationStore, NULL);



    for (i = 0; i < SSL_AIDX_MAX; i++) {

        cfgMergeString(szPublicCertFile[i]);

        cfgMergeString(szPrivateKeyFile[i]);

        cfgMergeString(szPublicCertFiles[i]);

        cfgMergeString(szPrivateKeyFiles[i]);

        cfgMerge(pPublicCert[i], NULL);

        cfgMerge(pPrivateKey[i], NULL);

    }
@@ -601,11 +601,11 @@ static const char *ssl_cmd_check_aidx_max(cmd_parms *parms, 
    switch (idx) {

      case SSL_AIDX_CERTS:

        desc = "certificates";

        files = sc->szPublicCertFile;

        files = sc->szPublicCertFiles;

        break;

      case SSL_AIDX_KEYS:

        desc = "private keys";

        files = sc->szPrivateKeyFile;

        files = sc->szPrivateKeyFiles;

        break;

    }

ssl_engine_init.c

+3 −3
Changes for ssl_engine_init.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ void ssl_init_ConfigureServer(server_rec *s, 
     * Now check for important parameters and the

     * possibility that the user forgot to set them.

     */

    if (!sc->szPublicCertFile[0]) {

    if (!sc->szPublicCertFiles[0]) {

        ssl_log(s, SSL_LOG_ERROR,

                "Init: (%s) No SSL Certificate set [hint: SSLCertificateFile]",

                vhost_id);
@@ -826,8 +826,8 @@ void ssl_init_ConfigureServer(server_rec *s, 
    if (sc->szCertificateChain) {

        BOOL skip_first = FALSE;



        for (i = 0; (i < SSL_AIDX_MAX) && sc->szPublicCertFile[i]; i++) {

            if (strEQ(sc->szPublicCertFile[i], sc->szCertificateChain)) {

        for (i = 0; (i < SSL_AIDX_MAX) && sc->szPublicCertFiles[i]; i++) {

            if (strEQ(sc->szPublicCertFiles[i], sc->szCertificateChain)) {

                skip_first = TRUE;

                break;

            }

ssl_engine_pphrase.c

+5 −5
Changes for ssl_engine_pphrase.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) 
         * Read in server certificate(s): This is the easy part

         * because this file isn't encrypted in any way.

         */

        if (sc->szPublicCertFile[0] == NULL) {

        if (sc->szPublicCertFiles[0] == NULL) {

            ssl_log(pServ, SSL_LOG_ERROR,

                    "Init: Server %s should be SSL-aware but has no certificate configured "

                    "[Hint: SSLCertificateFile]", cpVHostID);
@@ -216,9 +216,9 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) 
        }

        algoCert = SSL_ALGO_UNKNOWN;

        algoKey  = SSL_ALGO_UNKNOWN;

        for (i = 0, j = 0; i < SSL_AIDX_MAX && sc->szPublicCertFile[i] != NULL; i++) {

        for (i = 0, j = 0; i < SSL_AIDX_MAX && sc->szPublicCertFiles[i] != NULL; i++) {



            apr_cpystrn(szPath, sc->szPublicCertFile[i], sizeof(szPath));

            apr_cpystrn(szPath, sc->szPublicCertFiles[i], sizeof(szPath));

            if ( exists_and_readable(szPath, p, NULL) != APR_SUCCESS ) {

                ssl_log(s, SSL_LOG_ERROR|SSL_ADD_ERRNO,

                        "Init: Can't open server certificate file %s", szPath);
@@ -277,8 +277,8 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) 
             * phrase for all). When this is the case we can minimize the dialogs

             * by trying to re-use already known/entered pass phrases.

             */

            if (sc->szPrivateKeyFile[j] != NULL)

                apr_cpystrn(szPath, sc->szPrivateKeyFile[j++], sizeof(szPath));

            if (sc->szPrivateKeyFiles[j] != NULL)

                apr_cpystrn(szPath, sc->szPrivateKeyFiles[j++], sizeof(szPath));



            /*

             * Try to read the private key file with the help of