[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-16-g2d23cad

[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=2d23cad7886c05c1314ede66524cc3cff9ef21df

The branch, gnutls_3_0_x has been updated
       via  2d23cad7886c05c1314ede66524cc3cff9ef21df (commit)
       via  9dac7e9da1db610187cf1308c8d3fa7584666f7a (commit)
       via  7f8a4de382265c26a883c99fdf8298b63bbeec62 (commit)
       via  da8fdf5ca317cf112d5a0f540d856d0da736545a (commit)
       via  2182dccc822126d20583d0eebc9a1a0edd0932c3 (commit)
       via  df1778a638d45bda2539299948ef0ebfd6b407a6 (commit)
       via  432889638f11fc7e1b90881e974f0ff8af3cc50c (commit)
       via  c6c0367ab0d9131321caf136afbe8fa58d65db3b (commit)
      from  10115e3fb9c36abcce95bd8f74d212d068cbddce (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 2d23cad7886c05c1314ede66524cc3cff9ef21df
Merge: 9dac7e9 da8fdf5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Aug 22 20:48:30 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

commit 9dac7e9da1db610187cf1308c8d3fa7584666f7a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 21 23:29:05 2011 +0200

    AIX check moved to system.c.

commit 7f8a4de382265c26a883c99fdf8298b63bbeec62
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 21 19:41:43 2011 +0200

    Handle memory allocation errors.

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

Summary of changes:
 lib/gnutls_buffers.c  |    4 ----
 lib/libgnutls.map     |    1 +
 lib/system.c          |    4 ++++
 src/crywrap/crywrap.c |   20 ++++++++++++++++++++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 1956c33..38e9828 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -144,13 +144,9 @@ int ret;
   else
     ret = session->internals.errno_func (session->
                                           internals.transport_recv_ptr);
-#if defined(_AIX) || defined(AIX)
-  if (ret == 0) ret = EAGAIN;
-#endif
   return ret;
 }
 
-
 static ssize_t
 _gnutls_dgram_read (gnutls_session_t session, mbuffer_st **bufel,
                    gnutls_pull_func pull_func)
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index a3e431f..3330533 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -216,6 +216,7 @@ GNUTLS_1_4
     gnutls_openpgp_privkey_import;
     gnutls_openpgp_privkey_init;
     gnutls_openpgp_privkey_set_preferred_key_id;
+    gnutls_openpgp_privkey_sign_hash;
     gnutls_openpgp_send_cert;
     gnutls_openpgp_set_recv_key_function;
     gnutls_pem_base64_decode;
diff --git a/lib/system.c b/lib/system.c
index 5b7dbed..226692c 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -81,6 +81,10 @@ system_write (gnutls_transport_ptr ptr, const void *data, 
size_t data_size)
 int
 system_errno (gnutls_transport_ptr_t ptr)
 {
+#if defined(_AIX) || defined(AIX)
+  if (errno == 0) errno = EAGAIN;
+#endif
+
   return errno;
 }
 
diff --git a/src/crywrap/crywrap.c b/src/crywrap/crywrap.c
index bdf4e0f..1c51d63 100644
--- a/src/crywrap/crywrap.c
+++ b/src/crywrap/crywrap.c
@@ -280,6 +280,11 @@ _crywrap_addr_get (const char *hostname, struct 
sockaddr_storage **addr)
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_protocol = IPPROTO_IP;
   *addr = calloc (1, sizeof (struct sockaddr_storage));
+  if (*addr == NULL)
+    {
+      free(lz);
+      return -1;
+    }
 
   if (getaddrinfo (lz, NULL, &hints, &res) != 0)
     {
@@ -485,6 +490,9 @@ _crywrap_config_parse (int argc, char **argv)
   crywrap_config_t *config =
     (crywrap_config_t *)malloc (sizeof (crywrap_config_t));
 
+  if (config == NULL)
+    return NULL;
+
   config->listen.port = 0;
   config->listen.addr = NULL;
   config->dest.port = 0;
@@ -641,6 +649,9 @@ _crywrap_listen (const crywrap_config_t *config)
   int ret;
 
   cur = calloc (1, sizeof (struct addrinfo));
+  if (cur == NULL)
+    return -1;
+  
   cur->ai_family = config->listen.addr->ss_family;
 
   switch (cur->ai_family)
@@ -654,6 +665,9 @@ _crywrap_listen (const crywrap_config_t *config)
     }
 
   cur->ai_addr = malloc (cur->ai_addrlen);
+  if (cur->ai_addr == NULL)
+    return -1;
+  
   memcpy (cur->ai_addr, config->listen.addr, cur->ai_addrlen);
 
   ret = _crywrap_bind (cur, htons (config->listen.port));
@@ -679,6 +693,9 @@ _crywrap_remote_connect (const struct sockaddr_storage 
*addr, int port)
   int sock;
 
   cur = calloc (1, sizeof (struct addrinfo));
+  if (cur == NULL)
+    return -1;
+
   cur->ai_family = addr->ss_family;
 
   switch (cur->ai_family)
@@ -692,6 +709,9 @@ _crywrap_remote_connect (const struct sockaddr_storage 
*addr, int port)
     }
 
   cur->ai_addr = malloc (cur->ai_addrlen);
+  if (cur->ai_addr == NULL)
+    return -1;
+
   memcpy (cur->ai_addr, addr, cur->ai_addrlen);
 
   switch (cur->ai_family)


hooks/post-receive
-- 
GNU gnutls