[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114625: Support GnuTLS v3 and set up its audit logg
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] trunk r114625: Support GnuTLS v3 and set up its audit logging properly. |
Date: |
Fri, 11 Oct 2013 13:47:29 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114625
revision-id: address@hidden
parent: address@hidden
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Fri 2013-10-11 09:47:35 -0400
message:
Support GnuTLS v3 and set up its audit logging properly.
* configure.ac: Define HAVE_GNUTLS3 if GnuTLS v3 is found.
* src/gnutls.c (gnutls_audit_log_function): Add function for GnuTLS
audit logging (only used with GnuTLS 3.x) and enable it.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/gnutls.c gnutls.c-20100926054902-dzayyj6wycit6kzn-3
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-10-10 00:37:44 +0000
+++ b/ChangeLog 2013-10-11 13:47:35 +0000
@@ -1,3 +1,7 @@
+2013-10-11 Teodor Zlatanov <address@hidden>
+
+ * configure.ac: Define HAVE_GNUTLS3 if GnuTLS v3 is found.
+
2013-10-10 Barry Fishman <address@hidden> (tiny change)
* configure.ac: Update for giflib 5. (Bug#15531)
=== modified file 'configure.ac'
--- a/configure.ac 2013-10-10 00:37:44 +0000
+++ b/configure.ac 2013-10-11 13:47:35 +0000
@@ -2422,12 +2422,18 @@
AC_SUBST(LIBSELINUX_LIBS)
HAVE_GNUTLS=no
+HAVE_GNUTLS3=no
if test "${with_gnutls}" = "yes" ; then
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes,
HAVE_GNUTLS=no)
+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.0], HAVE_GNUTLS3=yes,
HAVE_GNUTLS3=no)
if test "${HAVE_GNUTLS}" = "yes"; then
AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
fi
+ if test "${HAVE_GNUTLS3}" = "yes"; then
+ AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])
+ fi
+
# Windows loads GnuTLS dynamically
if test "${opsys}" = "mingw32"; then
LIBGNUTLS_LIBS=
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-10-11 11:11:28 +0000
+++ b/src/ChangeLog 2013-10-11 13:47:35 +0000
@@ -1,3 +1,8 @@
+2013-10-11 Teodor Zlatanov <address@hidden>
+
+ * gnutls.c (gnutls_audit_log_function): Add function for GnuTLS
+ audit logging (only used with GnuTLS 3.x) and enable it.
+
2013-10-11 Dmitry Antipov <address@hidden>
* dispnew.c (redraw_frame): Remove useless #ifdef because
=== modified file 'src/gnutls.c'
--- a/src/gnutls.c 2013-01-02 16:13:04 +0000
+++ b/src/gnutls.c 2013-10-11 13:47:35 +0000
@@ -55,6 +55,7 @@
static Lisp_Object QCgnutls_bootprop_callbacks_verify;
static void gnutls_log_function (int, const char *);
+static void gnutls_audit_log_function (gnutls_session_t, const char *);
static void gnutls_log_function2 (int, const char*, const char*);
@@ -108,6 +109,9 @@
DEF_GNUTLS_FN (int, gnutls_error_is_fatal, (int));
DEF_GNUTLS_FN (int, gnutls_global_init, (void));
DEF_GNUTLS_FN (void, gnutls_global_set_log_function, (gnutls_log_func));
+#ifdef HAVE_GNUTLS3
+DEF_GNUTLS_FN (void, gnutls_global_set_audit_log_function,
(gnutls_audit_log_func));
+#endif
DEF_GNUTLS_FN (void, gnutls_global_set_log_level, (int));
DEF_GNUTLS_FN (void, gnutls_global_set_mem_functions,
(gnutls_alloc_function, gnutls_alloc_function,
@@ -173,6 +177,9 @@
LOAD_GNUTLS_FN (library, gnutls_error_is_fatal);
LOAD_GNUTLS_FN (library, gnutls_global_init);
LOAD_GNUTLS_FN (library, gnutls_global_set_log_function);
+#ifdef HAVE_GNUTLS3
+ LOAD_GNUTLS_FN (library, gnutls_global_set_audit_log_function);
+#endif
LOAD_GNUTLS_FN (library, gnutls_global_set_log_level);
LOAD_GNUTLS_FN (library, gnutls_global_set_mem_functions);
LOAD_GNUTLS_FN (library, gnutls_handshake);
@@ -230,6 +237,9 @@
#define fn_gnutls_error_is_fatal gnutls_error_is_fatal
#define fn_gnutls_global_init gnutls_global_init
#define fn_gnutls_global_set_log_function gnutls_global_set_log_function
+#ifdef HAVE_GNUTLS3
+#define fn_gnutls_global_set_audit_log_function
gnutls_global_set_audit_log_function
+#endif
#define fn_gnutls_global_set_log_level gnutls_global_set_log_level
#define fn_gnutls_global_set_mem_functions gnutls_global_set_mem_functions
#define fn_gnutls_handshake gnutls_handshake
@@ -249,6 +259,16 @@
#endif /* !WINDOWSNT */
+/* Function to log a simple audit message. */
+static void
+gnutls_audit_log_function (gnutls_session_t session, const char* string)
+{
+ if (global_gnutls_log_level >= 1)
+ {
+ message ("gnutls.c: [audit] %s", string);
+ }
+}
+
/* Function to log a simple message. */
static void
gnutls_log_function (int level, const char* string)
@@ -797,6 +817,9 @@
if (TYPE_RANGED_INTEGERP (int, loglevel))
{
fn_gnutls_global_set_log_function (gnutls_log_function);
+#ifdef HAVE_GNUTLS3
+ fn_gnutls_global_set_audit_log_function (gnutls_audit_log_function);
+#endif
fn_gnutls_global_set_log_level (XINT (loglevel));
max_log_level = XINT (loglevel);
XPROCESS (proc)->gnutls_log_level = max_log_level;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114625: Support GnuTLS v3 and set up its audit logging properly.,
Teodor Zlatanov <=