#include <lib-lib/file.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "mutt_socket.h"
-#include "mutt_menu.h"
#include "mutt_ssl.h"
#include "lib/rx.h"
gnutls_init (&data->state, GNUTLS_CLIENT);
/* set socket */
- gnutls_transport_set_ptr (data->state, (gnutls_transport_ptr) conn->fd);
+ gnutls_transport_set_ptr (data->state, (gnutls_transport_ptr)(intptr_t)conn->fd);
/* disable TLS/SSL protocols as needed */
if (!option (OPTTLSV1) && !option (OPTSSLV3)) {
time_t t;
const gnutls_datum *cert_list;
unsigned int cert_list_size = 0;
- gnutls_certificate_status certstat;
+ gnutls_certificate_status_t certstat;
char datestr[30];
gnutls_x509_crt cert;
gnutls_datum pemdata;
return 0;
}
- certstat = gnutls_certificate_verify_peers (state);
-
- if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND) {
- mutt_error (_("Unable to get certificate from peer"));
- mutt_sleep (2);
- return 0;
- }
- if (certstat < 0) {
- mutt_error (_("Certificate verification error (%s)"),
- gnutls_strerror (certstat));
- mutt_sleep (2);
- return 0;
+ if (gnutls_certificate_verify_peers2(state, &certstat) < 0) {
+ mutt_error (_("Certificate verification error (%s)"),
+ gnutls_strerror(certstat));
+ mutt_sleep (2);
+ return 0;
}
/* We only support X.509 certificates (not OpenPGP) at the moment */