[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-73-gc7b0d66

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

The branch, gnutls_3_0_x has been updated
       via  c7b0d66c9053a8706529d54e08e79529fffb800a (commit)
       via  2f7b2376439e2b04a61e48bc2efcaebe3b776323 (commit)
       via  f1a87198a30958da1a0f084da0862d1a1e516ee9 (commit)
      from  de4aac2d318b4b6620bbcb7ffd4be912c5bbf297 (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 c7b0d66c9053a8706529d54e08e79529fffb800a
Merge: de4aac2 2f7b237
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Sep 3 11:09:01 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

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

Summary of changes:
 doc/cha-auth.texi      |    8 ++++----
 doc/cha-cert-auth.texi |    8 ++++----
 doc/cha-functions.texi |    6 +++---
 doc/cha-gtls-app.texi  |    2 +-
 doc/cha-intro-tls.texi |    6 +++---
 lib/gnutlsxx.cpp       |    6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/doc/cha-auth.texi b/doc/cha-auth.texi
index 78bcfc3..873db91 100644
--- a/doc/cha-auth.texi
+++ b/doc/cha-auth.texi
@@ -41,7 +41,7 @@ we elaborate on supported authentication methods.
 @section Certificate authentication
 
 @subsection Authentication using @acronym{X.509} certificates
address@hidden @acronym{X.509} certificates
address@hidden X.509 certificates
 
 @acronym{X.509} certificates contain the public parameters, of a
 public key algorithm, and an authority's signature, which proves the
@@ -49,7 +49,7 @@ authenticity of the parameters.  See @ref{X.509 
certificates}, for
 more information on @acronym{X.509} protocols.
 
 @subsection Authentication using @acronym{OpenPGP} keys
address@hidden @acronym{OpenPGP} keys
address@hidden OpenPGP keys
 
 @acronym{OpenPGP} keys also contain public parameters of a public key
 algorithm, and signatures from several other parties. Depending on
@@ -219,7 +219,7 @@ efficient than ANON_DH on equivalent security levels.
 
 @node Authentication using SRP
 @section Authentication using @acronym{SRP}
address@hidden @acronym{SRP} authentication
address@hidden SRP authentication
 
 Authentication via the Secure Remote Password protocol,
 @acronym{SRP} (see @xcite{RFC2945} for a description of SRP),
@@ -302,7 +302,7 @@ also included.  See @ref{srptool}, for more information.
 
 @node Authentication using PSK
 @section Authentication using @acronym{PSK}
address@hidden @acronym{PSK} authentication
address@hidden PSK authentication
 
 Authentication using Pre-shared keys is a method to authenticate using
 usernames and binary keys. This protocol avoids making use of public
diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index db53858..cc519e9 100644
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -12,7 +12,7 @@
 
 @node X.509 certificates
 @section @acronym{X.509} certificates
address@hidden @acronym{X.509} certificates
address@hidden X.509 certificates
 
 The @acronym{X.509} protocols rely on a hierarchical trust model. In
 this trust model Certification Authorities (CAs) are used to certify
@@ -269,7 +269,7 @@ consult @xcite{RFC2818} and section @ref{ex:verify} for an 
example.
 @node Certificate requests
 @subsection @acronym{PKCS} #10 certificate requests
 @cindex certificate requests
address@hidden @acronym{PKCS} #10
address@hidden PKCS #10
 
 A certificate request is a structure, which contain information about
 an applicant of a certificate service.  It usually contains a private
@@ -312,7 +312,7 @@ which should return a signed certificate.
 
 @node PKCS 12 structures
 @subsection @acronym{PKCS} #12 structures
address@hidden @acronym{PKCS} #12
address@hidden PKCS #12
 
 A @acronym{PKCS} #12 structure @xcite{PKCS12} usually contains a user's
 private keys and certificates. It is commonly used in browsers to
@@ -354,7 +354,7 @@ below.
 
 @node OpenPGP certificates
 @section @acronym{OpenPGP} certificates
address@hidden @acronym{OpenPGP} certificates
address@hidden OpenPGP certificates
 
 The @acronym{OpenPGP} key authentication relies on a distributed trust
 model, called the ``web of trust''. The ``web of trust'' uses a
diff --git a/doc/cha-functions.texi b/doc/cha-functions.texi
index c671fcb..3e2f712 100644
--- a/doc/cha-functions.texi
+++ b/doc/cha-functions.texi
@@ -19,7 +19,7 @@ The prototypes for the following functions lie in
 
 @node X509 certificate functions
 @section @acronym{X.509} Certificate Functions
address@hidden @acronym{X.509} Functions
address@hidden X.509 Functions
 
 The following functions are to be used for @acronym{X.509} certificate 
handling.
 Their prototypes lie in @file{gnutls/x509.h}.
@@ -28,7 +28,7 @@ Their prototypes lie in @file{gnutls/x509.h}.
 
 @node GnuTLS-extra functions
 @section @acronym{GnuTLS-extra} Functions
address@hidden @acronym{GnuTLS-extra} functions
address@hidden GnuTLS-extra functions
 
 These functions are only available in the GPLv3+ version of the
 library called @code{gnutls-extra}. The prototypes for this library
@@ -38,7 +38,7 @@ lie in @file{gnutls/extra.h}.
 
 @node OpenPGP functions
 @section @acronym{OpenPGP} Functions
address@hidden @acronym{OpenPGP} functions
address@hidden OpenPGP functions
 
 The following functions are to be used for @acronym{OpenPGP}
 certificate handling.  Their prototypes lie in
diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index bf65319..0c9f6a9 100644
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -653,7 +653,7 @@ This example is a very simple echo server which supports
 
 @node Echo Server with OpenPGP authentication
 @subsection Echo server with @acronym{OpenPGP} authentication
address@hidden @acronym{OpenPGP} server
address@hidden OpenPGP server
 
 The following example is an echo server which supports
 @acronym{OpenPGP} key authentication. You can easily combine
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index ab117ba..c0afef1 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -524,8 +524,8 @@ resume functions, @ref{resume}.
 @showfuncdesc{gnutls_session_ticket_enable_client}
 
 @subsection Safe renegotiation
address@hidden Renegotiation
address@hidden Safe renegotiation
address@hidden renegotiation
address@hidden safe renegotiation
 
 TLS gives the option to two communicating parties to renegotiate
 and update their security parameters. One useful example of this feature
@@ -623,7 +623,7 @@ can be used both by clients and servers.
 
 @node Selecting cryptographic key sizes
 @section Selecting cryptographic key sizes
address@hidden Key sizes
address@hidden key sizes
 
 Because many algorithms are involved in TLS, it is not easy to set
 a consistent security level.  For this reason in @ref{tab:key-sizes} we
diff --git a/lib/gnutlsxx.cpp b/lib/gnutlsxx.cpp
index aa92bc6..4a27226 100644
--- a/lib/gnutlsxx.cpp
+++ b/lib/gnutlsxx.cpp
@@ -418,7 +418,7 @@ namespace gnutls
 
   void session::set_transport_lowat (size_t num)
   {
-    gnutls_transport_set_lowat (s, num);
+    throw (exception (GNUTLS_E_UNIMPLEMENTED_FEATURE));
   }
 
   void session::set_transport_push_function (gnutls_push_func push_func)
@@ -892,7 +892,7 @@ psk_server_credentials::psk_server_credentials 
():credentials
     if (ret < 0)
       {
        delete dst;
-       throw (ret);
+        throw (exception (ret));
       }
 
     return *dst;
@@ -944,7 +944,7 @@ psk_server_credentials::psk_server_credentials 
():credentials
     if (ret < 0)
       {
        delete dst;
-       throw (ret);
+        throw (exception (ret));
       }
 
     return *dst;


hooks/post-receive
-- 
GNU gnutls