aboutsummaryrefslogtreecommitdiffstats
path: root/src/gnutls.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gnutls.c')
-rw-r--r--src/gnutls.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index 4d248f86878..75fe6149a55 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -35,28 +35,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
35 35
36static bool emacs_gnutls_handle_error (gnutls_session_t, int); 36static bool emacs_gnutls_handle_error (gnutls_session_t, int);
37 37
38static Lisp_Object Qgnutls_dll;
39static Lisp_Object Qgnutls_code;
40static Lisp_Object Qgnutls_anon, Qgnutls_x509pki;
41static Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again,
42 Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake;
43static bool gnutls_global_initialized; 38static bool gnutls_global_initialized;
44 39
45/* The following are for the property list of `gnutls-boot'. */
46static Lisp_Object QCgnutls_bootprop_priority;
47static Lisp_Object QCgnutls_bootprop_trustfiles;
48static Lisp_Object QCgnutls_bootprop_keylist;
49static Lisp_Object QCgnutls_bootprop_crlfiles;
50static Lisp_Object QCgnutls_bootprop_callbacks;
51static Lisp_Object QCgnutls_bootprop_loglevel;
52static Lisp_Object QCgnutls_bootprop_hostname;
53static Lisp_Object QCgnutls_bootprop_min_prime_bits;
54static Lisp_Object QCgnutls_bootprop_verify_flags;
55static Lisp_Object QCgnutls_bootprop_verify_error;
56
57/* Callback keys for `gnutls-boot'. Unused currently. */
58static Lisp_Object QCgnutls_bootprop_callbacks_verify;
59
60static void gnutls_log_function (int, const char *); 40static void gnutls_log_function (int, const char *);
61static void gnutls_log_function2 (int, const char *, const char *); 41static void gnutls_log_function2 (int, const char *, const char *);
62#ifdef HAVE_GNUTLS3 42#ifdef HAVE_GNUTLS3
@@ -1656,13 +1636,14 @@ syms_of_gnutls (void)
1656 DEFSYM (Qgnutls_code, "gnutls-code"); 1636 DEFSYM (Qgnutls_code, "gnutls-code");
1657 DEFSYM (Qgnutls_anon, "gnutls-anon"); 1637 DEFSYM (Qgnutls_anon, "gnutls-anon");
1658 DEFSYM (Qgnutls_x509pki, "gnutls-x509pki"); 1638 DEFSYM (Qgnutls_x509pki, "gnutls-x509pki");
1639
1640 /* The following are for the property list of 'gnutls-boot'. */
1659 DEFSYM (QCgnutls_bootprop_hostname, ":hostname"); 1641 DEFSYM (QCgnutls_bootprop_hostname, ":hostname");
1660 DEFSYM (QCgnutls_bootprop_priority, ":priority"); 1642 DEFSYM (QCgnutls_bootprop_priority, ":priority");
1661 DEFSYM (QCgnutls_bootprop_trustfiles, ":trustfiles"); 1643 DEFSYM (QCgnutls_bootprop_trustfiles, ":trustfiles");
1662 DEFSYM (QCgnutls_bootprop_keylist, ":keylist"); 1644 DEFSYM (QCgnutls_bootprop_keylist, ":keylist");
1663 DEFSYM (QCgnutls_bootprop_crlfiles, ":crlfiles"); 1645 DEFSYM (QCgnutls_bootprop_crlfiles, ":crlfiles");
1664 DEFSYM (QCgnutls_bootprop_callbacks, ":callbacks"); 1646 DEFSYM (QCgnutls_bootprop_callbacks, ":callbacks");
1665 DEFSYM (QCgnutls_bootprop_callbacks_verify, "verify");
1666 DEFSYM (QCgnutls_bootprop_min_prime_bits, ":min-prime-bits"); 1647 DEFSYM (QCgnutls_bootprop_min_prime_bits, ":min-prime-bits");
1667 DEFSYM (QCgnutls_bootprop_loglevel, ":loglevel"); 1648 DEFSYM (QCgnutls_bootprop_loglevel, ":loglevel");
1668 DEFSYM (QCgnutls_bootprop_verify_flags, ":verify-flags"); 1649 DEFSYM (QCgnutls_bootprop_verify_flags, ":verify-flags");