[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-166-g98e25bb

[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=98e25bbadadeea2e03bd0d06b6c2812523924ff9

The branch, master has been updated
       via  98e25bbadadeea2e03bd0d06b6c2812523924ff9 (commit)
       via  bc2a866e55f9b6851ee783c52afc5e29f90f914f (commit)
      from  c83354f4c329e685c43c1d28a1b2bcc988886b99 (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 98e25bbadadeea2e03bd0d06b6c2812523924ff9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jun 28 21:27:21 2012 +0200

    doc fix

commit bc2a866e55f9b6851ee783c52afc5e29f90f914f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jun 28 21:21:33 2012 +0200

    Return GNUTLS_E_LARGE_PACKET when errno is EMSGSIZE

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

Summary of changes:
 doc/Makefile.am          |    4 ++++
 doc/cha-cert-auth2.texi  |    2 +-
 doc/cha-gtls-app.texi    |    6 ++++--
 doc/invoke-certtool.texi |    5 ++---
 lib/gnutls_buffers.c     |   27 +++++++++++++--------------
 lib/gnutls_errors.c      |    4 ++--
 lib/gnutls_record.c      |    3 ++-
 lib/system.c             |    3 +++
 8 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 65141c8..9b04117 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -512,6 +512,9 @@ FUNCS += functions/gnutls_privkey_get_type
 FUNCS += functions/gnutls_privkey_import_pkcs11
 FUNCS += functions/gnutls_privkey_import_x509
 FUNCS += functions/gnutls_privkey_import_openpgp
+FUNCS += functions/gnutls_privkey_import_openpgp_raw
+FUNCS += functions/gnutls_privkey_import_x509_raw
+FUNCS += functions/gnutls_privkey_import_pkcs11_url
 FUNCS += functions/gnutls_privkey_import_ext
 FUNCS += functions/gnutls_privkey_sign_data
 FUNCS += functions/gnutls_privkey_sign_hash
@@ -828,6 +831,7 @@ FUNCS += functions/gnutls_tdb_deinit
 FUNCS += functions/gnutls_verify_stored_pubkey
 FUNCS += functions/gnutls_store_commitment
 FUNCS += functions/gnutls_store_pubkey
+FUNCS += functions/gnutls_load_file
 FUNCS += functions/gnutls_ocsp_req_init
 FUNCS += functions/gnutls_ocsp_req_deinit
 FUNCS += functions/gnutls_ocsp_req_import
diff --git a/doc/cha-cert-auth2.texi b/doc/cha-cert-auth2.texi
index efc44d7..573b68d 100644
--- a/doc/cha-cert-auth2.texi
+++ b/doc/cha-cert-auth2.texi
@@ -588,7 +588,6 @@ sequence.
 
@showfuncC{gnutls_pubkey_import_x509,gnutls_pubkey_import_openpgp,gnutls_pubkey_import_pkcs11}
 
@showfuncC{gnutls_pubkey_import_pkcs11_url,gnutls_pubkey_import_privkey,gnutls_pubkey_import}
 
address@hidden,gnutls_pubkey_import_openpgp_raw,gnutls_pubkey_import_pkcs11_url}
 @showfuncdesc{gnutls_pubkey_export}
 
 Additional functions are available that will return
@@ -606,6 +605,7 @@ to allow abstraction over @acronym{PKCS} #11 keys that
 are not extractable.
 
 
@showfuncC{gnutls_privkey_import_x509,gnutls_privkey_import_openpgp,gnutls_privkey_import_pkcs11}
address@hidden,gnutls_privkey_import_openpgp_raw,gnutls_privkey_import_pkcs11_url}
 
 @showfuncB{gnutls_privkey_get_pk_algorithm,gnutls_privkey_get_type}
 
diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index 35f705f..52f6126 100644
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -595,15 +595,17 @@ value instead of setting @code{errno} directly.
 
 @showfuncdesc{gnutls_transport_set_errno}
 
address@hidden currently only interprets the EINTR and EAGAIN errno
address@hidden currently only interprets the EINTR, EAGAIN and EMSGSIZE errno
 values and returns the corresponding @acronym{GnuTLS} error codes:
 @itemize
 @item @code{GNUTLS_E_INTERRUPTED} 
 @item @code{GNUTLS_E_AGAIN}
address@hidden @code{GNUTLS_E_LARGE_PACKET}
 @end 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.  
+resumed (called again), if any of the above error codes is returned. The
+EMSGSIZE value is returned when attempting to send a large datagram.
 
 In the case of DTLS it is also desirable to override the generic 
 transport functions with functions that emulate the operation
diff --git a/doc/invoke-certtool.texi b/doc/invoke-certtool.texi
index 58b08ab..34d618f 100644
--- a/doc/invoke-certtool.texi
+++ b/doc/invoke-certtool.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-certtool.texi)
 # 
-# It has been AutoGen-ed  May 14, 2012 at 05:26:00 PM by AutoGen 5.16
+# It has been AutoGen-ed  June 28, 2012 at 09:25:29 PM by AutoGen 5.16
 # From the definitions    ../src/certtool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -87,7 +87,6 @@ USAGE:  certtool [ -<flag> [<val>] | --<name>address@hidden| 
@}<val>] ]...
        --to-p12               Generate a PKCS #12 structure
                                 - requires these options:
                                 load-certificate
-                                load-privkey
        --to-p8                Generate a PKCS #8 structure
    -8, --pkcs8                Use PKCS #8 format for private keys
        --rsa                  Generate RSA key
@@ -219,7 +218,7 @@ This option has some usage constraints.  It:
 @itemize @bullet
 @item
 must appear in combination with the following options:
-load-certificate, load-privkey.
+load-certificate.
 @end itemize
 
 It requires a certificate, a private key and possibly a CA certificate to be 
specified.
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 17ec061..cca3a18 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -186,22 +186,21 @@ _gnutls_dgram_read (gnutls_session_t session, mbuffer_st 
**bufel,
       _gnutls_read_log ("READ: %d returned from %p, errno=%d gerrno=%d\n",
                        (int) i, fd, errno, session->internals.errnum);
 
-      if (err == EAGAIN)
-        {
-          ret = GNUTLS_E_AGAIN;
-          goto cleanup;
-        }
-      else if (err == EINTR)
+      switch(err)
         {
-          ret = GNUTLS_E_INTERRUPTED;
-          goto cleanup;
-        }
-      else
-        {
-          gnutls_assert ();
-          ret = GNUTLS_E_PULL_ERROR;
-          goto cleanup;
+          case EAGAIN:
+            ret = GNUTLS_E_AGAIN;
+            goto cleanup;
+          case EINTR:
+            ret = GNUTLS_E_INTERRUPTED;
+            goto cleanup;
+          case EMSGSIZE:
+            ret = GNUTLS_E_LARGE_PACKET;
+          default:
+            gnutls_assert ();
+            ret = GNUTLS_E_PULL_ERROR;
         }
+      goto cleanup;
     }
   else
     {
diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index c70b3bf..71b6e6a 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -64,8 +64,6 @@ static const gnutls_error_entry error_algorithms[] = {
 
   ERROR_ENTRY (N_("An algorithm that is not enabled was negotiated."),
                GNUTLS_E_UNWANTED_ALGORITHM, 1),
-  ERROR_ENTRY (N_("A large TLS record packet was received."),
-               GNUTLS_E_LARGE_PACKET, 1),
   ERROR_ENTRY (N_("A record packet with illegal version was received."),
                GNUTLS_E_UNSUPPORTED_VERSION_PACKET, 1),
   ERROR_ENTRY (N_
@@ -164,6 +162,8 @@ static const gnutls_error_entry error_algorithms[] = {
                GNUTLS_E_KEY_USAGE_VIOLATION, 1),
   ERROR_ENTRY (N_("Resource temporarily unavailable, try again."),
                GNUTLS_E_AGAIN, 0),
+  ERROR_ENTRY (N_("The transmitted packet is too large (EMSGSIZE)."),
+               GNUTLS_E_LARGE_PACKET, 0),
   ERROR_ENTRY (N_("Function was interrupted."), GNUTLS_E_INTERRUPTED, 0),
   ERROR_ENTRY (N_("Rehandshake was requested by the peer."),
                GNUTLS_E_REHANDSHAKE, 0),
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 01c4fb0..e6250f8 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -1226,7 +1226,8 @@ _gnutls_recv_int (gnutls_session_t session, 
content_type_t type,
  * %GNUTLS_E_INTERRUPTED or %GNUTLS_E_AGAIN is returned, you must
  * call this function again, with the same parameters; alternatively
  * you could provide a %NULL pointer for data, and 0 for
- * size. cf. gnutls_record_get_direction().
+ * size. cf. gnutls_record_get_direction(). The errno value EMSGSIZE
+ * maps to %GNUTLS_E_LARGE_PACKET.
  *
  * Returns: The number of bytes sent, or a negative error code.  The
  *   number of bytes sent might be less than @data_size.  The maximum
diff --git a/lib/system.c b/lib/system.c
index bec2e09..82572ba 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -71,6 +71,9 @@ system_errno (gnutls_transport_ptr p)
     case WSAEINTR:
       ret = EINTR;
       break;
+    case WSAEMSGSIZE:
+      ret = EMSGSIZE;
+      break;
     default:
       ret = EIO;
       break;


hooks/post-receive
-- 
GNU gnutls