From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.bugs Subject: bug#14774: 24.3.50; Warnings from gnutls under Fedora 19 Date: Mon, 07 Oct 2013 18:16:38 -0400 Organization: =?UTF-8?Q?=D0=A2=D0=B5=D0=BE=D0=B4=D0=BE=D1=80_?= =?UTF-8?Q?=D0=97=D0=BB=D0=B0=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= @ Cienfuegos Message-ID: <87y564zpyx.fsf@flea.lifelogs.com> References: <87r4fgy5bz.fsf@building.gnus.org> <87ehb7vo52.fsf@lifelogs.com> Reply-To: bug-gnu-emacs@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1381184233 21493 80.91.229.3 (7 Oct 2013 22:17:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 7 Oct 2013 22:17:13 +0000 (UTC) To: 14774@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Oct 08 00:17:16 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VTJ75-0007Y6-VH for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Oct 2013 00:17:16 +0200 Original-Received: from localhost ([::1]:33668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTJ75-00085E-AX for geb-bug-gnu-emacs@m.gmane.org; Mon, 07 Oct 2013 18:17:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTJ6x-000856-UG for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2013 18:17:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTJ6s-0005gX-P5 for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2013 18:17:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTJ6s-0005gT-M6 for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2013 18:17:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VTJ6s-0004XF-8c for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2013 18:17:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87r4fgy5bz.fsf@building.gnus.org> Resent-From: Ted Zlatanov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 07 Oct 2013 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14774 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.138118422117423 (code B ref -1); Mon, 07 Oct 2013 22:17:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 Oct 2013 22:17:01 +0000 Original-Received: from localhost ([127.0.0.1]:33014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VTJ6n-0004Wu-U8 for submit@debbugs.gnu.org; Mon, 07 Oct 2013 18:17:01 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50469) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VTJ6l-0004Wm-UD for submit@debbugs.gnu.org; Mon, 07 Oct 2013 18:16:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTJ6g-0005el-Bm for submit@debbugs.gnu.org; Mon, 07 Oct 2013 18:16:55 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:41009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTJ6g-0005ec-8U for submit@debbugs.gnu.org; Mon, 07 Oct 2013 18:16:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTJ6a-00084e-O6 for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2013 18:16:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTJ6V-0005cm-A4 for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2013 18:16:44 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:36931) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTJ6U-0005ce-QS for bug-gnu-emacs@gnu.org; Mon, 07 Oct 2013 18:16:39 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VTJ6S-0007Pz-SL for bug-gnu-emacs@gnu.org; Tue, 08 Oct 2013 00:16:36 +0200 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 08 Oct 2013 00:16:36 +0200 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 08 Oct 2013 00:16:36 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: bug-gnu-emacs@gnu.org Original-Lines: 132 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:AZBvs+bItDKutDY4CTxDSgH2fBE= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:78999 Archived-At: --=-=-= Content-Type: text/plain On Fri, 19 Jul 2013 15:45:53 +0200 Lars Magne Ingebrigtsen wrote: LMI> Ted Zlatanov writes: >> Aha, I found the problem. I'm setting the global log function, but not >> the global "audit log" function which is issuing these. That function >> was added in GnuTLS 2.99, after I worked on the GnuTLS integration for >> Emacs. >> >> I was planning on requiring GnuTLS 3.x anyhow, so perhaps this can be >> implemented with that rework instead of as a standalone change? LMI> Sure; if it's likely that that will happen before the next Emacs LMI> release. :-) Which I have no idea when is planned... Check out this patch, which sets the audit log function correctly if using GnuTLS 3.x and gives all audit messages level 1. Does it work for you? I will ask separately about requiring GnuTLS 3.x. Ted --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=gnutlsv3.patch === modified file 'configure.ac' --- configure.ac 2013-09-25 03:44:34 +0000 +++ configure.ac 2013-10-07 21:11:24 +0000 @@ -2425,12 +2425,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= @@ -4934,6 +4940,7 @@ echo " Does Emacs use access control lists? ${acl_summary}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" +echo " Does Emacs use -lgnutls v3 (HIGHLY RECOMMENDED)? ${HAVE_GNUTLS3}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" === modified file 'src/gnutls.c' --- src/gnutls.c 2013-01-02 16:13:04 +0000 +++ src/gnutls.c 2013-10-07 22:14:55 +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; --=-=-=--