www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

use ssl_asn1_keystr

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93913 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-13 18:59:56 +00:00
parent 07965e685f
commit e89fcb92f1
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/ssl/ssl_engine_init.c
View File

@@ -685,7 +685,7 @@ void ssl_init_ConfigureServer(server_rec *s,
ssl_log(s, SSL_LOG_INFO,
"Init: (%s) %s server certificate enables "
"Server Gated Cryptography (SGC)",
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"));
vhost_id, ssl_asn1_keystr(i));
}
if (SSL_X509_getBC(sc->pPublicCert[i], &is_ca, &pathlen)) {
@@ -694,7 +694,7 @@ void ssl_init_ConfigureServer(server_rec *s,
"Init: (%s) %s server certificate "
"is a CA certificate "
"(BasicConstraints: CA == TRUE !?)",
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"));
vhost_id, ssl_asn1_keystr(i));
}
if (pathlen > 0) {
@@ -702,8 +702,7 @@ void ssl_init_ConfigureServer(server_rec *s,
"Init: (%s) %s server certificate "
"is not a leaf certificate "
"(BasicConstraints: pathlen == %d > 0 !?)",
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"),
pathlen);
vhost_id, ssl_asn1_keystr(i), pathlen);
}
}
@@ -718,16 +717,14 @@ void ssl_init_ConfigureServer(server_rec *s,
"Init: (%s) %s server certificate "
"wildcard CommonName (CN) `%s' "
"does NOT match server name!?",
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"),
cp);
vhost_id, ssl_asn1_keystr(i), cp);
}
else if (strNE(s->server_hostname, cp)) {
ssl_log(s, SSL_LOG_WARN,
"Init: (%s) %s server certificate "
"CommonName (CN) `%s' "
"does NOT match server name!?",
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"),
cp);
vhost_id, ssl_asn1_keystr(i), cp);
}
}
}

3
modules/ssl/ssl_engine_pphrase.c
View File

@@ -336,7 +336,6 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
* are used to give a better idea as to what failed.
*/
if (pkey_mtime) {
const char *key_types[] = {"RSA", "DSA"};
int i;
for (i=0; i < SSL_AIDX_MAX; i++) {
@@ -349,7 +348,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
ssl_log(pServ, SSL_LOG_INFO,
"%s reusing existing "
"%s private key on restart",
cpVHostID, key_types[i]);
cpVHostID, ssl_asn1_keystr(i));
return;
}
}