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;
}
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;
}
err = gnutls_certificate_allocate_credentials (&data->xcred);
if (err < 0) {
FREE (&conn->sockdata);
- mutt_error ("gnutls_certificate_allocate_credentials: %s",
+ 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;
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 (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 (mutt_strcmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
+ mutt_strcmp (linestr + pmatch[2].rm_so, buf) == 0) {
regfree (&preg);
FREE(&linestr);
fclose (fp);
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;
}