[SCM] GNU gnutls branch, master, updated. gnutls_3_0_0-103-gda8fdf5

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

The branch, master has been updated
       via  da8fdf5ca317cf112d5a0f540d856d0da736545a (commit)
       via  2182dccc822126d20583d0eebc9a1a0edd0932c3 (commit)
       via  df1778a638d45bda2539299948ef0ebfd6b407a6 (commit)
       via  432889638f11fc7e1b90881e974f0ff8af3cc50c (commit)
      from  c6c0367ab0d9131321caf136afbe8fa58d65db3b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 doc/manpages/Makefile.am |    2 +-
 doc/manpages/crywrap.8   |  121 ----------------------------------------------
 lib/gnutls_buffers.c     |    4 --
 lib/libgnutls.map        |    1 +
 lib/system.c             |    4 ++
 src/crywrap/crywrap.c    |   20 ++++++++
 6 files changed, 26 insertions(+), 126 deletions(-)
 delete mode 100644 doc/manpages/crywrap.8

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 1c0bb65..1441501 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -21,7 +21,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 dist_man_MANS = gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1  \
-       certtool.1 psktool.1 p11tool.1 crywrap.8
+       certtool.1 psktool.1 p11tool.1
 
 if ENABLE_SRP
 dist_man_MANS += srptool.1
diff --git a/doc/manpages/crywrap.8 b/doc/manpages/crywrap.8
deleted file mode 100644
index 76a6c92..0000000
--- a/doc/manpages/crywrap.8
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" -*- nroff -*-
-.\" This manual is for CRYWrap
-.\" 
-.\" Copyright (C) 2003 Gergely Nagy <algernon@@bonehunter.rulez.org>
-.\"
-.\" Permission is granted to make and distribute verbatim copies of this
-.\" manual provided the copyright notice and this permission notice are
-.\" preserved on all copies.
-.\"
-.\" Permission is granted to copy and distribute modified versions of this
-.\" manual under the conditions for verbatim copying, provided that the
-.\" entire resulting derived work is distributed under the terms of a
-.\" permission notice identical to this one.
-.\"
-.\" Permission is granted to copy and distribute translations of this
-.\" manual into another language, under the above conditions for modified
-.\" versions, except that this permission notice may be stated in a
-.\" translation approved by the Author.
-.TH CRYWRAP 8 "03 May 2003" "CryWrap" "CryWrap"
-.SH "NAME"
-CryWrap \- Simple TCP/IP service encryption using TLS/SSL
-.SH "SYNOPSIS"
-.BI "crywrap \-\-listen " HOST / PORT " \-\-destination " HOST / PORT
-.BI [ options ]
-.SH "DESCRIPTION"
-.B CryWrap
-is a simple wrapper that waits for TLS/SSL connections, and proxies
-them to an unencrypted location.
-.SH "OPTIONS"
-.B CryWrap
-takes the following options:
-.SS "Required options"
-.TP
-.BI "\-\-destionation (\-d) " HOST / PORT
-The destionation host and address, where CryWrap should connect
-to. Both arguments are required.
-.SS "TLS options"
-.TP
-.B \-\-anon (\-a)
-Enables Anon-DH mode. If enabled, no certificate will be sent to the
-client, and only anonymous sessions will be enabled.
-.br
-Default is \fBoff\fR.
-.TP
-.BI "\-\-cert (\-c) " PATH
-.TP
-.BI "\-\-key (\-k) " PATH
-.br
-The public certificate to send to clients, and the private server key.
-.br
-Default is \fB/etc/crywrap/server.pem\fR, unless \fB--anon\fR is also
-specified, in which case no certificate will be used.
-.BI "\-\-ca (\-z) " PATH
-.br
-A Certificate Authority certificate to be used for verification of client 
certificates.
-.TP
-.BI "\-\-verify (\-v) [" LEVEL ]
-Set the level of client certificate verification. Level one simply
-logs the result, level two and above abort if the certificate could
-not be verified.
-.br
-Default is \fB0\fR.
-.SS "Miscellaneous options"
-.TP
-.B \-\-inetd (\-i)
-Enable inetd-mode. Use this if you want to run CryWrap from inetd. If
-this option is not enabled, then \fB\-\-listen\fR is a required
-option.
-.br
-Default is \fBoff\fR.
-.TP
-.BI "\-\-listen (\-l) " HOST / PORT
-The host and port CryWrap should listen on. \fIHOST\fR can be an IPv4
-or IPv6 address, or a hostname, and is optional \- if unspecified,
-CryWrap will listen on all available addresses. \fIPORT\fR is
-mandatory.
-.br
-This option is required, unless CryWrap was put into inetd mode.
-.TP
-.BI "\-\-pidfile (\-P) " PIDFILE
-Write the pid thy runs with to
-.IR PIDFILE .
-.br
-Default is
-.BR /var/run/crywrap.pid .
-.TP
-.BI "\-\-user (\-u) " UID
-.I UID
-is the numerical user id of the user thy should run as.
-.br
-Default is
-.BR 65534 .
-.TP
-.B \-\-version (\-V)
-Print the version number and exit.
-.TP
-.B \-\-help (\-?)
-Print a verbose help screen and exit.
-.TP
-.B \-\-usage
-Print a short summary of options.
-.SH "EXAMPLES"
-.SS "Setting up pop3s"
-.nf
-crywrap \-\-listen /995 \-\-destination localhost/110
-.fi
-.SS "Setting up imaps with a different certificate"
-.nf
-crywrap \-\-listen /993 \-\-destination localhost/143 \\
-       \-\-pem /etc/ssl/certs/imap.pem
-.fi
-.SH "FILES"
-.TP
-.I /etc/crywrap/
-.RS
-This directory contains the default server key and certificate.
-.RE
-.SH "BUGS"
-Probably many.
-.SH "AUTHOR"
-Gergely Nagy <address@hidden>
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