fix a compilation problem with gnutls.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
30 files changed:
flags.c filter.c from.c getdomain.c \
handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
init.c keymap.c lib.c \
flags.c filter.c from.c getdomain.c \
handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
init.c keymap.c lib.c \
- main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
+ main.c mbox.c mbyte.c mh.c muttlib.c mutt_idna.c mx.c \
pager.c pattern.c postpone.c query.c \
recvattach.c recvcmd.c rfc1524.c rfc3676.c \
score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
pager.c pattern.c postpone.c query.c \
recvattach.c recvcmd.c rfc1524.c rfc3676.c \
score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
mutt_idna.h mutt_libesmtp.c sidebar.h state.h
EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
mutt_idna.h mutt_libesmtp.c sidebar.h state.h
EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
- configure acconfig.h \
- account.h alias.h attach.h recvattach.h handler.h thread.h \
+ configure account.h alias.h attach.h recvattach.h handler.h thread.h \
buffy.h charset.h compress.h copy.h \
dotlock.h functions.def gen_defs \
recvattach.h handler.h thread.h \
globals.h history.h init.h keymap.h mutt_crypt.h \
buffy.h charset.h compress.h copy.h \
dotlock.h functions.def gen_defs \
recvattach.h handler.h thread.h \
globals.h history.h init.h keymap.h mutt_crypt.h \
- mime.h mutt.h mutt_menu.h \
- mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
+ mime.h mutt.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
rfc3676.h sort.h mime.types autogen.sh \
_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
rfc3676.h sort.h mime.types autogen.sh \
_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "lib/rx.h"
#include "lib/debug.h"
#include "mutt.h"
#include "mutt_idna.h"
#include "lib/rx.h"
#include "lib/debug.h"
#include "mutt.h"
#include "mutt_idna.h"
#include "sort.h"
#define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
#include "sort.h"
#define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
#include "keymap.h"
#include "rfc1524.h"
#include "pager.h"
#include "keymap.h"
#include "rfc1524.h"
#include "pager.h"
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "mx.h"
#include "mutt.h"
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include "browser.h"
#include "buffy.h"
#include "sort.h"
#include "browser.h"
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "recvattach.h"
#include "mutt.h"
#include "recvattach.h"
#include "sort.h"
#include "copy.h"
#include "mx.h"
#include "sort.h"
#include "copy.h"
#include "mx.h"
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "mutt_idna.h"
#include "mutt.h"
#include "mutt_idna.h"
#include "rfc1524.h"
#include "attach.h"
#include "recvattach.h"
#include "rfc1524.h"
#include "attach.h"
#include "recvattach.h"
#include <lib-lib/macros.h>
#include <lib-ui/curses.h>
#include <lib-lib/macros.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "sort.h"
#include "mx.h"
#include "sidebar.h"
#include "sort.h"
#include "mx.h"
#include "sidebar.h"
#include <lib-lib/mapping.h>
#include <lib-ui/curses.h>
#include <lib-lib/mapping.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "keymap.h"
#include <lib-crypt/crypt.h>
#include "keymap.h"
#include <lib-crypt/crypt.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include <lib-crypt/crypt.h>
#include "mutt.h"
#include <lib-crypt/crypt.h>
#include "handler.h"
#include "copy.h"
#include "pager.h"
#include "handler.h"
#include "copy.h"
#include "pager.h"
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "handler.h"
#include "mutt.h"
#include "handler.h"
#endif
#include "crypt.h"
#endif
#include "crypt.h"
char PgpPass[LONG_STRING];
char PgpPass[LONG_STRING];
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "recvattach.h"
#include "mutt.h"
#include "recvattach.h"
#include "pgp.h"
#include "pager.h"
#include "sort.h"
#include "pgp.h"
#include "pager.h"
#include "sort.h"
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "handler.h"
#include "mutt.h"
#include "handler.h"
#include "copy.h"
#include "lib/debug.h"
#include "copy.h"
#include "lib/debug.h"
noinst_LIBRARIES = libui.a
libui_a_SOURCES = curses.h \
noinst_LIBRARIES = libui.a
libui_a_SOURCES = curses.h \
- enter.h \
- enter.c color.c curs_lib.c curs_main.c
+ enter.h menu.h \
+ enter.c menu.c color.c curs_lib.c curs_main.c
-noinst_HEADERS = curses.h
+noinst_HEADERS = curses.h \
+ enter.h menu.h
#include <lib-lib/buffer.h>
#include <lib-lib/mapping.h>
#include <lib-lib/buffer.h>
#include <lib-lib/mapping.h>
-#include <lib-ui/curses.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include "curses.h"
+#include "menu.h"
+#include "enter.h"
#include "pager.h"
#include "mbyte.h"
#include "pager.h"
#include "mbyte.h"
#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
-#include <lib-ui/curses.h>
-
+#include "curses.h"
+#include "menu.h"
+
#include "mutt.h"
#include "mx.h"
#include "mutt.h"
#include "mx.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include "curses.h"
+#include "enter.h"
+#include "menu.h"
#include "keymap.h"
#include "history.h"
#include "buffy.h"
#include "keymap.h"
#include "history.h"
#include "buffy.h"
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include "curses.h"
+#include "enter.h"
+#include "menu.h"
#include "mbyte.h"
#include "sidebar.h"
#include "mbyte.h"
#include "sidebar.h"
#include <lib-lib/macros.h>
#include <lib-ui/curses.h>
#include <lib-lib/macros.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt_ssl.h"
#include "lib/debug.h"
#include "mutt_ssl.h"
#include "lib/debug.h"
#include <lib-lib/file.h>
#include <lib-ui/curses.h>
#include <lib-lib/file.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt_ssl.h"
#include "lib/rx.h"
#include "mutt_ssl.h"
#include "lib/rx.h"
gnutls_init (&data->state, GNUTLS_CLIENT);
/* set socket */
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)) {
/* 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;
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;
char datestr[30];
gnutls_x509_crt cert;
gnutls_datum pemdata;
- 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 */
}
/* We only support X.509 certificates (not OpenPGP) at the moment */
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "keymap.h"
#include "mutt.h"
#include "keymap.h"
#include "sort.h"
#include "pager.h"
#include "attach.h"
#include "sort.h"
#include "pager.h"
#include "attach.h"
#include <lib-mime/mime.h>
#include <lib-ui/enter.h>
#include <lib-mime/mime.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "handler.h"
#include "mutt.h"
#include "handler.h"
#include "rfc1524.h"
#include "sort.h"
#include "thread.h"
#include "rfc1524.h"
#include "sort.h"
#include "thread.h"
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/menu.h>
+
#include "mutt_idna.h"
#include "sort.h"
#include "mutt_idna.h"
#include "sort.h"
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
#include "rfc1524.h"
#include "attach.h"
#include "mx.h"
#include "rfc1524.h"
#include "attach.h"
#include "mx.h"
#include <lib-mime/mime-types.h>
#include <lib-mime/mime-types.h>
+#include <lib-ui/menu.h>
+
#include "attach.h"
void mutt_update_tree (ATTACHPTR **, short);
#include "attach.h"
void mutt_update_tree (ATTACHPTR **, short);
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "state.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt.h"
#include "state.h"
#include "handler.h"
#include "recvattach.h"
#include "rfc1524.h"
#include "attach.h"
#include "mx.h"
#include "rfc1524.h"
#include "attach.h"
#include "mx.h"
#include <lib-lib/mapping.h>
#include <lib-ui/curses.h>
#include <lib-lib/mapping.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "recvattach.h"
#include "mutt.h"
#include "recvattach.h"
#include <lib-lib/macros.h>
#include <lib-ui/curses.h>
#include <lib-lib/macros.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "sidebar.h"
#include "buffy.h"
#include "keymap.h"
#include "sidebar.h"
#include "buffy.h"
#include "keymap.h"
#include <lib-lib/mapping.h>
#include <lib-ui/curses.h>
#include <lib-lib/mapping.h>
#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
#include "sort.h"
#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include "mx.h"
#include "buffy.h"