[SCM] GNU gnutls branch, master, updated. gnutls_3_0_0-105-g1e5ae67

[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=1e5ae673bb3dcadc4897a08009ffff947988d9b5

The branch, master has been updated
       via  1e5ae673bb3dcadc4897a08009ffff947988d9b5 (commit)
       via  341ce86e4592d6410e90ba6d1c3922f919e6bedb (commit)
      from  da8fdf5ca317cf112d5a0f540d856d0da736545a (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 1e5ae673bb3dcadc4897a08009ffff947988d9b5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Aug 23 09:45:33 2011 +0200

    unlock rnd mutex on error.

commit 341ce86e4592d6410e90ba6d1c3922f919e6bedb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Aug 23 00:18:30 2011 +0200

    bibliography updated

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

Summary of changes:
 doc/cha-bib.texi     |    5 ++---
 doc/latex/gnutls.bib |   12 ++++++------
 lib/nettle/rnd.c     |    2 ++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/cha-bib.texi b/doc/cha-bib.texi
index 6ef6704..ef51fbb 100644
--- a/doc/cha-bib.texi
+++ b/doc/cha-bib.texi
@@ -115,9 +115,8 @@ Arjen Lenstra and Eric Verheul, "Selecting Cryptographic 
Key Sizes",
 2003, available from @url{http://www.win.tue.nl/~klenstra/key.pdf}.
 
 @item @anchor{SSL3}[SSL3]
-Alan Freier, Philip Karlton and Paul Kocher, "The SSL Protocol Version
-3.0", November 1996, Available from
address@hidden://wp.netscape.com/eng/ssl3/draft302.txt}.
+Alan Freier, Philip Karlton and Paul Kocher, "The Secure Sockets Layer (SSL) 
Protocol Version 3.0",
+August 2011, Available from @url{http://www.ietf.org/rfc/rfc6101.txt}.
 
 @item @anchor{STEVENS}[STEVENS]
 Richard Stevens, "UNIX Network Programming, Volume 1", Prentice Hall
diff --git a/doc/latex/gnutls.bib b/doc/latex/gnutls.bib
index 620298c..11ec38c 100644
--- a/doc/latex/gnutls.bib
+++ b/doc/latex/gnutls.bib
@@ -164,16 +164,16 @@
        url = "http://www.ietf.org/rfc/rfc3280.txt";
 }
 
address@hidden SSL3,
address@hidden,
        author = "Alan Freier and Philip Karlton and Paul Kocher",
-       title = "The {SSL} Protocol Version 3.0",
-       month = "November",
+       title = "The Secure Sockets Layer (SSL) Protocol Version 3.0",
+       month = "August",
        year = "2011",
-       note = "Available from 
\url{http://tools.ietf.org/html/draft-mavrogiannopoulos-ssl-version3-06}";,
-       url = 
"http://tools.ietf.org/html/draft-mavrogiannopoulos-ssl-version3-06";
+       note = "Available from \url{http://www.ietf.org/rfc/rfc6101.txt}";,
+       url = "http://www.ietf.org/rfc/rfc6101.txt";
 }
 
address@hidden PKCS12,
address@hidden,
        author = "RSA Laboratories",
        title = "{PKCS 12 v1.0}: Personal Information Exchange Syntax",
        month = "June",
diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c
index 789eac0..b3e18ac 100644
--- a/lib/nettle/rnd.c
+++ b/lib/nettle/rnd.c
@@ -448,6 +448,7 @@ wrap_nettle_rnd (void *_ctx, int level, void *data, size_t 
datasize)
   ret = do_trivia_source (0);
   if (ret < 0)
     {
+      RND_UNLOCK;
       gnutls_assert ();
       return ret;
     }
@@ -455,6 +456,7 @@ wrap_nettle_rnd (void *_ctx, int level, void *data, size_t 
datasize)
   ret = do_device_source (0);
   if (ret < 0)
     {
+      RND_UNLOCK;
       gnutls_assert ();
       return ret;
     }


hooks/post-receive
-- 
GNU gnutls