# include "config.h"
#endif
+#ifdef USE_GNUTLS
+
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
#ifdef HAVE_GNUTLS_OPENSSL_H
err = gnutls_global_init ();
if (err < 0) {
- mutt_error ("gnutls_global_init: %s", gnutls_strerror (err));
+ mutt_error (_("gnutls_global_init: %s"), gnutls_strerror (err));
mutt_sleep (2);
return -1;
}
return 0;
}
-int mutt_gnutls_socket_setup (CONNECTION * conn)
+int mutt_ssl_socket_setup (CONNECTION * conn)
{
if (tls_init () < 0)
return -1;
int ret;
if (!data) {
- mutt_error ("Error: no TLS socket open");
+ mutt_error (_("Error: no TLS socket open"));
mutt_sleep (2);
return -1;
}
ret = gnutls_record_recv (data->state, buf, len);
if (gnutls_error_is_fatal (ret) == 1) {
- mutt_error ("tls_socket_read (%s)", gnutls_strerror (ret));
+ mutt_error (_("tls_socket_read (%s)"), gnutls_strerror (ret));
mutt_sleep (4);
return -1;
}
int ret;
if (!data) {
- mutt_error ("Error: no TLS socket open");
+ mutt_error (_("Error: no TLS socket open"));
mutt_sleep (2);
return -1;
}
ret = gnutls_record_send (data->state, buf, len);
if (gnutls_error_is_fatal (ret) == 1) {
- mutt_error ("tls_socket_write (%s)", gnutls_strerror (ret));
+ mutt_error (_("tls_socket_write (%s)"), gnutls_strerror (ret));
mutt_sleep (4);
return -1;
}
return 0;
}
-int mutt_gnutls_starttls (CONNECTION * conn)
+int mutt_ssl_starttls (CONNECTION * conn)
{
if (tls_init () < 0)
return -1;
tlssockdata *data;
int err;
- data = (tlssockdata *) safe_calloc (1, sizeof (tlssockdata));
+ data = (tlssockdata *) mem_calloc (1, sizeof (tlssockdata));
conn->sockdata = data;
err = gnutls_certificate_allocate_credentials (&data->xcred);
if (err < 0) {
- FREE (&conn->sockdata);
- mutt_error ("gnutls_certificate_allocate_credentials: %s",
+ mem_free (&conn->sockdata);
+ mutt_error (_("gnutls_certificate_allocate_credentials: %s"),
gnutls_strerror (err));
mutt_sleep (2);
return -1;
}
if (err < 0) {
if (err == GNUTLS_E_FATAL_ALERT_RECEIVED) {
- mutt_error ("gnutls_handshake: %s(%s)", gnutls_strerror (err),
+ mutt_error (_("gnutls_handshake: %s(%s)"), gnutls_strerror (err),
gnutls_alert_get_name (gnutls_alert_get (data->state)));
}
else {
- mutt_error ("gnutls_handshake: %s", gnutls_strerror (err));
+ mutt_error (_("gnutls_handshake: %s"), gnutls_strerror (err));
}
mutt_sleep (2);
goto fail;
fail:
gnutls_certificate_free_credentials (data->xcred);
gnutls_deinit (data->state);
- FREE (&conn->sockdata);
+ mem_free (&conn->sockdata);
return -1;
}
gnutls_certificate_free_credentials (data->xcred);
gnutls_deinit (data->state);
- FREE(&conn->sockdata);
+ mem_free(&conn->sockdata);
}
return raw_socket_close (conn);
return 0;
b64_data.size = filestat.st_size + 1;
- b64_data_data = (unsigned char *) safe_calloc (1, b64_data.size);
+ b64_data_data = (unsigned char *) mem_calloc (1, b64_data.size);
b64_data_data[b64_data.size - 1] = '\0';
b64_data.data = b64_data_data;
do {
ret = gnutls_pem_base64_decode_alloc (NULL, &b64_data, &cert);
if (ret != 0) {
- FREE (&b64_data_data);
+ mem_free (&b64_data_data);
return 0;
}
- ptr = (unsigned char *) strstr (b64_data.data, CERT_SEP) + 1;
- ptr = (unsigned char *) strstr (ptr, CERT_SEP);
+ ptr = (unsigned char *) strstr ((char*) b64_data.data, CERT_SEP) + 1;
+ ptr = (unsigned char *) strstr ((char*) ptr, CERT_SEP);
b64_data.size = b64_data.size - (ptr - b64_data.data);
b64_data.data = ptr;
if (memcmp (cert.data, peercert->data, cert.size) == 0) {
/* match found */
gnutls_free (cert.data);
- FREE (&b64_data_data);
+ mem_free (&b64_data_data);
return 1;
}
}
} while (ptr != NULL);
/* no match found */
- FREE (&b64_data_data);
+ mem_free (&b64_data_data);
return 0;
}
if (regexec (&preg, linestr, 3, pmatch, 0) == 0) {
linestr[pmatch[1].rm_eo] = '\0';
linestr[pmatch[2].rm_eo] = '\0';
- if (safe_strcmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
- safe_strcmp (linestr + pmatch[2].rm_so, buf) == 0) {
+ if (str_cmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
+ str_cmp (linestr + pmatch[2].rm_so, buf) == 0) {
regfree (&preg);
- FREE(&linestr);
+ mem_free(&linestr);
fclose (fp);
return 1;
}
MUTTMENU *menu;
int done, row, i, ret;
FILE *fp;
- gnutls_x509_dn dn;
time_t t;
const gnutls_datum *cert_list;
- int cert_list_size = 0;
+ unsigned int cert_list_size = 0;
gnutls_certificate_status certstat;
char datestr[30];
gnutls_x509_crt cert;
/* We only support X.509 certificates (not OpenPGP) at the moment */
if (gnutls_certificate_type_get (state) != GNUTLS_CRT_X509) {
- mutt_error (_("Error certificate is not X.509"));
+ mutt_error (_("Certificate is not X.509"));
mutt_sleep (2);
return 0;
}
/* interactive check from user */
menu = mutt_new_menu ();
menu->max = 25;
- menu->dialog = (char **) safe_calloc (1, menu->max * sizeof (char *));
+ menu->dialog = (char **) mem_calloc (1, menu->max * sizeof (char *));
for (i = 0; i < menu->max; i++)
- menu->dialog[i] = (char *) safe_calloc (1, SHORT_STRING * sizeof (char));
+ menu->dialog[i] = (char *) mem_calloc (1, SHORT_STRING * sizeof (char));
row = 0;
strfcpy (menu->dialog[row], _("This certificate belongs to:"),
menu->help = helpstr;
done = 0;
+ set_option (OPTUNBUFFEREDINPUT);
while (!done) {
switch (mutt_menuLoop (menu)) {
case -1: /* abort */
break;
}
}
+ unset_option (OPTUNBUFFEREDINPUT);
mutt_menuDestroy (&menu);
gnutls_x509_crt_deinit (cert);
return (done == 2);
}
+
+#endif /* USE_GNUTLS */