Imported Upstream version 1.3.1upstream/1.3.1

6 files changed, 70 insertions, 156 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3680049..ae2ad4e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,6 +42,7 @@ CLEANFILES = oidtranstbl.h
 TESTS = cert-basic t-crl-parser t-dnparser
 
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+AM_LDFLAGS = -no-install
 
 noinst_HEADERS = t-common.h
 noinst_PROGRAMS = $(TESTS) t-cms-parser t-crl-parser t-dnparser t-ocsp t-oid
@@ -59,3 +60,5 @@ oidtranstbl.h: Makefile mkoidtbl.awk
                  /usr/share ; do \
           if test -f $$i/dumpasn1.cfg; then f=$$i/dumpasn1.cfg; break; fi; \
         done; $(AWK) -f $(srcdir)/mkoidtbl.awk $$f >$@
+
+LOG_COMPILER = $(VALGRIND)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c165755..b2e1709 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -79,7 +79,9 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
-	$(top_srcdir)/gl/m4/gnulib.m4 $(top_srcdir)/m4/autobuild.m4 \
+	$(top_srcdir)/gl/m4/gnulib.m4 \
+	$(top_srcdir)/gl/m4/valgrind-tests.m4 \
+	$(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/gnupg-typedef.m4 \
 	$(top_srcdir)/m4/gpg-error.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -87,7 +89,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -99,6 +101,9 @@ cert_basic_OBJECTS = cert-basic.$(OBJEXT)
 cert_basic_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 cert_basic_DEPENDENCIES = ../src/libksba.la $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
 t_cms_parser_SOURCES = t-cms-parser.c
 t_cms_parser_OBJECTS = t-cms-parser.$(OBJEXT)
 t_cms_parser_LDADD = $(LDADD)
@@ -120,18 +125,31 @@ t_oid_OBJECTS = t-oid.$(OBJEXT)
 t_oid_LDADD = $(LDADD)
 t_oid_DEPENDENCIES = ../src/libksba.la $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = cert-basic.c t-cms-parser.c t-crl-parser.c t-dnparser.c \
 	$(t_ocsp_SOURCES) t-oid.c
 DIST_SOURCES = cert-basic.c t-cms-parser.c t-crl-parser.c t-dnparser.c \
@@ -151,6 +169,7 @@ ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 ALLOCA_H = @ALLOCA_H@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -227,6 +246,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+VALGRIND = @VALGRIND@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -300,9 +320,11 @@ EXTRA_DIST = $(test_certs) samples/README mkoidtbl.awk
 BUILT_SOURCES = oidtranstbl.h
 CLEANFILES = oidtranstbl.h
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+AM_LDFLAGS = -no-install
 noinst_HEADERS = t-common.h
 LDADD = ../src/libksba.la $(GPG_ERROR_LIBS)
 t_ocsp_SOURCES = t-ocsp.c sha1.c
+LOG_COMPILER = $(VALGRIND)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -349,22 +371,22 @@ clean-noinstPROGRAMS:
 	rm -f $$list
 cert-basic$(EXEEXT): $(cert_basic_OBJECTS) $(cert_basic_DEPENDENCIES) $(EXTRA_cert_basic_DEPENDENCIES) 
 	@rm -f cert-basic$(EXEEXT)
-	$(LINK) $(cert_basic_OBJECTS) $(cert_basic_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(cert_basic_OBJECTS) $(cert_basic_LDADD) $(LIBS)
 t-cms-parser$(EXEEXT): $(t_cms_parser_OBJECTS) $(t_cms_parser_DEPENDENCIES) $(EXTRA_t_cms_parser_DEPENDENCIES) 
 	@rm -f t-cms-parser$(EXEEXT)
-	$(LINK) $(t_cms_parser_OBJECTS) $(t_cms_parser_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_cms_parser_OBJECTS) $(t_cms_parser_LDADD) $(LIBS)
 t-crl-parser$(EXEEXT): $(t_crl_parser_OBJECTS) $(t_crl_parser_DEPENDENCIES) $(EXTRA_t_crl_parser_DEPENDENCIES) 
 	@rm -f t-crl-parser$(EXEEXT)
-	$(LINK) $(t_crl_parser_OBJECTS) $(t_crl_parser_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_crl_parser_OBJECTS) $(t_crl_parser_LDADD) $(LIBS)
 t-dnparser$(EXEEXT): $(t_dnparser_OBJECTS) $(t_dnparser_DEPENDENCIES) $(EXTRA_t_dnparser_DEPENDENCIES) 
 	@rm -f t-dnparser$(EXEEXT)
-	$(LINK) $(t_dnparser_OBJECTS) $(t_dnparser_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_dnparser_OBJECTS) $(t_dnparser_LDADD) $(LIBS)
 t-ocsp$(EXEEXT): $(t_ocsp_OBJECTS) $(t_ocsp_DEPENDENCIES) $(EXTRA_t_ocsp_DEPENDENCIES) 
 	@rm -f t-ocsp$(EXEEXT)
-	$(LINK) $(t_ocsp_OBJECTS) $(t_ocsp_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_ocsp_OBJECTS) $(t_ocsp_LDADD) $(LIBS)
 t-oid$(EXEEXT): $(t_oid_OBJECTS) $(t_oid_DEPENDENCIES) $(EXTRA_t_oid_DEPENDENCIES) 
 	@rm -f t-oid$(EXEEXT)
-	$(LINK) $(t_oid_OBJECTS) $(t_oid_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(t_oid_OBJECTS) $(t_oid_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -381,25 +403,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-oid.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/tests/cert-basic.c b/tests/cert-basic.c
index a70867f..91b394e 100644
--- a/tests/cert-basic.c
+++ b/tests/cert-basic.c
@@ -28,6 +28,7 @@
 #include "../src/keyinfo.h"
 
 #include "oidtranstbl.h"
+#include "t-common.h"
 
 #ifdef __MINGW32CE__
 #define getenv(a) (NULL)
@@ -54,127 +55,6 @@ static int verbose;
 static int errorcount = 0;
 
 
-static void *
-xmalloc (size_t n)
-{
-  char *p = ksba_malloc (n);
-  if (!p)
-    {
-      fprintf (stderr, "out of core\n");
-      exit (1);
-    }
-  return p;
-}
-
-
-void
-print_hex (const unsigned char *p, size_t n)
-{
-  if (!p)
-    fputs ("none", stdout);
-  else
-    {
-      for (; n; n--, p++)
-        printf ("%02X", *p);
-    }
-}
-
-
-
-static void
-print_sexp (ksba_const_sexp_t p)
-{
-  int level = 0;
-
-  if (!p)
-    fputs ("[none]", stdout);
-  else
-    {
-      for (;;)
-        {
-          if (*p == '(')
-            {
-              putchar (*p);
-              p++;
-              level++;
-            }
-          else if (*p == ')')
-            {
-              putchar (*p);
-              p++;
-              if (--level <= 0 )
-                return;
-            }
-          else if (!digitp (p))
-            {
-              fputs ("[invalid s-exp]", stdout);
-              return;
-            }
-          else
-            {
-              char *endp;
-              unsigned long n, i;
-              int need_hex;
-
-              n = strtoul (p, &endp, 10);
-              p = endp;
-              if (*p != ':')
-                {
-                  fputs ("[invalid s-exp]", stdout);
-                  return;
-                }
-              p++;
-              for (i=0; i < n; i++)
-                if ( !((p[i] >='A' && p[i] <= 'Z')
-                       || (p[i] >='a' && p[i] <='z')
-                       || (p[i] >='0' && p[i] <='9')
-                       || p[i] == '-'
-                       || p[i] == '.'))
-                  break;
-              need_hex = (i<n);
-              if (!n /* n==0 is not allowed, but anyway.  */
-                  || (!need_hex
-                      && !((*p >='A' && *p <= 'Z') || (*p >='a' && *p <='z'))))
-                printf ("%lu:", n);
-
-              if (need_hex)
-                {
-                  putchar('#');
-                  for (; n; n--, p++)
-                    printf ("%02X", *p);
-                  putchar('#');
-                }
-              else
-                {
-                  for (; n; n--, p++)
-                    putchar (*p);
-                }
-              putchar(' ');
-            }
-        }
-    }
-}
-
-static void
-print_time (ksba_isotime_t t)
-{
-  if (!t || !*t)
-    fputs ("none", stdout);
-  else
-    printf ("%.4s-%.2s-%.2s %.2s:%.2s:%s", t, t+4, t+6, t+9, t+11, t+13);
-}
-
-static void
-print_dn (char *p)
-{
-
-  if (!p)
-    fputs ("error", stdout);
-  else
-    printf ("`%s'", p);
-}
-
-
 static void
 print_names (int indent, ksba_name_t name)
 {
@@ -640,11 +520,15 @@ one_file (const char *fname)
                              __FILE__, __LINE__);
                     errorcount++;
                     xfree (der2);
+                  } else {
+                    /* Don't leak memory if everything is ok. */
+                    xfree (der2);
                   }
                 xfree (tmp);
               }
             xfree (der);
           }
+        ksba_free (public);
       }
   }
 #endif
diff --git a/tests/mkoidtbl.awk b/tests/mkoidtbl.awk
index 70aae33..f6f827f 100644
--- a/tests/mkoidtbl.awk
+++ b/tests/mkoidtbl.awk
@@ -28,11 +28,15 @@ BEGIN {
 }
 
 /^[ \t]*#/ { next }
-/^OID/     { flush() }
+/^OID/     { flush()
+             oid = substr($0, index($0, "=") + 2)
+             gsub (/[ \t]+/, ".", oid)
+}
 /^Comment/ { comment = substr($0, index($0, "=") + 2 )
              gsub(/\r/, "", comment)
              gsub (/\\/, "\\\\", comment)
              gsub (/"/, "\\\"", comment)
+             gsub (/\(\?\?\?\)/, "(?)", comment)
 }
 /^Description/ {
   desc = substr($0, index($0, "=") + 2)
@@ -40,11 +44,11 @@ BEGIN {
   if (match (desc, /\([0-9 \t]+\)/) > 2) {
     oid = substr(desc, RSTART+1, RLENGTH-2 )
     desc = substr(desc, 1, RSTART-1);
-    gsub (/[ \t]+/, ".", oid)
-    gsub (/\\/, "\\\\", desc)
-    gsub (/"/, "\\\"", desc)
-    sub (/[ \t]*$/, "", desc)
   }
+  gsub (/[ \t]+/, ".", oid)
+  gsub (/\\/, "\\\\", desc)
+  gsub (/"/, "\\\"", desc)
+  sub (/[ \t]*$/, "", desc)
 }
 
 END { flush();  print "  { NULL, NULL, NULL }\n};"  }
diff --git a/tests/t-common.h b/tests/t-common.h
index 71512a9..cf82f3e 100644
--- a/tests/t-common.h
+++ b/tests/t-common.h
@@ -110,6 +110,7 @@ print_sexp (ksba_const_sexp_t p)
           else if (*p == ')')
             {
               putchar (*p);
+              p++;
               if (--level <= 0 )
                 return;
             }
@@ -176,6 +177,7 @@ print_sexp_hex (ksba_const_sexp_t p)
           else if (*p == ')')
             {
               putchar (*p);
+              p++;
               if (--level <= 0 )
                 return;
             }
diff --git a/tests/t-dnparser.c b/tests/t-dnparser.c
index 2457767..c8d4b0d 100644
--- a/tests/t-dnparser.c
+++ b/tests/t-dnparser.c
@@ -133,14 +133,13 @@ int
 main (int argc, char **argv)
 {
   char inputbuf[4096];
-  int inputlen;
   unsigned char *buf;
   size_t len;
   gpg_error_t err;
 
   if (argc == 2 && !strcmp (argv[1], "--to-str") )
     { /* Read the DER encoded DN from stdin write the string to stdout */
-      inputlen = fread (inputbuf, 1, sizeof inputbuf, stdin);
+      fread (inputbuf, 1, sizeof inputbuf, stdin);
       if (!feof (stdin))
         fail ("read error or input too large");
 
@@ -149,7 +148,7 @@ main (int argc, char **argv)
     }
   else if (argc == 2 && !strcmp (argv[1], "--to-der") )
     { /* Read the String from stdin write the DER encoding to stdout */
-      inputlen = fread (inputbuf, 1, sizeof inputbuf, stdin);
+      fread (inputbuf, 1, sizeof inputbuf, stdin);
       if (!feof (stdin))
         fail ("read error or input too large");