mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
use ssl_asn1_keystr
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93913 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -685,7 +685,7 @@ void ssl_init_ConfigureServer(server_rec *s,
|
|||||||
ssl_log(s, SSL_LOG_INFO,
|
ssl_log(s, SSL_LOG_INFO,
|
||||||
"Init: (%s) %s server certificate enables "
|
"Init: (%s) %s server certificate enables "
|
||||||
"Server Gated Cryptography (SGC)",
|
"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)) {
|
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 "
|
"Init: (%s) %s server certificate "
|
||||||
"is a CA certificate "
|
"is a CA certificate "
|
||||||
"(BasicConstraints: CA == TRUE !?)",
|
"(BasicConstraints: CA == TRUE !?)",
|
||||||
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"));
|
vhost_id, ssl_asn1_keystr(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pathlen > 0) {
|
if (pathlen > 0) {
|
||||||
@@ -702,8 +702,7 @@ void ssl_init_ConfigureServer(server_rec *s,
|
|||||||
"Init: (%s) %s server certificate "
|
"Init: (%s) %s server certificate "
|
||||||
"is not a leaf certificate "
|
"is not a leaf certificate "
|
||||||
"(BasicConstraints: pathlen == %d > 0 !?)",
|
"(BasicConstraints: pathlen == %d > 0 !?)",
|
||||||
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"),
|
vhost_id, ssl_asn1_keystr(i), pathlen);
|
||||||
pathlen);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -718,16 +717,14 @@ void ssl_init_ConfigureServer(server_rec *s,
|
|||||||
"Init: (%s) %s server certificate "
|
"Init: (%s) %s server certificate "
|
||||||
"wildcard CommonName (CN) `%s' "
|
"wildcard CommonName (CN) `%s' "
|
||||||
"does NOT match server name!?",
|
"does NOT match server name!?",
|
||||||
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"),
|
vhost_id, ssl_asn1_keystr(i), cp);
|
||||||
cp);
|
|
||||||
}
|
}
|
||||||
else if (strNE(s->server_hostname, cp)) {
|
else if (strNE(s->server_hostname, cp)) {
|
||||||
ssl_log(s, SSL_LOG_WARN,
|
ssl_log(s, SSL_LOG_WARN,
|
||||||
"Init: (%s) %s server certificate "
|
"Init: (%s) %s server certificate "
|
||||||
"CommonName (CN) `%s' "
|
"CommonName (CN) `%s' "
|
||||||
"does NOT match server name!?",
|
"does NOT match server name!?",
|
||||||
vhost_id, (i == SSL_AIDX_RSA ? "RSA" : "DSA"),
|
vhost_id, ssl_asn1_keystr(i), cp);
|
||||||
cp);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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.
|
* are used to give a better idea as to what failed.
|
||||||
*/
|
*/
|
||||||
if (pkey_mtime) {
|
if (pkey_mtime) {
|
||||||
const char *key_types[] = {"RSA", "DSA"};
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i=0; i < SSL_AIDX_MAX; 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,
|
ssl_log(pServ, SSL_LOG_INFO,
|
||||||
"%s reusing existing "
|
"%s reusing existing "
|
||||||
"%s private key on restart",
|
"%s private key on restart",
|
||||||
cpVHostID, key_types[i]);
|
cpVHostID, ssl_asn1_keystr(i));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user