mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-27 07:41:28 -08:00
29abe551a0
* lib-src/ebrowse.c (USAGE): Remove macro with too-long string literal ... (usage_message): ... and replace it with this new static constant containing multiple literals. All uses changed. * lib-src/emacsclient.c (print_help_and_exit): Rewrite to avoid string literals longer than the C89 limits. (start_daemon_and_retry_set_socket): Rewrite to avoid non-constant array initializer. * lib-src/make-docfile.c (enum global_type): Omit trailing comma. * src/bytecode.c (BYTE_CODE_THREADED): Do not define if __STRICT_ANSI__. (B__dummy__): New dummy symbol, to pacify C89. * src/dbusbind.c (XD_DEBUG_MESSAGE): Omit debugging on C89 hosts, since they can't grok varargs macros. * src/dispnew.c (add_window_display_history) (add_frame_display_history): * src/print.c (print_object): * src/xdisp.c (debug_method_add): Use %p printf format only for void pointers. * src/emacs.c (usage_message): New constant, replacing ... (USAGE1, USAGE2, USAGE3): Remove; they were too long for C89. (main): Adjust to usage reorg. * src/fns.c (syms_of_fns): * src/profiler.c (syms_of_profiler): Don't use non-constant struct initializers. * src/gnutls.h (gnutls_initstage_t): * src/lisp.h (enum Lisp_Fwd_Type): * src/lread.c (lisp_file_lexically_bound_p): * src/xsettings.c (anonymous enum): Remove trailing comma. * src/xsettings.c (apply_xft_settings): Use %f, not %lf; %lf is a C99ism. * src/lisp.h (ENUM_BF): Use unsigned if pedantic. (DEFUN_FUNCTION_INIT): New macro, that falls back on a cast if pre-C99. (DEFUN): Use it. * src/regex.c (const_re_char): New type, to pacify strict C89. All uses of 'const re_char' replaced to use it. * src/regex.h (_Restrict_): Rename from __restrict, to avoid clash with glibc when strict C89. This change is imported from gnulib. All uses changed. (_Restrict_arr_): Rename from __restrict_arr, similarly. * src/sysdep.c (time_from_jiffies) [!HAVE_LONG_LONG_INT]: Omit GNU_LINUX implementation, since it requires long long. * src/xterm.c (x_draw_underwave): Do not assume the traditional order of struct's members. (x_term_init): Rewrite to avoid the need for non-constant structure initializers.
74 lines
2.5 KiB
C
74 lines
2.5 KiB
C
/* GnuTLS glue for GNU Emacs.
|
|
Copyright (C) 2010-2013 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef EMACS_GNUTLS_DEFINED
|
|
#define EMACS_GNUTLS_DEFINED
|
|
|
|
#ifdef HAVE_GNUTLS
|
|
#include <gnutls/gnutls.h>
|
|
#include <gnutls/x509.h>
|
|
|
|
/* This limits the attempts to handshake per process (connection). */
|
|
#define GNUTLS_EMACS_HANDSHAKES_LIMIT 100
|
|
|
|
typedef enum
|
|
{
|
|
/* Initialization stages. */
|
|
GNUTLS_STAGE_EMPTY = 0,
|
|
GNUTLS_STAGE_CRED_ALLOC,
|
|
GNUTLS_STAGE_FILES,
|
|
GNUTLS_STAGE_CALLBACKS,
|
|
GNUTLS_STAGE_INIT,
|
|
GNUTLS_STAGE_PRIORITY,
|
|
GNUTLS_STAGE_CRED_SET,
|
|
|
|
/* Handshake stages. */
|
|
GNUTLS_STAGE_HANDSHAKE_CANDO = GNUTLS_STAGE_CRED_SET,
|
|
GNUTLS_STAGE_TRANSPORT_POINTERS_SET,
|
|
GNUTLS_STAGE_HANDSHAKE_TRIED,
|
|
|
|
GNUTLS_STAGE_READY
|
|
} gnutls_initstage_t;
|
|
|
|
#define GNUTLS_EMACS_ERROR_NOT_LOADED GNUTLS_E_APPLICATION_ERROR_MIN + 1
|
|
#define GNUTLS_EMACS_ERROR_INVALID_TYPE GNUTLS_E_APPLICATION_ERROR_MIN
|
|
|
|
#define GNUTLS_INITSTAGE(proc) (XPROCESS (proc)->gnutls_initstage)
|
|
|
|
#define GNUTLS_PROCESS_USABLE(proc) (GNUTLS_INITSTAGE(proc) >= GNUTLS_STAGE_READY)
|
|
|
|
#define GNUTLS_LOG(level, max, string) do { if (level <= max) { gnutls_log_function (level, "(Emacs) " string); } } while (0)
|
|
|
|
#define GNUTLS_LOG2(level, max, string, extra) do { if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } } while (0)
|
|
|
|
#define GNUTLS_LOG2i(level, max, string, extra) do { if (level <= max) { gnutls_log_function2i (level, "(Emacs) " string, extra); } } while (0)
|
|
|
|
extern ptrdiff_t
|
|
emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, ptrdiff_t nbyte);
|
|
extern ptrdiff_t
|
|
emacs_gnutls_read (struct Lisp_Process *proc, char *buf, ptrdiff_t nbyte);
|
|
|
|
extern int emacs_gnutls_record_check_pending (gnutls_session_t state);
|
|
extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err);
|
|
extern Lisp_Object emacs_gnutls_deinit (Lisp_Object);
|
|
|
|
extern void syms_of_gnutls (void);
|
|
|
|
#endif
|
|
|
|
#endif
|