[SCM] GNU gnutls branch, master, updated. gnutls_2_11_4-2-gb8e117f

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=b8e117f259e5fe0578d9986e75c0f46ca76ac317

The branch, master has been updated
       via  b8e117f259e5fe0578d9986e75c0f46ca76ac317 (commit)
      from  cb662cd251ae82f769f65b6da74f8b990943a661 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b8e117f259e5fe0578d9986e75c0f46ca76ac317
Author: Simon Josefsson <address@hidden>
Date:   Sat Oct 16 08:57:08 2010 +0200

    gnutls-cli: Print channel binding only in verbose mode.
    
    Before it printed it after the 'Compression:' output, thus breaking
    Emacs starttls.el string searches.

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |    4 ++++
 src/common.c |   33 +++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index b87f11c..6887cef 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ See the end for copying conditions.
 
 * Version 2.11.5 (unreleased)
 
+** gnutls-cli: Print channel binding only in verbose mode.
+Before it printed it after the 'Compression:' output, thus breaking
+Emacs starttls.el string searches.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/src/common.c b/src/common.c
index b270cd5..661c770 100644
--- a/src/common.c
+++ b/src/common.c
@@ -488,23 +488,28 @@ print_info (gnutls_session_t session, const char 
*hostname, int insecure)
       printf ("- Session ID: %s\n", raw_to_string (id, id_size));
     }
 
-  {
-    gnutls_datum cb;
-    int rc;
+  if (verbose)
+    {
+      gnutls_datum cb;
+      int rc;
 
-    rc = gnutls_session_channel_binding (session, GNUTLS_CB_TLS_UNIQUE, &cb);
-    if (rc)
+      rc = gnutls_session_channel_binding (session, GNUTLS_CB_TLS_UNIQUE, &cb);
+      if (rc)
        fprintf (stderr, "Channel binding error: %s\n", gnutls_strerror (rc));
-    else
-      {
-       size_t i;
+      else
+       {
+         size_t i;
 
-       printf ("- Channel binding 'tls-unique': ");
-       for (i = 0; i < cb.size; i++)
-         printf ("%02x", cb.data[i]);
-       printf ("\n");
-      }
-  }
+         printf ("- Channel binding 'tls-unique': ");
+         for (i = 0; i < cb.size; i++)
+           printf ("%02x", cb.data[i]);
+         printf ("\n");
+       }
+    }
+
+  /* Warning: Do not print anything more here. The 'Compression:'
+     output MUST be the last non-verbose output.  This is used by
+     Emacs starttls.el code. */
 
   fflush (stdout);
 


hooks/post-receive
-- 
GNU gnutls