mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-12 09:50:29 +00:00
Code Issues Releases Wiki Activity

S2S-TLS/GnuTLS: Fix handling of certificate information for incoming connections

Browse Source 
Show proper certificate information for incoming connections, too, and
not "peer did not present a certificate", regardless if the client sent
a certificate or not.

This change is for GnuTLS and similar to what was implemented in commit
for OpenSSL in "S2S-TLS/OpenSSL: Fix handling of certificate information
for incoming connections".
This commit is contained in:
Alexander Barton 2024-01-05 22:29:40 +01:00
parent 0e176b5570
commit 509ff60326
1 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/ngircd/conn-ssl.c
View File

@ -747,6 +747,7 @@ ConnSSL_PrepareConnect(CONNECTION * c, CONF_SERVER * s)
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
int err; int err;
(void)s;
err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_CLIENT); err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_CLIENT);
if (err) { if (err) {
Log(LOG_ERR, "Failed to initialize new SSL session: %s", Log(LOG_ERR, "Failed to initialize new SSL session: %s",
@ -996,29 +997,8 @@ ConnSSL_LogCertInfo( CONNECTION * c, bool connect)
gnutls_cipher_get_name(cipher), gnutls_cipher_get_name(cipher),
gnutls_mac_get_name(gnutls_mac_get(sess))); gnutls_mac_get_name(gnutls_mac_get(sess)));
cred = gnutls_auth_get_type(c->ssl_state.gnutls_session); cred = gnutls_auth_get_type(c->ssl_state.gnutls_session);
if (cred == GNUTLS_CRD_CERTIFICATE && connect) { if (cred == GNUTLS_CRD_CERTIFICATE) {
cert_seen = true; cert_seen = true;
int verify =
gnutls_certificate_verify_peers2(c->
ssl_state.gnutls_session,
&status);
if (verify < 0) {
Log(LOG_ERR,
"gnutls_certificate_verify_peers2 failed: %s",
gnutls_strerror(verify));
goto done_cn_validation;
} else if (status) {
gnutls_datum_t out;
if (gnutls_certificate_verification_status_print
(status, gnutls_certificate_type_get(sess), &out,
0) == GNUTLS_E_SUCCESS) {
Log(LOG_ERR,
"Certificate validation failed: %s",
out.data);
gnutls_free(out.data);
}
}
gnutls_x509_crt_t cert; gnutls_x509_crt_t cert;
unsigned cert_list_size; unsigned cert_list_size;
@ -1042,6 +1022,30 @@ ConnSSL_LogCertInfo( CONNECTION * c, bool connect)
gnutls_strerror(err)); gnutls_strerror(err));
goto done_cn_validation; goto done_cn_validation;
} }
if (connect) {
int verify =
gnutls_certificate_verify_peers2(c->
ssl_state.gnutls_session,
&status);
if (verify < 0) {
Log(LOG_ERR,
"gnutls_certificate_verify_peers2 failed: %s",
gnutls_strerror(verify));
goto done_cn_validation;
} else if (status) {
gnutls_datum_t out;
if (gnutls_certificate_verification_status_print
(status, gnutls_certificate_type_get(sess), &out,
0) == GNUTLS_E_SUCCESS) {
Log(LOG_ERR,
"Certificate validation failed: %s",
out.data);
gnutls_free(out.data);
}
}
err = gnutls_x509_crt_check_hostname(cert, c->host); err = gnutls_x509_crt_check_hostname(cert, c->host);
if (err == 0) if (err == 0)
Log(LOG_ERR, Log(LOG_ERR,
@ -1050,9 +1054,14 @@ ConnSSL_LogCertInfo( CONNECTION * c, bool connect)
else else
cert_ok = verify == 0 && status == 0; cert_ok = verify == 0 && status == 0;
snprintf(msg, sizeof(msg), "%svalid peer certificate", snprintf(msg, sizeof(msg), "Got %svalid server certificate",
cert_ok ? "" : "in"); cert_ok ? "" : "in");
LogGnuTLS_CertInfo(cert_ok ? LOG_DEBUG : LOG_ERR, cert, msg); LogGnuTLS_CertInfo(LOG_INFO, cert, msg);
} else {
/* Incoming connection. Please see comments for OpenSSL! */
LogGnuTLS_CertInfo(LOG_INFO, cert,
"Got unchecked peer certificate");
}
gnutls_x509_crt_deinit(cert); gnutls_x509_crt_deinit(cert);
done_cn_validation: done_cn_validation: