diff options
| -rw-r--r-- | nss_engine_cipher.c | 1 | ||||
| -rw-r--r-- | nss_engine_init.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/nss_engine_cipher.c b/nss_engine_cipher.c index 258150a..5ea1f53 100644 --- a/nss_engine_cipher.c +++ b/nss_engine_cipher.c @@ -233,7 +233,6 @@ static int parse_openssl_ciphers(server_rec *s, char *ciphers, PRBool cipher_lis * So we need to disable all the NULL ciphers too. */ int mask = SSL_aNULL | SSL_eNULL; - PRBool enabled; found = PR_TRUE; for (i=0; i < ciphernum; i++) { if (cipher_list[i] != -1) diff --git a/nss_engine_init.c b/nss_engine_init.c index 5ed277a..75a0b8b 100644 --- a/nss_engine_init.c +++ b/nss_engine_init.c @@ -16,6 +16,7 @@ #include "mod_nss.h" #include "nss_engine_cipher.h" #include "apr_thread_proc.h" +#include "apr_strings.h" #include "mpm_common.h" #if AP_SERVER_MINORVERSION_NUMBER <= 2 #include "ap_mpm.h" @@ -184,8 +185,8 @@ static void nss_init_SSLLibrary(server_rec *base_server, apr_pool_t *p) nss_log_nss_error(APLOG_MARK, APLOG_ERR, base_server); apr_snprintf(keypath, 1024, "%s/key3.db", mc->pCertificateDatabase); - if (rv = apr_stat(&finfo, keypath, APR_FINFO_PROT | APR_FINFO_OWNER, p) - == APR_SUCCESS) { + if ((rv = apr_stat(&finfo, keypath, APR_FINFO_PROT | APR_FINFO_OWNER, + p)) == APR_SUCCESS) { if (((user_id == finfo.user) && (!(finfo.protection & APR_FPROT_UREAD))) || ((gid == finfo.group) && @@ -373,7 +374,7 @@ int nss_init_Module(apr_pool_t *p, apr_pool_t *plog, sc->vhost_id_len = strlen(sc->vhost_id); if (sc->sni && sc->server->nickname != NULL && sc->vhost_id != NULL) { - split_vhost_id = apr_strtok(sc->vhost_id, ":", &last1); + split_vhost_id = apr_strtok((char *)sc->vhost_id, ":", &last1); ap_str_tolower(split_vhost_id); addHashVhostNick(split_vhost_id, (char *)sc->server->nickname); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, @@ -1091,7 +1092,6 @@ static void nss_init_certificate(server_rec *s, const char *nickname, int sni, const CERTCertList* clist) { - SSLModConfigRec *mc = myModConfig(s); SECCertTimeValidity certtimestatus; SECStatus secstatus; @@ -1188,7 +1188,7 @@ static void nss_init_certificate(server_rec *s, const char *nickname, ap_str_tolower(wild_name[j]); addHashVhostNick(wild_name[j], (char *)nickname); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, - "SNI wildcard: %s -> %s", wild_name[i], nickname); + "SNI wildcard: %s -> %s", wild_name[j], nickname); } } |