[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-4-gec6e5a5

[Nikos Mavrogiannopoulos]

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=ec6e5a5f8893fa90888078807fdc490ba8081eb6

The branch, master has been updated
       via  ec6e5a5f8893fa90888078807fdc490ba8081eb6 (commit)
       via  2d1becd6bfaa085ac4e3d56a6d625379efb13892 (commit)
      from  b89083385bc30c2dce2516a5c98e544fb6eadc9b (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 ec6e5a5f8893fa90888078807fdc490ba8081eb6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 17 16:15:50 2012 +0100

    corrected ciphersuite number

commit 2d1becd6bfaa085ac4e3d56a6d625379efb13892
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Mar 17 14:09:21 2012 +0100

    Added debugging message when encounter an invalid ciphersuite.

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

Summary of changes:
 lib/algorithms/ciphersuites.c |    2 +-
 lib/gnutls_handshake.c        |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index 05709c1..3c5a79d 100644
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -205,7 +205,7 @@ typedef struct
 #define GNUTLS_ECDHE_RSA_AES_256_GCM_SHA384     {0xC0,0x30}
 
 /* SuiteB */
-#define GNUTLS_ECDHE_ECDSA_AES_256_GCM_SHA384   {0xC0,0x2E}
+#define GNUTLS_ECDHE_ECDSA_AES_256_GCM_SHA384   {0xC0,0x2C}
 #define GNUTLS_ECDHE_ECDSA_AES_256_CBC_SHA384   {0xC0,0x24}
 
 
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 3761b17..ee6c876 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -1383,6 +1383,7 @@ _gnutls_client_set_ciphersuite (gnutls_session_t session, 
uint8_t suite[2])
   if (z != 0)
     {
       gnutls_assert ();
+      _gnutls_debug_log("unsupported cipher suite %.2X.%.2X\n", (unsigned 
int)suite[0], (unsigned int)suite[1]);
       return GNUTLS_E_UNKNOWN_CIPHER_SUITE;
     }
 
@@ -3183,9 +3184,10 @@ _gnutls_remove_unwanted_ciphersuites (gnutls_session_t 
session,
       if (delete == 0)
         {
 
-          _gnutls_handshake_log ("HSK[%p]: Keeping ciphersuite: %s\n",
+          _gnutls_handshake_log ("HSK[%p]: Keeping ciphersuite: %s 
(%.2X.%.2X)\n",
                                  session,
-                                 _gnutls_cipher_suite_get_name 
(&cipher_suites[i]));
+                                 _gnutls_cipher_suite_get_name 
(&cipher_suites[i]),
+                                 cipher_suites[i], cipher_suites[i+1]);
 
           if (i != new_suites_size)
             memmove( &cipher_suites[new_suites_size], &cipher_suites[i], 2);


hooks/post-receive
-- 
GNU gnutls