Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 9948d4b2 9948d4b2b90276ca4e3aa5e3aa338209f9430d1f by Sergey Poznyakoff
Options

(mu_init_tls_server): Check return value from 

gnutls_certificate_set_x509_key_file(). Use gnutls_strerror(),
instead of gnutls_perror(), as the latter confuses mail clients.
(mu_init_tls_libs): Removed useless initialization of the auto
variable.
1 parent a228e028
Inline Side-by-side
Showing 1 changed file with 8 additions and 5 deletions
......@@ -145,8 +145,7 @@ mu_check_tls_environment (void)
int
mu_init_tls_libs (void)
{
int rs = 1;
rs = gnutls_global_init ();
int rs = gnutls_global_init ();
if (rs == 0) /* Reverse for tls_available */
rs = 1;
......@@ -199,9 +198,14 @@ mu_init_tls_server (int fd_in, int fd_out)
gnutls_certificate_set_x509_trust_file (x509_cred, ssl_cafile,
GNUTLS_X509_FMT_PEM);
gnutls_certificate_set_x509_key_file (x509_cred,
rs = gnutls_certificate_set_x509_key_file (x509_cred,
ssl_cert, ssl_key,
GNUTLS_X509_FMT_PEM);
if (rs < 0)
{
mu_error (_("cannot parse cerificate/key: %s"), gnutls_strerror (rs));
return 0;
}
generate_dh_params ();
gnutls_certificate_set_dh_params (x509_cred, dh_params);
......@@ -213,8 +217,7 @@ mu_init_tls_server (int fd_in, int fd_out)
if (rs < 0)
{
gnutls_deinit (session);
mu_error (_("TLS/SSL handshake failed!"));
gnutls_perror (rs);
mu_error (_("TLS/SSL handshake failed: %s"), gnutls_strerror (rs));
return 0; /* failed */
}
return (gnutls_session) session;
......