[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_0-149-gb16702f

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

The branch, gnutls_3_0_x has been updated
       via  b16702f1a087a33f0f2f4db3118251bd4a8db2be (commit)
       via  95bb5abab43ba8ac2c7c2e1f76a4426fe9e894a4 (commit)
      from  30fbfb463e354eb02689254bb103a3dc3897ea0a (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 b16702f1a087a33f0f2f4db3118251bd4a8db2be
Merge: 30fbfb4 95bb5ab
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Aug 19 21:49:50 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

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

Summary of changes:
 doc/cha-gtls-app.texi  |   39 +++++++++++++++++++++++++++++++++------
 doc/cha-intro-tls.texi |   43 ++++---------------------------------------
 lib/gnutls_record.c    |   12 ++++++------
 lib/system_override.c  |    8 ++++----
 4 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index d7df236..8d18e41 100644
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -136,8 +136,10 @@ The credentials used for the key exchange method, such as 
certificates
 or usernames and passwords should also be associated with the session
 current session using @funcref{gnutls_credentials_set} (see 
@ref{Authentication methods}). 
 
address@hidden Setting up the transport layer
+
 The next step is to setup the underlying transport layer details. The
-Berkeley sockets for TCP are implicitly used by default in GnuTLS, thus a
+Berkeley sockets are implicitly used by GnuTLS, thus a
 call to @funcref{gnutls_transport_set_ptr2} would be sufficient to
 specify the socket descriptor.
 
@@ -152,15 +154,40 @@ the following functions have to be specified.
 @showfuncdesc{gnutls_transport_set_vec_push_function}
 @showfuncdesc{gnutls_transport_set_pull_function}
 
-In the case of DTLS it is also desirable to override the
-functions above with functions that emulate the operation
+The functions above accept a callback function which
+should return the number of bytes written, or -1 on
+error and should set @code{errno} appropriately.
+In some environments, setting @code{errno} is unreliable. For example
+Windows have several errno variables in different CRTs, or in other
+systems it may be a non thread-local variable.  If this is a concern to
+you, call @funcref{gnutls_transport_set_errno} with the intended errno
+value instead of setting @code{errno} directly.
+
address@hidden
+
address@hidden currently only interprets the EINTR and EAGAIN errno
+values and returns the corresponding @acronym{GnuTLS} error codes:
address@hidden
address@hidden @code{GNUTLS_E_INTERRUPTED} 
address@hidden @code{GNUTLS_E_AGAIN}
address@hidden itemize
+The EINTR and EAGAIN values are returned by interrupted system calls, 
+or when non blocking IO is used.  All @acronym{GnuTLS} functions can be 
+resumed (called again), if any of the above error codes is returned.  
+
+In the case of DTLS it is also desirable to override the generic 
+transport functions with functions that emulate the operation
 of @code{recvfrom} and @code{sendto}. In addition
-the following function must also be called to specify a 
-callback that will receive data from within a specified
-time limit.
address@hidden requires timers during the receive of a handshake
+message. This requires the following function to be used.
 
 @showfuncdesc{gnutls_transport_set_pull_timeout_function}
 
+To avoid @acronym{GnuTLS} from blocking in a DTLS handshake on
+a timer, the @funcref{gnutls_init} can be called with the
address@hidden flag (see @ref{TLS and DTLS sessions}).
+
+
 @subsection Handshake
 Once a session has been initialized and a network
 connection has been set up, TLS and DTLS protocols
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index ae22d57..3cc7941 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -64,45 +64,10 @@ protocol.  The protocol layering in TLS is shown in 
@ref{fig:tls-layers}.
 @acronym{TLS} is not limited to any transport layer and can be used
 above any transport layer, as long as it is a reliable one.  @acronym{DTLS}
 can be used over reliable and unreliable transport layers.
-A set of functions is provided and their purpose is to load to 
@acronym{GnuTLS} the
-required callbacks to access the transport layer.
-
address@hidden,gnutls_transport_set_vec_push_function,gnutls_transport_set_pull_timeout_function,gnutls_transport_set_pull_function,gnutls_transport_set_ptr}
-
-The function @funcref{gnutls_transport_set_pull_timeout_function} is only 
applicable
-to @acronym{DTLS} sessions.
-All those functions accept a callback function as a parameter.  The
-callback functions should return the number of bytes written, or -1 on
-error and should set @code{errno} appropriately.
-
-In some environments, setting @code{errno} is unreliable, for example
-Windows have several errno variables in different CRTs, or it may be
-that errno is not a thread-local variable.  If this is a concern to
-you, call @funcref{gnutls_transport_set_errno} with the intended errno
-value instead of setting @code{errno} directly.
-
address@hidden
-
address@hidden currently only interprets the EINTR and EAGAIN errno
-values and returns the corresponding @acronym{GnuTLS} error codes:
address@hidden
address@hidden @code{GNUTLS_E_INTERRUPTED} 
address@hidden @code{GNUTLS_E_AGAIN}
address@hidden itemize
-These values are usually returned by interrupted system calls, or when non 
blocking
-IO is used.  All @acronym{GnuTLS} functions can be resumed (called
-again), if any of these error codes is returned.  The error codes
-above refer to the system call, not the @acronym{GnuTLS} function,
-since signals do not interrupt @acronym{GnuTLS}' functions.
-
address@hidden however deviates from this rule. Because it requires
-timers and waiting for peer's messages during the handshake process,
address@hidden will block and might be interrupted by signals. The
-blocking operation of @acronym{GnuTLS} during @acronym{DTLS} handshake
-can be changed using the appropriate flags in @funcref{gnutls_init} (see
address@hidden and DTLS sessions}).
-By default, if the transport functions are not set, @acronym{GnuTLS}
-will use the Berkeley sockets. 
address@hidden supports TCP and UDP layers transparently using
+the Berkeley sockets API. However, any transport layer can be used
+by providing callbacks for @acronym{GnuTLS} to access the transport layer 
+(for details see @ref{TLS and DTLS sessions}).
 
 @node The TLS record protocol
 @section The TLS record protocol
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 6c1f72e..72e3f76 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -103,9 +103,9 @@ gnutls_record_disable_padding (gnutls_session_t session)
  * @session: is a #gnutls_session_t structure.
  * @ptr: is the value.
  *
- * Used to set the first argument of the transport function (like PUSH
- * and PULL).  In berkeley style sockets this function will set the
- * connection handle.
+ * Used to set the first argument of the transport function (for push
+ * and pull callbacks). In berkeley style sockets this function will set the
+ * connection descriptor.
  **/
 void
 gnutls_transport_set_ptr (gnutls_session_t session,
@@ -121,9 +121,9 @@ gnutls_transport_set_ptr (gnutls_session_t session,
  * @recv_ptr: is the value for the pull function
  * @send_ptr: is the value for the push function
  *
- * Used to set the first argument of the transport function (like PUSH
- * and PULL). In berkeley style sockets this function will set the
- * connection handle.  With this function you can use two different
+ * Used to set the first argument of the transport function (for push
+ * and pull callbacks). In berkeley style sockets this function will set the
+ * connection descriptor.  With this function you can use two different
  * pointers for receiving and sending.
  **/
 void
diff --git a/lib/system_override.c b/lib/system_override.c
index 82463d0..7b5db63 100644
--- a/lib/system_override.c
+++ b/lib/system_override.c
@@ -49,10 +49,10 @@
  * for @err is EAGAIN and EINTR, other values are treated will be
  * treated as real errors in the push/pull function.
  *
- * This function is useful in replacement push/pull functions set by
- * gnutls_transport_set_push_function and
- * gnutls_transport_set_pullpush_function under Windows, where the
- * replacement push/pull may not have access to the same @errno
+ * This function is useful in replacement push and pull functions set by
+ * gnutls_transport_set_push_function() and
+ * gnutls_transport_set_pull_function() under Windows, where the
+ * replacements may not have access to the same @errno
  * variable that is used by GnuTLS (e.g., the application is linked to
  * msvcr71.dll and gnutls is linked to msvcrt.dll).
  *


hooks/post-receive
-- 
GNU gnutls