Commit 0c5bf485 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Add some appropriate constness to the config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90577 13f79535-47bb-0310-9956-ffa450edef68
parent 135dd15e

modules/ssl/mod_ssl.h

+17 −17
Original line number Diff line number Diff line
@@ -470,13 +470,13 @@ typedef struct { 
typedef struct {

    BOOL         bEnabled;

    apr_table_t *ap_server_ctx;

    char        *szPublicCertFile[SSL_AIDX_MAX];

    char        *szPrivateKeyFile[SSL_AIDX_MAX];

    char        *szCertificateChain;

    char        *szCACertificatePath;

    char        *szCACertificateFile;

    char        *szLogFile;

    char        *szCipherSuite;

    const char  *szPublicCertFile[SSL_AIDX_MAX];

    const char  *szPrivateKeyFile[SSL_AIDX_MAX];

    const char  *szCertificateChain;

    const char  *szCACertificatePath;

    const char  *szCACertificateFile;

    const char  *szLogFile;

    const char  *szCipherSuite;

    apr_file_t  *fileLogFile;

    int          nLogLevel;

    int          nVerifyDepth;
@@ -486,21 +486,21 @@ typedef struct { 
    SSL_CTX     *pSSLCtx;

    int          nSessionCacheTimeout;

    int          nPassPhraseDialogType;

    char        *szPassPhraseDialogPath;

    const char  *szPassPhraseDialogPath;

    ssl_proto_t  nProtocol;

    char        *szCARevocationPath;

    char        *szCARevocationFile;

    const char  *szCARevocationPath;

    const char  *szCARevocationFile;

    X509_STORE  *pRevocationStore;

#ifdef SSL_EXPERIMENTAL_PROXY

    /* Configuration details for proxy operation */

    ssl_proto_t  nProxyProtocol;

    int          bProxyVerify;

    int          nProxyVerifyDepth;

    char        *szProxyCACertificatePath;

    char        *szProxyCACertificateFile;

    char        *szProxyClientCertificateFile;

    char        *szProxyClientCertificatePath;

    char        *szProxyCipherSuite;

    const char  *szProxyCACertificatePath;

    const char  *szProxyCACertificateFile;

    const char  *szProxyClientCertificateFile;

    const char  *szProxyClientCertificatePath;

    const char  *szProxyCipherSuite;

    SSL_CTX     *pSSLProxyCtx;

    STACK_OF(X509_INFO) *skProxyClientCerts;

#endif
@@ -583,7 +583,7 @@ void ssl_init_TmpKeysHandle(int, server_rec *, apr_pool_t *); 
void         ssl_init_ConfigureServer(server_rec *, apr_pool_t *, SSLSrvConfigRec *);

void         ssl_init_CheckServers(server_rec *, apr_pool_t *);

STACK_OF(X509_NAME) 

            *ssl_init_FindCAList(server_rec *, apr_pool_t *, char *, char *);

            *ssl_init_FindCAList(server_rec *, apr_pool_t *, const char *, const char *);

void         ssl_init_Child(apr_pool_t *, server_rec *);

apr_status_t ssl_init_ChildKill(void *data);

apr_status_t ssl_init_ModuleKill(void *data);
@@ -713,7 +713,7 @@ void ssl_util_uuencode_binary(unsigned char *, const unsigned char *, in 
apr_file_t  *ssl_util_ppopen(server_rec *, apr_pool_t *, char *);

void         ssl_util_ppclose(server_rec *, apr_pool_t *, apr_file_t *);

char        *ssl_util_readfilter(server_rec *, apr_pool_t *, char *);

BOOL         ssl_util_path_check(ssl_pathcheck_t, char *, apr_pool_t *);

BOOL         ssl_util_path_check(ssl_pathcheck_t, const char *, apr_pool_t *);

ssl_algo_t   ssl_util_algotypeof(X509 *, EVP_PKEY *); 

char        *ssl_util_algotypestr(ssl_algo_t);

char        *ssl_util_ptxtsub(apr_pool_t *, const char *, const char *, char *);

modules/ssl/ssl_engine_config.c

+4 −4
Original line number Diff line number Diff line
@@ -172,10 +172,10 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s) 
    sc->pSSLProxyCtx                  = NULL;

#endif



    (void)memset(sc->szPublicCertFile, 0, SSL_AIDX_MAX*sizeof(char *));

    (void)memset(sc->szPrivateKeyFile, 0, SSL_AIDX_MAX*sizeof(char *));

    (void)memset(sc->pPublicCert, 0, SSL_AIDX_MAX*sizeof(X509 *));

    (void)memset(sc->pPrivateKey, 0, SSL_AIDX_MAX*sizeof(EVP_PKEY *));

    (void)memset((char*)sc->szPublicCertFile, 0, SSL_AIDX_MAX*sizeof(char *));

    (void)memset((char*)sc->szPrivateKeyFile, 0, SSL_AIDX_MAX*sizeof(char *));

    (void)memset((char*)sc->pPublicCert, 0, SSL_AIDX_MAX*sizeof(X509 *));

    (void)memset((char*)sc->pPrivateKey, 0, SSL_AIDX_MAX*sizeof(EVP_PKEY *));



    return sc;

}

modules/ssl/ssl_engine_init.c

+4 −4
Original line number Diff line number Diff line
@@ -606,8 +606,8 @@ void ssl_init_ConfigureServer(server_rec *s, apr_pool_t *p, SSLSrvConfigRec *sc) 
        ssl_log(s, SSL_LOG_TRACE,

                "Init: (%s) Configuring certificate revocation facility", cpVHostID);

        if ((sc->pRevocationStore =

                SSL_X509_STORE_create(sc->szCARevocationFile,

                                      sc->szCARevocationPath)) == NULL) {

                SSL_X509_STORE_create((char*)sc->szCARevocationFile,

                                      (char*)sc->szCARevocationPath)) == NULL) {

            ssl_log(s, SSL_LOG_ERROR|SSL_ADD_SSLERR,

                    "Init: (%s) Unable to configure X.509 CRL storage "

                    "for certificate revocation", cpVHostID);
@@ -804,7 +804,7 @@ void ssl_init_ConfigureServer(server_rec *s, apr_pool_t *p, SSLSrvConfigRec *sc) 
                break;

            }

        }

        if ((n = SSL_CTX_use_certificate_chain(ctx, sc->szCertificateChain, 

        if ((n = SSL_CTX_use_certificate_chain(ctx, (char*)sc->szCertificateChain, 

                                               bSkipFirst, NULL)) < 0) {

            ssl_log(s, SSL_LOG_ERROR,

                    "Init: (%s) Failed to configure CA certificate chain!", cpVHostID);
@@ -889,7 +889,7 @@ static int ssl_init_FindCAList_X509NameCmp(X509_NAME **a, X509_NAME **b) 
    return(X509_NAME_cmp(*a, *b));

}



STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s, apr_pool_t *pp, char *cpCAfile, char *cpCApath)

STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s, apr_pool_t *pp, const char *cpCAfile, const char *cpCApath)

{

    STACK_OF(X509_NAME) *skCAList;

    STACK_OF(X509_NAME) *sk;