[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-69-gf2302e7

[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=f2302e7902a5bf93b6f8c4d45bd1f116fac6594b

The branch, master has been updated
       via  f2302e7902a5bf93b6f8c4d45bd1f116fac6594b (commit)
       via  edf0dd60490a40cc2335cfaf18cc86258a25ea13 (commit)
       via  9711cc6e9925d09e1c955c2038d302d784f8b39f (commit)
      from  fe2212f20d438b0704c7b0c08c22f145727cd44a (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 f2302e7902a5bf93b6f8c4d45bd1f116fac6594b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Nov 10 22:58:20 2011 +0100

    account for error code 1 in certtool.

commit edf0dd60490a40cc2335cfaf18cc86258a25ea13
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Nov 10 22:58:09 2011 +0100

    document updates

commit 9711cc6e9925d09e1c955c2038d302d784f8b39f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Nov 10 22:50:55 2011 +0100

    Reduce pad.

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

Summary of changes:
 NEWS                |    3 +++
 lib/gnutls_cipher.c |    4 ++--
 tests/suite/chain   |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 644e3e3..aa24774 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
 
 * Version 3.0.8 (unreleased)
 
+** certtool: Certtool -e returns error code on verification
+failure.
+
 ** libgnutls: Corrected ECC key generation (introduced in 3.0.6)
 
 ** libgnutls: Provide less timing information when decoding
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index d5279ef..ed4ac8b 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -533,7 +533,7 @@ ciphertext_to_compressed (gnutls_session_t session,
         return gnutls_assert_val(ret);
 
       pad = ciphertext->data[ciphertext->size - 1] + 1;   /* pad */
-      
+
       if ((int) pad > (int) ciphertext->size - tag_size)
         {
           gnutls_assert ();
@@ -544,7 +544,7 @@ ciphertext_to_compressed (gnutls_session_t session,
            * the pad_failed. If zero means success.
            */
           pad_failed = GNUTLS_E_DECRYPTION_FAILED;
-          pad = (int) ciphertext->size - tag_size;
+          pad %= blocksize;
         }
 
       length = ciphertext->size - tag_size - pad;
diff --git a/tests/suite/chain b/tests/suite/chain
index ca3468d..99b62e5 100755
--- a/tests/suite/chain
+++ b/tests/suite/chain
@@ -43,7 +43,7 @@ while test -d X509tests/test$i; do
     find X509tests/test$i -name T*.crt -print0 |sort -r -z|xargs -n1 --null 
$CERTTOOL --certificate-info --inder --infile >> chains/chain$i.pem 2>/dev/null
     $CERTTOOL -e --infile chains/chain$i.pem > out 2>&1
     rc=$?
-    if test $rc != 0; then
+    if test $rc != 0 -a $rc != 1; then
        echo "Chain $i FATAL failure."
        RET=1
     else


hooks/post-receive
-- 
GNU gnutls