[SCM] GNU gnutls branch, master, updated. gnutls_3_0_13-13-g30a482e

[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=30a482e8c302312459337cd04e730497980c3a1c

The branch, master has been updated
       via  30a482e8c302312459337cd04e730497980c3a1c (commit)
       via  9a848ba75f6548d46d3d7ce48022fb5a05a6b65d (commit)
       via  e828dd1b26b68fd004bfacbe8bdc37a056be0d09 (commit)
      from  9c62f4feb2bdd6fbbb06eb0c60bfdea80d21bbb8 (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 30a482e8c302312459337cd04e730497980c3a1c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 19 23:20:30 2012 +0100

    Optimizations in command line argument handling. Patch by Bruce Korb.

commit 9a848ba75f6548d46d3d7ce48022fb5a05a6b65d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 19 23:20:24 2012 +0100

    documented fix

commit e828dd1b26b68fd004bfacbe8bdc37a056be0d09
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 19 23:19:56 2012 +0100

    more files to ignore

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

Summary of changes:
 .gitignore             |    5 +---
 Makefile.am            |    2 +-
 NEWS                   |    3 ++
 src/Makefile.am        |   16 ++++++------
 src/args-std.def       |   58 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/certtool-args.def  |   46 +++----------------------------------
 src/cli-args.def       |   36 +----------------------------
 src/cli-debug-args.def |   39 +++-----------------------------
 src/ocsptool-args.def  |   54 +++-----------------------------------------
 src/p11tool-args.def   |   35 +---------------------------
 src/psk-args.def       |   27 +---------------------
 src/serv-args.def      |   27 +---------------------
 src/srptool-args.def   |   27 +---------------------
 13 files changed, 90 insertions(+), 285 deletions(-)
 create mode 100644 src/args-std.def

diff --git a/.gitignore b/.gitignore
index e4758e8..9b7090c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,10 +95,7 @@ doc/gnutls.dvi
 doc/gnutls.fn
 doc/gnutls.fns
 doc/gnutls.html
-doc/gnutls.info
-doc/gnutls.info-1
-doc/gnutls.info-2
-doc/gnutls.info-3
+doc/gnutls.info*
 doc/gnutls.ky
 doc/gnutls.log
 doc/gnutls.pdf
diff --git a/Makefile.am b/Makefile.am
index dd4bf17..3db69b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ dist-hook:
        rm -f ChangeLog
        make ChangeLog
        cp -f ChangeLog $(distdir)/
-       sed 's/address@hidden@/$(VERSION)/g' -i $(distdir)/src/*.def
+       sed 's/address@hidden@/$(VERSION)/g' -i $(distdir)/src/args-std.def
        cd $(distdir)/src/ && for i in *.def;do \
                autogen $$i; \
                cp $$i $$i.tmp; \
diff --git a/NEWS b/NEWS
index 2faba9f..89c11cd 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ See the end for copying conditions.
 ** command line apps: Included libopts doesn't get installed
 by default.
 
+** libgnutls: Eliminate double free on wrongly formatted
+certificate list. Reported by Remi Gacogne.
+
 ** libgnutls: cryptodev code corrected.
 
 ** API and ABI modifications:
diff --git a/src/Makefile.am b/src/Makefile.am
index 33f3ff3..e48de99 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -142,19 +142,19 @@ libcmd_p11tool_la_LIBADD += ../gl/libgnu.la 
$(INET_PTON_LIB)
 
 endif # ENABLE_PKCS11
 
-ocsptool-args.c: $(srcdir)/ocsptool-args.def
+ocsptool-args.c: $(srcdir)/args-std.def $(srcdir)/ocsptool-args.def
        -autogen ocsptool-args.def
-p11tool-args.c: $(srcdir)/p11tool-args.def
+p11tool-args.c: $(srcdir)/args-std.def $(srcdir)/p11tool-args.def
        -autogen p11tool-args.def
-psk-args.c: $(srcdir)/psk-args.def
+psk-args.c: $(srcdir)/args-std.def $(srcdir)/psk-args.def
        -autogen psk-args.def
-cli-debug-args.c: $(srcdir)/cli-debug-args.def
+cli-debug-args.c: $(srcdir)/args-std.def $(srcdir)/cli-debug-args.def
        -autogen cli-debug-args.def
-cli-args.c: $(srcdir)/cli-args.def
+cli-args.c: $(srcdir)/args-std.def $(srcdir)/cli-args.def
        -autogen cli-args.def
-serv-args.c: $(srcdir)/serv-args.def
+serv-args.c: $(srcdir)/args-std.def $(srcdir)/serv-args.def
        -autogen serv-args.def
-srptool-args.c: $(srcdir)/srptool-args.def
+srptool-args.c: $(srcdir)/args-std.def $(srcdir)/srptool-args.def
        -autogen srptool-args.def
-certtool-args.c: $(srcdir)/certtool-args.def
+certtool-args.c: $(srcdir)/args-std.def $(srcdir)/certtool-args.def
        -autogen certtool-args.def
diff --git a/src/args-std.def b/src/args-std.def
new file mode 100644
index 0000000..10cedda
--- /dev/null
+++ b/src/args-std.def
@@ -0,0 +1,58 @@
+
+prog-group      = GnuTLS;
+config-header   = config.h;
+gnu-usage;
+disable-save;
+long-opts;
+no-xlate        = opt;
+version         = "@VERSION@";
+no-misuse-usage;
+export          = '#include <gettext.h>';
+
+copyright = {
+    date  = "2000-2012";
+    owner = "Free Software Foundation";
+    author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; "
+             "see /usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
+    eaddr  = "address@hidden";
+    type  = gpl;
+};
+
+help-value    = h;
+flag = {
+    name      = debug;
+    value     = d;
+    arg-type  = number;
+    arg-range = "0 -> 9999";
+    descrip   = "Enable debugging.";
+    doc       = "Specifies the debug level.";
+};
+
+#ifdef VERBOSE_OPT
+flag = {
+    name      = verbose;
+    value     = V;
+    max       = NOLIMIT;
+    descrip   = "More verbose output";
+    doc      = "";
+};
+#endif
+
+#ifdef INFILE_OPT
+flag = {
+    name      = infile;
+    arg-type  = file;
+    file-exists = yes;
+    descrip   = "Input file";
+    doc   = "";
+};
+#endif
+
+#ifdef OUTFILE_OPT
+flag = {
+    name      = outfile;
+    arg-type  = string;
+    descrip   = "Output file";
+    doc   = "";
+};
+#endif
diff --git a/src/certtool-args.def b/src/certtool-args.def
index 3db0455..ca9d944 100644
--- a/src/certtool-args.def
+++ b/src/certtool-args.def
@@ -5,35 +5,12 @@ prog-desc     = "Manipulate certificates and private keys.";
 detail    = "Tool to parse and generate X.509 certificates, requests and 
private keys.
 It can be used interactively or non interactively by
 specifying the template command line option.";
-help-value = "h";
 short-usage   = "certtool [options] [url]\ncerttool --help for usage 
instructions.\n";
-prog-group    = "GnuTLS";
 explain       = "";
-gnu-usage;
-no-xlate = opt;
-no-misuse-usage;
-disable-save;
-long-opts;
-config-header = 'config.h';
-export = '#include <gettext.h>';
-
-copyright = {
-    date  = "2000-2012";
-    owner = "Free Software Foundation";
-    author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; see 
/usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "address@hidden";
-    type  = gpl;
-};
-version = "@VERSION@";
-
-flag = {
-    name      = debug;
-    value     = d;
-    arg-type  = number;
-    arg-range = "0 -> 9999";
-    descrip   = "Enable debugging.";
-    doc       = "Specifies the debug level.";
-};
+
+#define  INFILE_OPT    1
+#define  OUTFILE_OPT   1
+#include args-std.def
 
 flag = {
     name      = generate-self-signed;
@@ -352,21 +329,6 @@ flag = {
 };
 
 flag = {
-    name      = outfile;
-    arg-type  = string;
-    descrip   = "Output file";
-    doc   = "";
-};
-
-flag = {
-    name      = infile;
-    arg-type  = file;
-    file-exists = yes;
-    descrip   = "Input file";
-    doc   = "";
-};
-
-flag = {
     name      = template;
     arg-type  = file;
     file-exists = yes;
diff --git a/src/cli-args.def b/src/cli-args.def
index f12c245..33e9685 100644
--- a/src/cli-args.def
+++ b/src/cli-args.def
@@ -2,39 +2,15 @@ AutoGen Definitions options;
 prog-name     = gnutls-cli;
 prog-title    = "GnuTLS client";
 prog-desc     = "Simple client program to set up a TLS connection.";
-help-value = "h";
 short-usage   = "Usage: gnutls-cli [options] hostname\ngnutls-cli --help for 
usage instructions.\n";
-prog-group    = "GnuTLS";
 explain       = "";
 detail        = "Simple client program to set up a TLS connection to some 
other computer. 
 It sets up a TLS connection and forwards data from the standard input to the 
secured socket and vice versa.";
-gnu-usage;
-no-misuse-usage;
-disable-save;
 reorder-args;
-no-xlate = opt;
 argument = "[hostname]";
-long-opts;
-config-header = 'config.h';
-export = '#include <gettext.h>';
 
-copyright = {
-    date  = "2000-2012";
-    owner = "Free Software Foundation";
-    author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; see 
/usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "address@hidden";
-    type  = gpl;
-};
-version = "@VERSION@";
-
-flag = {
-    name      = debug;
-    value     = d;
-    arg-type  = number;
-    arg-range = "0 -> 9999";
-    descrip   = "Enable debugging";
-    doc       = "";
-};
+#define  VERBOSE_OPT 1
+#include args-std.def
 
 flag = {
     name      = tofu;
@@ -134,14 +110,6 @@ flag = {
 };
 
 flag = {
-    name      = verbose;
-    value     = V;
-    max       = NOLIMIT;
-    descrip   = "More verbose output";
-    doc      = "";
-};
-
-flag = {
     name      = priority;
     arg-type  = string;
     descrip   = "Priorities string";
diff --git a/src/cli-debug-args.def b/src/cli-debug-args.def
index e07fd48..aae3c7e 100644
--- a/src/cli-debug-args.def
+++ b/src/cli-debug-args.def
@@ -2,9 +2,8 @@ AutoGen Definitions options;
 prog-name     = gnutls-cli-debug;
 prog-title    = "GnuTLS debug client";
 prog-desc     = "Simple client program to check TLS server capabilities.";
-help-value = "h";
-short-usage   = "Usage: gnutls-cli-debug [options] hostname\ngnutls-cli --help 
for usage instructions.\n";
-prog-group    = "GnuTLS";
+short-usage   = "Usage: gnutls-cli-debug [options] hostname\n"
+                "gnutls-cli --help for usage instructions.\n";
 explain       = "";
 detail        = "TLS debug client. It sets up multiple TLS connections to 
 a server and queries its capabilities. It was created to assist in debugging 
@@ -12,41 +11,11 @@ GnuTLS, but it might be useful to extract a TLS server's 
capabilities.
 It connects to a TLS server, performs tests and print the server's 
 capabilities. If called with the `-v' parameter more checks will be performed.
 Can be used to check for servers with special needs or bugs.";
-gnu-usage;
-no-xlate = opt;
-no-misuse-usage;
-disable-save;
 reorder-args;
 argument;
-long-opts;
-config-header = 'config.h';
-export = '#include <gettext.h>';
 
-copyright = {
-    date  = "2000-2012";
-    owner = "Free Software Foundation";
-    author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; see 
/usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "address@hidden";
-    type  = gpl;
-};
-version = "@VERSION@";
-
-flag = {
-    name      = debug;
-    value     = d;
-    arg-type  = number;
-    arg-range = "0 -> 9999";
-    descrip   = "Enable debugging";
-    doc       = "";
-};
-
-flag = {
-    name      = verbose;
-    value     = V;
-    max       = NOLIMIT;
-    descrip   = "More verbose output";
-    doc      = "";
-};
+#define  VERBOSE_OPT 1
+#include args-std.def
 
 flag = {
     name      = port;
diff --git a/src/ocsptool-args.def b/src/ocsptool-args.def
index 9fe9320..b6efe43 100644
--- a/src/ocsptool-args.def
+++ b/src/ocsptool-args.def
@@ -2,39 +2,16 @@ AutoGen Definitions options;
 prog-name     = ocsptool;
 prog-title    = "GnuTLS OCSP tool";
 prog-desc     = "Program to handle OCSP request/responses.";
-help-value = "h";
 detail    = "Ocsptool is a program that can parse and print information about
 OCSP requests/responses, generate requests and verify responses.
 ";
 short-usage   = "ocsptool [options]\nocsptool --help for usage 
instructions.\n";
-prog-group    = "GnuTLS";
 explain       = "";
-gnu-usage;
-no-xlate = opt;
-no-misuse-usage;
-disable-save;
-long-opts;
-config-header = 'config.h';
-export = '#include <gettext.h>';
-
-copyright = {
-    date  = "2012";
-    owner = "Free Software Foundation";
-    author = "Simon Josefsson, Nikos Mavrogiannopoulos and others; see 
/usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "address@hidden";
-    type  = gpl;
-};
-version = "@VERSION@";
 
-flag = {
-    name      = debug;
-    value     = d;
-    arg-type  = number;
-    arg-default = 0;
-    arg-range = "0 -> 9999";
-    descrip   = "Enable debugging.";
-    doc       = "Specifies the debug level.";
-};
+#define  INFILE_OPT   1
+#define  OUTFILE_OPT  1
+#define  VERBOSE_OPT  1
+#include args-std.def
 
 flag = {
     name      = ask;
@@ -143,29 +120,6 @@ flag = {
     doc      = "";
 };
 
-flag = {
-    name      = outfile;
-    arg-type  = string;
-    descrip   = "Output file";
-    doc      = "";
-};
-
-flag = {
-    name      = infile;
-    arg-type  = file;
-    file-exists = yes;
-    descrip   = "Input file";
-    doc   = "";
-};
-
-flag = {
-    name      = verbose;
-    value     = V;
-    max       = NOLIMIT;
-    descrip   = "More verbose output";
-    doc      = "";
-};
-
 doc-section = {
   ds-type = 'SEE ALSO';
   ds-format = 'texi';
diff --git a/src/p11tool-args.def b/src/p11tool-args.def
index 89b044f..5a058e4 100644
--- a/src/p11tool-args.def
+++ b/src/p11tool-args.def
@@ -2,7 +2,6 @@ AutoGen Definitions options;
 prog-name     = p11tool;
 prog-title    = "GnuTLS PKCS #11 tool";
 prog-desc     = "Program to handle PKCS #11 smart cards and security 
modules.\n";
-help-value = "h";
 detail    = "Program that allows handling data from PKCS #11 smart cards
 and security modules. 
 
@@ -11,35 +10,12 @@ To use PKCS #11 tokens with gnutls the configuration file
 ";
 
 short-usage   = "p11tool [options] [url]\np11tool --help for usage 
instructions.\n";
-prog-group    = "GnuTLS";
 explain       = "";
-gnu-usage;
 reorder-args;
-no-xlate = opt;
 argument = "[url]";
-no-misuse-usage;
-disable-save;
-long-opts;
-config-header = 'config.h';
-export = '#include <gettext.h>';
-
-copyright = {
-    date  = "2000-2012";
-    owner = "Free Software Foundation";
-    author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; see 
/usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "address@hidden";
-    type  = gpl;
-};
-version = "@VERSION@";
 
-flag = {
-    name      = debug;
-    value     = d;
-    arg-type  = number;
-    arg-range = "0 -> 9999";
-    descrip   = "Enable debugging.";
-    doc       = "Specifies the debug level.";
-};
+#define  OUTFILE_OPT   1
+#include args-std.def
 
 flag = {
     name      = list-tokens;
@@ -238,13 +214,6 @@ flag = {
     doc      = "This will override the default options in 
/etc/gnutls/pkcs11.conf";
 };
 
-flag = {
-    name      = outfile;
-    arg-type  = string;
-    descrip   = "Output file";
-    doc      = "";
-};
-
 
 doc-section = {
   ds-type = 'SEE ALSO';
diff --git a/src/psk-args.def b/src/psk-args.def
index b15915b..d19ae26 100644
--- a/src/psk-args.def
+++ b/src/psk-args.def
@@ -4,35 +4,10 @@ prog-title    = "GnuTLS PSK tool";
 prog-desc     = "Program to create PSK parameters.\n";
 detail    = "Program  that generates random keys for use with TLS-PSK. The
 keys are stored in hexadecimal format in a key file.";
-help-value = "h";
 short-usage   = "psktool [options]\npsktool --help for usage instructions.\n";
-prog-group    = "GnuTLS";
 explain       = "";
-gnu-usage;
-no-xlate = opt;
-no-misuse-usage;
-disable-save;
-long-opts;
-config-header = 'config.h';
-export = '#include <gettext.h>';
 
-copyright = {
-    date  = "2000-2012";
-    owner = "Free Software Foundation";
-    author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; see 
/usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "address@hidden";
-    type  = gpl;
-};
-version = "@VERSION@";
-
-flag = {
-    name      = debug;
-    value     = d;
-    arg-type  = number;
-    arg-range = "0 -> 9999";
-    descrip   = "Enable debugging.";
-    doc       = "Specifies the debug level.";
-};
+#include args-std.def
 
 flag = {
     name      = keysize;
diff --git a/src/serv-args.def b/src/serv-args.def
index d39d875..9264d13 100644
--- a/src/serv-args.def
+++ b/src/serv-args.def
@@ -3,35 +3,10 @@ prog-name     = gnutls-serv;
 prog-title    = "GnuTLS server";
 prog-desc     = "Simple server program to act as an HTTPS or TLS echo 
service.";
 short-usage   = "Usage: gnutls-serv [options]\ngnutls-serv --help for usage 
instructions.\n";
-help-value = "h";
-prog-group    = "GnuTLS";
 explain       = "";
 detail        = "Server program that listens to incoming TLS connections.";
-gnu-usage;
-no-xlate = opt;
-no-misuse-usage;
-disable-save;
-long-opts;
-config-header = 'config.h';
-export = '#include <gettext.h>';
-
-copyright = {
-    date  = "2000-2012";
-    owner = "Free Software Foundation";
-    author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; see 
/usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "address@hidden";
-    type  = gpl;
-};
-version = "@VERSION@";
 
-flag = {
-    name      = debug;
-    value     = d;
-    arg-type  = number;
-    arg-range = "0 -> 9999";
-    descrip   = "Enable debugging";
-    doc       = "";
-};
+#include args-std.def
 
 flag = {
     name      = noticket;
diff --git a/src/srptool-args.def b/src/srptool-args.def
index cc7957d..5794ff4 100644
--- a/src/srptool-args.def
+++ b/src/srptool-args.def
@@ -2,7 +2,6 @@ AutoGen Definitions options;
 prog-name     = srptool;
 prog-title    = "GnuTLS SRP tool";
 prog-desc     = "Simple program to create SRP parameters.\n";
-help-value = "h";
 explain       = "";
 detail    = "Simple program that emulates the programs in the Stanford SRP 
(Secure
 Remote Password) libraries using GnuTLS.  It is intended for use in  places
@@ -13,32 +12,8 @@ file that holds the users and the verifiers associated with  
them  and  the
 configuration file to hold the group parameters (called tpasswd.conf).";
 
 short-usage   = "srptool [options]\nsrptool --help for usage instructions.\n";
-prog-group    = "GnuTLS";
-no-xlate = opt;
-gnu-usage;
-no-misuse-usage;
-disable-save;
-long-opts;
-config-header = 'config.h';
-export = '#include <gettext.h>';
-
-copyright = {
-    date  = "2000-2012";
-    owner = "Free Software Foundation";
-    author = "Nikos Mavrogiannopoulos, Simon Josefsson and others; see 
/usr/share/doc/gnutls-bin/AUTHORS for a complete list.";
-    eaddr  = "address@hidden";
-    type  = gpl;
-};
-version = "@VERSION@";
 
-flag = {
-    name      = debug;
-    value     = d;
-    arg-type  = number;
-    arg-range = "0 -> 9999";
-    descrip   = "Enable debugging.";
-    doc       = "Specifies the debug level.";
-};
+#include args-std.def
 
 flag = {
     name      = index;


hooks/post-receive
-- 
GNU gnutls