[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_7_a-6-g75e1848

[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=75e1848168063a8d207a9d1a49342970313178de

The branch, gnutls_2_12_x has been updated
       via  75e1848168063a8d207a9d1a49342970313178de (commit)
       via  834e4997dc738721954a0d688a85f633a128d945 (commit)
       via  12fb2da52e63c104b1c92932745d1d231d72c32b (commit)
      from  01c4439909aab068e4549b9330528aa71d5ba69a (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 75e1848168063a8d207a9d1a49342970313178de
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Jul 25 19:18:06 2011 +0200

    documented fixes.

commit 834e4997dc738721954a0d688a85f633a128d945
Author: Andreas Metzler <address@hidden>
Date:   Mon Jul 25 19:16:50 2011 +0200

    Replaced all occurences of gcry_sexp_nth_mpi (..., 0) with
    gcry_sexp_nth_mpi (..., GCRYMPI_FMT_USG).

commit 12fb2da52e63c104b1c92932745d1d231d72c32b
Author: Sjoerd Simons <address@hidden>
Date:   Mon Jul 25 17:54:32 2011 +0100

    writev_emu: stop on the first incomplete write
    
    Just like standard writev, we should only move on to the next block if
    all the previous ones have been successfully written out. Otherwise
    there is a potential for data loss and/or confusing push functions.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

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

Summary of changes:
 NEWS                 |   11 +++++++++++
 lib/gcrypt/pk.c      |   32 ++++++++++++++++----------------
 lib/gnutls_buffers.c |    3 +++
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index 6e4c10c..e22877e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,17 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
+* Version 2.12.8 (unreleased)
+
+** libgnutls: gcrypt: replaced occurences of gcry_sexp_nth_mpi (..., 0)
+with gcry_sexp_nth_mpi (..., GCRYMPI_FMT_USG) to fix errors with 1.5.0.
+
+** libgnutls: writev_emu: stop on the first incomplete write
+
+** API and ABI modifications:
+No changes since last version.
+
+
 * Version 2.12.7 (released 2011-06-18)
 
 ** p11tool: Require login as security officer if --trusted option is
diff --git a/lib/gcrypt/pk.c b/lib/gcrypt/pk.c
index e039d9d..2ed7295 100644
--- a/lib/gcrypt/pk.c
+++ b/lib/gcrypt/pk.c
@@ -112,7 +112,7 @@ _wrap_gcry_pk_encrypt (gnutls_pk_algorithm_t algo,
       goto cleanup;
     }
 
-  res = gcry_sexp_nth_mpi (list, 1, 0);
+  res = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
   if (res == NULL)
     {
@@ -202,7 +202,7 @@ _wrap_gcry_pk_decrypt (gnutls_pk_algorithm_t algo,
       goto cleanup;
     }
 
-  res = gcry_sexp_nth_mpi (s_plain, 0, 0);
+  res = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
   if (res == NULL)
     {
       gnutls_assert ();
@@ -327,7 +327,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_t algo, 
gnutls_datum_t * signature,
             goto cleanup;
           }
 
-        res[0] = gcry_sexp_nth_mpi (list, 1, 0);
+        res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
         gcry_sexp_release (list);
 
         list = gcry_sexp_find_token (s_sig, "s", 0);
@@ -338,7 +338,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_t algo, 
gnutls_datum_t * signature,
             goto cleanup;
           }
 
-        res[1] = gcry_sexp_nth_mpi (list, 1, 0);
+        res[1] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
         gcry_sexp_release (list);
 
         ret = _gnutls_encode_ber_rs (signature, res[0], res[1]);
@@ -360,7 +360,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_t algo, 
gnutls_datum_t * signature,
             goto cleanup;
           }
 
-        res[0] = gcry_sexp_nth_mpi (list, 1, 0);
+        res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
         gcry_sexp_release (list);
 
         ret = _gnutls_mpi_dprint (res[0], signature);
@@ -559,7 +559,7 @@ _dsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[0] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
   list = gcry_sexp_find_token (key, "q", 0);
@@ -570,7 +570,7 @@ _dsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[1] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[1] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
   list = gcry_sexp_find_token (key, "g", 0);
@@ -581,7 +581,7 @@ _dsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[2] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[2] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
   list = gcry_sexp_find_token (key, "y", 0);
@@ -592,7 +592,7 @@ _dsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[3] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[3] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
 
@@ -604,7 +604,7 @@ _dsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[4] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[4] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
 
   gcry_sexp_release (list);
   gcry_sexp_release (key);
@@ -660,7 +660,7 @@ _rsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[0] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
   list = gcry_sexp_find_token (key, "e", 0);
@@ -671,7 +671,7 @@ _rsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[1] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[1] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
   list = gcry_sexp_find_token (key, "d", 0);
@@ -682,7 +682,7 @@ _rsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[2] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[2] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
   list = gcry_sexp_find_token (key, "p", 0);
@@ -693,7 +693,7 @@ _rsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[3] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[3] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
 
@@ -705,7 +705,7 @@ _rsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[4] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[4] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
   gcry_sexp_release (list);
 
 
@@ -717,7 +717,7 @@ _rsa_generate_params (bigint_t * resarr, int *resarr_len, 
int bits)
       return GNUTLS_E_INTERNAL_ERROR;
     }
 
-  resarr[5] = gcry_sexp_nth_mpi (list, 1, 0);
+  resarr[5] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
 
   gcry_sexp_release (list);
   gcry_sexp_release (key);
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 48f1c8e..0c48d26 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -393,6 +393,9 @@ _gnutls_writev_emu (gnutls_session_t session, const 
giovec_t * giovec,
         break;
 
       total += ret;
+
+      if (ret != giovec[j].iov_len)
+        break;
     }
 
   if (total > 0)


hooks/post-receive
-- 
GNU gnutls