[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_5-10-ga027093

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

The branch, gnutls_2_12_x has been updated
       via  a027093ede7b22289350b5cba15956de7ea0ed8e (commit)
       via  e5e3bd341c5f5078717c37820f17d09ca529555d (commit)
       via  d070d6b9806bb6c369509358dceef242939e867d (commit)
      from  a053001649a69e79d3a4a2b5c9a89913d9fc9ad4 (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 a027093ede7b22289350b5cba15956de7ea0ed8e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed May 25 23:31:30 2011 +0200

    updated documentation on PSK.

commit e5e3bd341c5f5078717c37820f17d09ca529555d
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed May 25 18:33:08 2011 +0200

    PSK examples
    
    Hello,
    
    I have tried to set up a connection using PSK but I get this error
    message all the time:
    
    *** Fatal error: A TLS fatal alert has been received.
    *** Received alert [40]: Handshake failed
    *** Handshake has failed
    GnuTLS error: A TLS fatal alert has been received.
    
    I took the examples from the documentation.
    
    the server:
    
    gnutls-serv -d 10 --pskpasswd psks.txt  \
       --pskhint psk_identity_hint
    
    the client:
    
    gnutls-cli -p 5556 localhost --pskusername psk_identity \
          --pskkey key
    
    (where epsk_identity and key are the same as in the psks.txt file)
    
    I have also tried to use "--priority +PSK:+DHE-PSK" both for the client
    and for the server without any difference.
    
    Do you have any idea?  What am I missing?
    
    As proof that I have read the documentation, I have attached a small patch.
    
    Thanks,
    Giuseppe
    
    From 009ccba073016787084a28047b633841d6784e54 Mon Sep 17 00:00:00 2001
    From: Giuseppe Scrivano <address@hidden>
    Date: Wed, 25 May 2011 18:28:11 +0200
    Subject: [PATCH] Fix example in the documentation.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit d070d6b9806bb6c369509358dceef242939e867d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed May 25 00:19:40 2011 +0200

    do not try to write to a socket when no data.

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

Summary of changes:
 doc/cha-programs.texi |   12 ++++++------
 lib/gnutls_buffers.c  |    6 ++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/cha-programs.texi b/doc/cha-programs.texi
index e92624c..cdbd828 100644
--- a/doc/cha-programs.texi
+++ b/doc/cha-programs.texi
@@ -404,7 +404,7 @@ To connect to a server using PSK authentication, you may 
use something
 like:
 
 @smallexample
-$ gnutls-cli -p 5556 test.gnutls.org --pskusername jas --pskkey 
9e32cf7786321a828ef7668f09fb35db --priority NORMAL:+PSK:-RSA:-DHE-RSA -d 4711
+$ gnutls-cli -p 5556 test.gnutls.org --pskusername jas --pskkey 
9e32cf7786321a828ef7668f09fb35db --priority NORMAL:+DHE-PSK:+PSK:-RSA:-DHE-RSA 
-d 4711
 @end smallexample
 
 @menu
@@ -422,10 +422,10 @@ should be as simple as connecting to the server:
 $ ./gnutls-cli -p 5556 localhost
 Resolving 'localhost'...
 Connecting to '127.0.0.1:5556'...
-- PSK client callback. PSK hint 'psk_identity_hint'
+- PSK client callback.
 Enter PSK identity: psk_identity
 Enter password: 
-- PSK authentication. PSK hint 'psk_identity_hint'
+- PSK authentication.
 - Version: TLS1.1
 - Key Exchange: PSK
 - Cipher: AES-128-CBC
@@ -446,10 +446,10 @@ password, you can also give the PSK username and key 
directly on the
 command line:
 
 @smallexample
-$ ./gnutls-cli -p 5556 localhost --pskusername psk_identity --pskkey 
88f3824b3e5659f52d00e959bacab954b6540344 
+$ ./gnutls-cli -p 5556 localhost --pskusername psk_identity --pskkey 
88f3824b3e5659f52d00e959bacab954b6540344  --priority NORMAL:+DHE-PSK:+PSK
 Resolving 'localhost'...
 Connecting to '127.0.0.1:5556'...
-- PSK authentication. PSK hint 'psk_identity_hint'
+- PSK authentication.
 - Version: TLS1.1
 - Key Exchange: PSK
 - Cipher: AES-128-CBC
@@ -761,7 +761,7 @@ password file (@pxref{Invoking psktool}).  In the example 
below, I
 type @code{password} at the prompt.
 
 @smallexample
-$ ./psktool -u psk_identity -p psks.txt -n psk_identity_hint
+$ ./psktool -u psk_identity -p psks.txt
 Enter password:
 Key stored to psks.txt
 $ cat psks.txt
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index da02899..48f1c8e 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -719,6 +719,12 @@ _gnutls_io_write_flush (gnutls_session_t session)
         }
     }
 
+  if (tosend == 0)
+    {
+      gnutls_assert();
+      return 0;
+    }
+
   ret = _gnutls_writev (session, iovec, i);
   if (ret >= 0)
     {


hooks/post-receive
-- 
GNU gnutls