You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/03/17 18:32:24 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_config.c ssl_engine_init.c ssl_engine_pphrase.c
wrowe 02/03/17 09:32:24
Modified: modules/ssl mod_ssl.h ssl_engine_config.c ssl_engine_init.c
ssl_engine_pphrase.c
Log:
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.]
Revision Changes Path
1.81 +2 -2 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mod_ssl.h 14 Mar 2002 23:31:23 -0000 1.80
+++ mod_ssl.h 17 Mar 2002 17:32:24 -0000 1.81
@@ -519,8 +519,8 @@
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;
1.39 +8 -8 httpd-2.0/modules/ssl/ssl_engine_config.c
Index: ssl_engine_config.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ssl_engine_config.c 16 Mar 2002 19:45:45 -0000 1.38
+++ ssl_engine_config.c 17 Mar 2002 17:32:24 -0000 1.39
@@ -174,10 +174,10 @@
sc->pSSLProxyCtx = NULL;
#endif
- memset(sc->szPublicCertFile, 0, sizeof(sc->szPublicCertFile));
- memset(sc->szPrivateKeyFile, 0, sizeof(sc->szPrivateKeyFile));
- memset(sc->pPublicCert, 0, sizeof(sc->pPublicCert));
- memset(sc->pPrivateKey, 0, sizeof(sc->pPrivateKey));
+ 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));
return sc;
}
@@ -214,8 +214,8 @@
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 @@
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;
}
1.61 +3 -3 httpd-2.0/modules/ssl/ssl_engine_init.c
Index: ssl_engine_init.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ssl_engine_init.c 13 Mar 2002 20:47:54 -0000 1.60
+++ ssl_engine_init.c 17 Mar 2002 17:32:24 -0000 1.61
@@ -417,7 +417,7 @@
* 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 @@
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;
}
1.28 +5 -5 httpd-2.0/modules/ssl/ssl_engine_pphrase.c
Index: ssl_engine_pphrase.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_pphrase.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ssl_engine_pphrase.c 14 Mar 2002 22:19:14 -0000 1.27
+++ ssl_engine_pphrase.c 17 Mar 2002 17:32:24 -0000 1.28
@@ -208,7 +208,7 @@
* 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 @@
}
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 @@
* 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