[SCM] GNU gnutls branch, master, updated. gnutls_2_9_5-4-g4e60ed0

[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=4e60ed0235e413a199d1479e2bc78a9abedbb4d8

The branch, master has been updated
       via  4e60ed0235e413a199d1479e2bc78a9abedbb4d8 (commit)
      from  709c0ce4f6cf1df5ffc305721cb8ae34bcb61552 (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 4e60ed0235e413a199d1479e2bc78a9abedbb4d8
Author: Simon Josefsson <address@hidden>
Date:   Fri Sep 11 19:43:10 2009 +0200

    Add debug message.
    Tiny patch from Miroslav Kratochvil <address@hidden> in
    <http://thread.gmane.org/gmane.network.gnutls.general/1758>.

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

Summary of changes:
 lib/gnutls_cipher.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index 565a000..0d8c5e1 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software 
Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software 
Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -571,7 +571,10 @@ _gnutls_ciphertext2compressed (gnutls_session_t session,
    * 1.0 protocol.
    */
   if (pad_failed != 0)
-    return pad_failed;
+    {
+      gnutls_assert ();
+      return pad_failed;
+    }
 
   /* HMAC was not the same. 
    */


hooks/post-receive
-- 
GNU gnutls