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)) {
"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) {
"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);
}
}
"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);
}
}
}
* 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++) {
ssl_log(pServ, SSL_LOG_INFO,
"%s reusing existing "
"%s private key on restart",
- cpVHostID, key_types[i]);
+ cpVHostID, ssl_asn1_keystr(i));
return;
}
}