aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/567064FE6D14A17B2D811ABB407728BC558AA45518
-rw-r--r--tests/ChangeLog68
-rw-r--r--tests/Makefile.am78
-rw-r--r--tests/asschk.c1059
-rw-r--r--tests/cert_cci_sphinx_ca.pem18
-rw-r--r--tests/cert_cci_test_wzs.pem4
-rw-r--r--tests/cert_cci_test_zs.pem16
-rw-r--r--tests/cert_cci_user02.pem17
-rw-r--r--tests/cert_cci_user03.pem17
-rw-r--r--tests/cert_cci_user04.pem17
-rw-r--r--tests/cert_cci_user06.pem17
-rw-r--r--tests/cert_cci_user07.pem17
-rw-r--r--tests/cert_testpki_testpca.pem21
-rw-r--r--tests/crl_testpki_testpca.pem18
-rwxr-xr-xtests/inittests99
-rw-r--r--tests/key_g10code_pete1.pem18
-rw-r--r--tests/key_g10code_theo1.pem21
-rwxr-xr-xtests/runtest5
-rw-r--r--tests/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key18
-rw-r--r--tests/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key10
-rw-r--r--tests/samplekeys/cert_g10code_enconly_1.pem26
-rw-r--r--tests/samplekeys/cert_g10code_pete1.pem24
-rw-r--r--tests/samplekeys/cert_g10code_test1.pem19
-rw-r--r--tests/samplekeys/cert_g10code_test_ca.pem27
-rw-r--r--tests/samplekeys/cert_g10code_theo1.pem40
-rw-r--r--tests/skey_g10code_test1.pem19
-rw-r--r--tests/sm-sign+verify73
-rw-r--r--tests/sm-verify114
-rw-r--r--tests/text-1.dsig.pem27
-rw-r--r--tests/text-1.osig-bad.pem45
-rw-r--r--tests/text-1.osig-badusage.pem75
-rw-r--r--tests/text-1.osig.pem48
-rw-r--r--tests/text-1.txt17
-rw-r--r--tests/text-2.osig-bad.pem28
-rw-r--r--tests/text-2.osig.pem29
-rw-r--r--tests/text-2.txt2
-rw-r--r--tests/text-3.txt2
37 files changed, 0 insertions, 2171 deletions
diff --git a/tests/567064FE6D14A17B2D811ABB407728BC558AA455 b/tests/567064FE6D14A17B2D811ABB407728BC558AA455
deleted file mode 100644
index cf0535ff7..000000000
--- a/tests/567064FE6D14A17B2D811ABB407728BC558AA455
+++ /dev/null
@@ -1,18 +0,0 @@
-(private-key
- (oid.1.2.840.113549.1.1.1
- (n #00e0ce96f90b6c9e02f3922beada93fe50a875eac6bcc18bb9a9cf2e84965caa2d1ff95a7f542465c6c0c19d276e4526ce048868a7a914fd343cc3a87dd74291ffc565506d5bbb25cbac6a0e2dd1f8bcaab0d4a29c2f37c950f363484bf269f7891440464baf79827e03a36e70b814938eebdc63e964247be75dc58b014b7ea251#)
- (e #010001#)
- (d #046129F2489D71579BE0A75FE029BD6CDB574EBF57EA8A5B0FDA942CAB943B117D7BB95E5D28875E0F9FC5FCC06A72F6D502464DABDED78EF6B716177B83D5BDC543DC5D3FED932E59F5897E92E6F58A0F33424106A3B6FA2CBF877510E4AC21C3EE47851E97D12996222AC3566D4CCB0B83D164074ABF7DE655FC2446DA1781#)
- (p #00e861b700e17e8afe6837e7512e35b6ca11d0ae47d8b85161c67baf64377213fe52d772f2035b3ca830af41d8a4120e1c1c70d12cc22f00d28d31dd48a8d424f1#)
- (q #00f7a7ca5367c661f8e62df34f0d05c10c88e5492348dd7bddc942c9a8f369f935a07785d2db805215ed786e4285df1658eed3ce84f469b81b50d358407b4ad361#)
- (u #304559a9ead56d2309d203811a641bb1a09626bc8eb36fffa23c968ec5bd891eebbafc73ae666e01ba7c8990bae06cc2bbe10b75e69fcacb353a6473079d8e9b#)
- )
-)
-
-
-
-
-
-
-
-
diff --git a/tests/ChangeLog b/tests/ChangeLog
deleted file mode 100644
index c6b3b9af1..000000000
--- a/tests/ChangeLog
+++ /dev/null
@@ -1,68 +0,0 @@
-2002-12-04 Werner Koch <[email protected]>
-
- * inittests (gpgsm.conf): Fake system time.
-
-2002-10-31 Neal H. Walfield <[email protected]>
-
- * Makefile.am (inittests.stamp): Do not set LD_LIBRARY_PATH here.
- (TESTS_ENVIRONMENT): Do it here. And also frob $(LIBGCRYPT_LIBS)
- and $(PTH_LIBS).
-
-2002-10-31 Neal H. Walfield <[email protected]>
-
- * asschk.c (die): New macro.
- (read_assuan): If in verbose mode, dump the string that was read.
- (write_assuan): Be more verbose on failure.
-
-2002-09-04 Neal H. Walfield <[email protected]>
-
- * Makefile.am (inittests.stamp): Do not set LD_LIBRARY_PATH, but
- rather prepend it. Be more robust and prefer printf over echo -n.
-
-2002-09-04 Marcus Brinkmann <[email protected]>
-
- * asschk.c (start_server): Close the parent's file descriptors in
- the child.
- (read_assuan): Variable NREAD removed. Cut off the received line
- currectly if more than one line was read.
-
-2002-09-03 Neal H. Walfield <[email protected]>
-
- * Makefile.am (inittests.stamp): Construct an LD_LIBRARY_PATH from
- LDFLAGS.
-
-2002-08-09 Werner Koch <[email protected]>
-
- * asschk.c (cmd_getenv): New.
- (expand_line): Allow / as variable name delimiter.
- * sm-sign+verify, sm-verify: Use $srcdir so that a VPATH build works.
-
- * Makefile.am: Fixes for make dist.
- * samplekets/Makefile.am: New.
-
-2002-08-08 Werner Koch <[email protected]>
-
- * asschk.c: Added some new features.
- * runtest, inittests: New.
- * text-1.txt, text-2.txt, text-3.txt: New.
- * text-1.osig.pem, text-1.dsig.pem, text-1.osig-bad.pem: New.
- * text-2.osig.pem, text-2.osig-bad.pem: New.
- * samplekeys : New directory
- * sm-verify, sm-sign+verify: The first test scripts.
-
-2002-08-06 Werner Koch <[email protected]>
-
- * Makefile.am, asschk.c: New.
-
-
- Copyright 2002 Free Software Foundation, Inc.
-
- This file is free software; as a special exception the author gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
- This file is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 622b5fe58..000000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-# Makefile.am -tests makefile for libxtime
-# Copyright (C) 2002 Free Software Foundation, Inc.
-#
-# This file is part of GnuPG.
-#
-# GnuPG is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GnuPG is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-## Process this file with automake to produce Makefile.in
-
-GPGSM = ../sm/gpgsm
-
-# We can't unset a variable here so we unset GPG_AGENT_INFO in runtest
-TESTS_ENVIRONMENT = GNUPGHOME=`pwd` LC_ALL=C GPGSM=$(GPGSM) \
- LD_LIBRARY_PATH=$$(seen=0; \
- for i in $(LDFLAGS) $(LIBGCRYPT_LIBS) $(PTH_LIBS); \
- do \
- if echo "$$i" | egrep '^-L' >/dev/null 2>&1; \
- then \
- if test $$seen = 0; \
- then \
- seen=1; \
- else \
- printf ":"; \
- fi; \
- printf "%s" "$${i}" | sed 's/^-L//'; \
- fi; \
- done; \
- if test $$seen != 0 \
- && test x$${LD_LIBRARY_PATH} != x; \
- then \
- printf ":"; \
- fi; \
- printf "%s" "$${LD_LIBRARY_PATH}") $(srcdir)/runtest
-
-testscripts = sm-sign+verify sm-verify
-
-EXTRA_DIST = runtest inittests $(testscripts) \
- text-1.txt text-2.txt text-3.txt \
- text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
- text-2.osig.pem text-2.osig-bad.pem \
- samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
- samplekeys/cert_g10code_pete1.pem \
- samplekeys/cert_g10code_test1.pem \
- samplekeys/cert_g10code_theo1.pem
-
-TESTS = $(testscripts)
-
-CLEANFILES = inittests.stamp x y y z out err
- *.lock .\#lk*
-
-DISTCLEANFILES = pubring.kbx~ random_seed
-
-noinst_PROGRAMS = asschk
-
-asschk_SOURCES = asschk.c
-
-
-all-local: inittests.stamp
-
-clean-local:
- srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests --clean
-
-inittests.stamp: inittests
- srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests
- echo timestamp >./inittests.stamp
-
diff --git a/tests/asschk.c b/tests/asschk.c
deleted file mode 100644
index 83a8ca5af..000000000
--- a/tests/asschk.c
+++ /dev/null
@@ -1,1059 +0,0 @@
-/* asschk.c - Assuan Server Checker
- * Copyright (C) 2002 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-/* This is a simple stand-alone Assuan server test program. We don't
- want to use the assuan library because we don't want to hide errors
- in that library.
-
- The script language is line based. Empty lines or lines containing
- only white spaces are ignored, line with a hash sign as first non
- white space character are treated as comments.
-
- A simple macro mechanism is implemnted. Macros are expanded before
- a line is processed but after comment processing. Macros are only
- expanded once and non existing macros expand to the empty string.
- A macro is dereferenced by prefixing its name with a dollar sign;
- the end of the name is currently indicated by a white space, a
- dollar sign or a slash. To use a dollor sign verbatim, double it.
-
- A macro is assigned by prefixing a statement with the macro name
- and an equal sign. The value is assigned verbatim if it does not
- resemble a command, otherwise the return value of the command will
- get assigned. The command "let" may be used to assign values
- unambigiously and it should be used if the value starts with a
- letter.
-
- Conditions are not yes implemented except for a simple evaluation
- which yields false for an empty string or the string "0". The
- result may be negated by prefixing with a '!'.
-
- The general syntax of a command is:
-
- [<name> =] <statement> [<args>]
-
- If NAME is not specifed but the statement returns a value it is
- assigned to the name "?" so that it can be referenced using "$?".
- The following commands are implemented:
-
- let <value>
- Return VALUE.
-
- echo <value>
- Print VALUE.
-
- openfile <filename>
- Open file FILENAME for read access and retrun the file descriptor.
-
- createfile <filename>
- Create file FILENAME, open for write access and retrun the file
- descriptor.
-
- pipeserver <program>
- Connect to the Assuan server PROGRAM.
-
- send <line>
- Send LINE to the server.
-
- expect-ok
- Expect an OK response from the server. Status and data out put
- is ignored.
-
- expect-err
- Expect an ERR response from the server. Status and data out put
- is ignored.
-
- count-status <code>
- Initialize the assigned variable to 0 and assign it as an counter for
- status code CODE. This command must be called with an assignment.
-
- quit
- Terminate the process.
-
- quit-if <condition>
- Terminate the process if CONDITION evaluates to true.
-
- fail-if <condition>
- Terminate the process with an exit code of 1 if CONDITION
- evaluates to true.
-
- cmpfiles <first> <second>
- Returns true when the content of the files FIRST and SECOND match.
-
- getenv <name>
- Return the value of the environment variable NAME.
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
-# define ATTR_PRINTF(f,a) __attribute__ ((format (printf,f,a)))
-#else
-# define ATTR_PRINTF(f,a)
-#endif
-
-#define spacep(p) (*(p) == ' ' || *(p) == '\t')
-
-#define MAX_LINELEN 2048
-
-typedef enum {
- LINE_OK = 0,
- LINE_ERR,
- LINE_STAT,
- LINE_DATA,
- LINE_END,
-} LINETYPE;
-
-typedef enum {
- VARTYPE_SIMPLE = 0,
- VARTYPE_FD,
- VARTYPE_COUNTER
-} VARTYPE;
-
-
-struct variable_s {
- struct variable_s *next;
- VARTYPE type;
- unsigned int count;
- char *value;
- char name[1];
-};
-typedef struct variable_s *VARIABLE;
-
-
-static void die (const char *format, ...) ATTR_PRINTF(1,2);
-
-
-/* Name of this program to be printed in error messages. */
-static const char *invocation_name;
-
-/* Talk a bit about what is going on. */
-static int opt_verbose;
-
-/* Option to ignore the echo command. */
-static int opt_no_echo;
-
-/* File descriptors used to communicate with the current server. */
-static int server_send_fd = -1;
-static int server_recv_fd = -1;
-
-/* The Assuan protocol limits the line length to 1024, so we can
- safely use a (larger) buffer. The buffer is filled using the
- read_assuan(). */
-static char recv_line[MAX_LINELEN];
-/* Tell the status of the current line. */
-static LINETYPE recv_type;
-
-/* This is our variable storage. */
-static VARIABLE variable_list;
-
-
-static void
-die (const char *format, ...)
-{
- va_list arg_ptr;
-
- fflush (stdout);
- fprintf (stderr, "%s: ", invocation_name);
-
- va_start (arg_ptr, format);
- vfprintf (stderr, format, arg_ptr);
- va_end (arg_ptr);
- putc ('\n', stderr);
-
- exit (1);
-}
-
-#define die(format, args...) (die) ("%s: " format, __FUNCTION__ , ##args)
-
-static void
-err (const char *format, ...)
-{
- va_list arg_ptr;
-
- fflush (stdout);
- fprintf (stderr, "%s: ", invocation_name);
-
- va_start (arg_ptr, format);
- vfprintf (stderr, format, arg_ptr);
- va_end (arg_ptr);
- putc ('\n', stderr);
-}
-
-static void *
-xmalloc (size_t n)
-{
- void *p = malloc (n);
- if (!p)
- die ("out of core");
- return p;
-}
-
-static void *
-xcalloc (size_t n, size_t m)
-{
- void *p = calloc (n, m);
- if (!p)
- die ("out of core");
- return p;
-}
-
-static char *
-xstrdup (const char *s)
-{
- char *p = xmalloc (strlen (s)+1);
- strcpy (p, s);
- return p;
-}
-
-
-/* Write LENGTH bytes from BUFFER to FD. */
-static int
-writen (int fd, const char *buffer, size_t length)
-{
- while (length)
- {
- int nwritten = write (fd, buffer, length);
-
- if (nwritten < 0)
- {
- if (errno == EINTR)
- continue;
- return -1; /* write error */
- }
- length -= nwritten;
- buffer += nwritten;
- }
- return 0; /* okay */
-}
-
-
-
-
-/* Assuan specific stuff. */
-
-/* Read a line from FD, store it in the global recv_line, analyze the
- type and store that in recv_type. The function terminates on a
- communication error. Returns a pointer into the inputline to the
- first byte of the arguments. The parsing is very strict to match
- excalty what we want to send. */
-static char *
-read_assuan (int fd)
-{
- static char pending[MAX_LINELEN];
- static size_t pending_len;
- size_t nleft = sizeof recv_line;
- char *buf = recv_line;
- char *p;
-
- while (nleft > 0)
- {
- int n;
-
- if (pending_len)
- {
- if (pending_len >= nleft)
- die ("received line too large");
- memcpy (buf, pending, pending_len);
- n = pending_len;
- pending_len = 0;
- }
- else
- n = read (fd, buf, nleft);
-
- if (opt_verbose)
- {
- int i;
- printf ("%s: read \"", __FUNCTION__);
- for (i = 0; i < n; i ++)
- putc (buf[i], stdout);
- printf ("\"\n");
- }
-
- if (n < 0)
- {
- if (errno == EINTR)
- continue;
- die ("reading fd %d failed: %s", fd, strerror (errno));
- }
- else if (!n)
- die ("received incomplete line on fd %d", fd);
- p = buf;
- nleft -= n;
- buf += n;
-
- for (; n && *p != '\n'; n--, p++)
- ;
- if (n)
- {
- if (n>1)
- {
- n--;
- memcpy (pending, p + 1, n);
- pending_len = n;
- }
- *p = '\0';
- break;
- }
- }
- if (!nleft)
- die ("received line too large");
-
- p = recv_line;
- if (p[0] == 'O' && p[1] == 'K' && (p[2] == ' ' || !p[2]))
- {
- recv_type = LINE_OK;
- p += 3;
- }
- else if (p[0] == 'E' && p[1] == 'R' && p[2] == 'R'
- && (p[3] == ' ' || !p[3]))
- {
- recv_type = LINE_ERR;
- p += 4;
- }
- else if (p[0] == 'S' && (p[1] == ' ' || !p[1]))
- {
- recv_type = LINE_STAT;
- p += 2;
- }
- else if (p[0] == 'D' && p[1] == ' ')
- {
- recv_type = LINE_DATA;
- p += 2;
- }
- else if (p[0] == 'E' && p[1] == 'N' && p[2] == 'D' && !p[3])
- {
- recv_type = LINE_END;
- p += 3;
- }
- else
- die ("invalid line type (%.5s)", p);
-
- return p;
-}
-
-/* Write LINE to the server using FD. It is expected that the line
- contains the terminating linefeed as last character. */
-static void
-write_assuan (int fd, const char *line)
-{
- char buffer[1026];
- size_t n = strlen (line);
-
- if (n > 1024)
- die ("line too long for Assuan protocol");
- strcpy (buffer, line);
- if (!n || buffer[n-1] != '\n')
- buffer[n++] = '\n';
-
- if (writen (fd, buffer, n))
- die ("sending line (\"%s\") to %d failed: %s", buffer, fd,
- strerror (errno));
-}
-
-
-/* Start the server with path PGMNAME and connect its stdout and
- strerr to a newly created pipes; the file descriptors are then
- store in the gloabl variables SERVER_SEND_FD and
- SERVER_RECV_FD. The initial handcheck is performed.*/
-static void
-start_server (const char *pgmname)
-{
- int rp[2];
- int wp[2];
- pid_t pid;
-
- if (pipe (rp) < 0)
- die ("pipe creation failed: %s", strerror (errno));
- if (pipe (wp) < 0)
- die ("pipe creation failed: %s", strerror (errno));
-
- fflush (stdout);
- fflush (stderr);
- pid = fork ();
- if (pid < 0)
- die ("fork failed");
-
- if (!pid)
- {
- const char *arg0;
-
- arg0 = strrchr (pgmname, '/');
- if (arg0)
- arg0++;
- else
- arg0 = pgmname;
-
- if (wp[0] != STDIN_FILENO)
- {
- if (dup2 (wp[0], STDIN_FILENO) == -1)
- die ("dup2 failed in child: %s", strerror (errno));
- close (wp[0]);
- }
- if (rp[1] != STDOUT_FILENO)
- {
- if (dup2 (rp[1], STDOUT_FILENO) == -1)
- die ("dup2 failed in child: %s", strerror (errno));
- close (rp[1]);
- }
- if (!opt_verbose)
- {
- int fd = open ("/dev/null", O_WRONLY);
- if (fd == -1)
- die ("can't open `/dev/null': %s", strerror (errno));
- if (dup2 (fd, STDERR_FILENO) == -1)
- die ("dup2 failed in child: %s", strerror (errno));
- close (fd);
- }
-
- close (wp[1]);
- close (rp[0]);
- execl (pgmname, arg0, "--server", NULL);
- die ("exec failed for `%s': %s", pgmname, strerror (errno));
- }
- close (wp[0]);
- close (rp[1]);
- server_send_fd = wp[1];
- server_recv_fd = rp[0];
-
- read_assuan (server_recv_fd);
- if (recv_type != LINE_OK)
- die ("no greating message");
-}
-
-
-
-
-
-/* Script intepreter. */
-
-static void
-unset_var (const char *name)
-{
- VARIABLE var;
-
- for (var=variable_list; var && strcmp (var->name, name); var = var->next)
- ;
- if (!var)
- return;
-/* fprintf (stderr, "unsetting `%s'\n", name); */
-
- if (var->type == VARTYPE_FD && var->value)
- {
- int fd;
-
- fd = atoi (var->value);
- if (fd != -1 && fd != 0 && fd != 1 && fd != 2)
- close (fd);
- }
-
- free (var->value);
- var->value = NULL;
- var->type = 0;
- var->count = 0;
-}
-
-
-static void
-set_type_var (const char *name, const char *value, VARTYPE type)
-{
- VARIABLE var;
-
- if (!name)
- name = "?";
- for (var=variable_list; var && strcmp (var->name, name); var = var->next)
- ;
- if (!var)
- {
- var = xcalloc (1, sizeof *var + strlen (name));
- strcpy (var->name, name);
- var->next = variable_list;
- variable_list = var;
- }
- else
- free (var->value);
-
- if (var->type == VARTYPE_FD && var->value)
- {
- int fd;
-
- fd = atoi (var->value);
- if (fd != -1 && fd != 0 && fd != 1 && fd != 2)
- close (fd);
- }
-
- var->type = type;
- var->count = 0;
- if (var->type == VARTYPE_COUNTER)
- {
- /* We need some extra sapce as scratch area for get_var. */
- var->value = xmalloc (strlen (value) + 1 + 20);
- strcpy (var->value, value);
- }
- else
- var->value = xstrdup (value);
-}
-
-static void
-set_var (const char *name, const char *value)
-{
- set_type_var (name, value, 0);
-}
-
-
-static const char *
-get_var (const char *name)
-{
- VARIABLE var;
-
- for (var=variable_list; var && strcmp (var->name, name); var = var->next)
- ;
- if (!var)
- return NULL;
- if (var->type == VARTYPE_COUNTER && var->value)
- { /* Use the scratch space allocated by set_var. */
- char *p = var->value + strlen(var->value)+1;
- sprintf (p, "%u", var->count);
- return p;
- }
- else
- return var->value;
-}
-
-
-/* Incremente all counter type variables with NAME in their VALUE. */
-static void
-inc_counter (const char *name)
-{
- VARIABLE var;
-
- if (!*name)
- return;
- for (var=variable_list; var; var = var->next)
- {
- if (var->type == VARTYPE_COUNTER
- && var->value && !strcmp (var->value, name))
- var->count++;
- }
-}
-
-
-/* Expand variables in LINE and return a new allocated buffer if
- required. The function might modify LINE if the expanded version
- fits into it. */
-static char *
-expand_line (char *buffer)
-{
- char *line = buffer;
- char *p, *pend;
- const char *value;
- size_t valuelen, n;
- char *result = NULL;
-
- while (*line)
- {
- p = strchr (line, '$');
- if (!p)
- return result; /* nothing more to expand */
-
- if (p[1] == '$') /* quoted */
- {
- memmove (p, p+1, strlen (p+1)+1);
- line = p + 1;
- continue;
- }
- for (pend=p+1; *pend && !spacep (pend)
- && *pend != '$' && *pend != '/'; pend++)
- ;
- if (*pend)
- {
- int save = *pend;
- *pend = 0;
- value = get_var (p+1);
- *pend = save;
- }
- else
- value = get_var (p+1);
- if (!value)
- value = "";
- valuelen = strlen (value);
- if (valuelen <= pend - p)
- {
- memcpy (p, value, valuelen);
- p += valuelen;
- n = pend - p;
- if (n)
- memmove (p, p+n, strlen (p+n)+1);
- line = p;
- }
- else
- {
- char *src = result? result : buffer;
- char *dst;
-
- dst = xmalloc (strlen (src) + valuelen + 1);
- n = p - src;
- memcpy (dst, src, n);
- memcpy (dst + n, value, valuelen);
- n += valuelen;
- strcpy (dst + n, pend);
- line = dst + n;
- free (result);
- result = dst;
- }
- }
- return result;
-}
-
-
-/* Evaluate COND and return the result. */
-static int
-eval_boolean (const char *cond)
-{
- int true = 1;
-
- for ( ; *cond == '!'; cond++)
- true = !true;
- if (!*cond || (*cond == '0' && !cond[1]))
- return !true;
- return true;
-}
-
-
-
-
-
-static void
-cmd_let (const char *assign_to, char *arg)
-{
- set_var (assign_to, arg);
-}
-
-
-static void
-cmd_echo (const char *assign_to, char *arg)
-{
- if (!opt_no_echo)
- printf ("%s\n", arg);
-}
-
-static void
-cmd_send (const char *assign_to, char *arg)
-{
- if (opt_verbose)
- fprintf (stderr, "sending `%s'\n", arg);
- write_assuan (server_send_fd, arg);
-}
-
-static void
-handle_status_line (char *arg)
-{
- char *p;
-
- for (p=arg; *p && !spacep (p); p++)
- ;
- if (*p)
- {
- int save = *p;
- *p = 0;
- inc_counter (arg);
- *p = save;
- }
- else
- inc_counter (arg);
-}
-
-static void
-cmd_expect_ok (const char *assign_to, char *arg)
-{
- if (opt_verbose)
- fprintf (stderr, "expecting OK\n");
- do
- {
- char *p = read_assuan (server_recv_fd);
- if (opt_verbose > 1)
- fprintf (stderr, "got line `%s'\n", recv_line);
- if (recv_type == LINE_STAT)
- handle_status_line (p);
- }
- while (recv_type != LINE_OK && recv_type != LINE_ERR);
- if (recv_type != LINE_OK)
- die ("expected OK but got `%s'", recv_line);
-}
-
-static void
-cmd_expect_err (const char *assign_to, char *arg)
-{
- if (opt_verbose)
- fprintf (stderr, "expecting ERR\n");
- do
- {
- char *p = read_assuan (server_recv_fd);
- if (opt_verbose > 1)
- fprintf (stderr, "got line `%s'\n", recv_line);
- if (recv_type == LINE_STAT)
- handle_status_line (p);
- }
- while (recv_type != LINE_OK && recv_type != LINE_ERR);
- if (recv_type != LINE_ERR)
- die ("expected ERR but got `%s'", recv_line);
-}
-
-static void
-cmd_count_status (const char *assign_to, char *arg)
-{
- char *p;
-
- if (!*assign_to || !*arg)
- die ("syntax error: count-status requires an argument and a variable");
-
- for (p=arg; *p && !spacep (p); p++)
- ;
- if (*p)
- {
- for (*p++ = 0; spacep (p); p++)
- ;
- if (*p)
- die ("cmpfiles: syntax error");
- }
- set_type_var (assign_to, arg, VARTYPE_COUNTER);
-}
-
-static void
-cmd_openfile (const char *assign_to, char *arg)
-{
- int fd;
- char numbuf[20];
-
- do
- fd = open (arg, O_RDONLY);
- while (fd == -1 && errno == EINTR);
- if (fd == -1)
- die ("error opening `%s': %s", arg, strerror (errno));
-
- sprintf (numbuf, "%d", fd);
- set_type_var (assign_to, numbuf, VARTYPE_FD);
-}
-
-static void
-cmd_createfile (const char *assign_to, char *arg)
-{
- int fd;
- char numbuf[20];
-
- do
- fd = open (arg, O_WRONLY|O_CREAT|O_TRUNC, 0666);
- while (fd == -1 && errno == EINTR);
- if (fd == -1)
- die ("error creating `%s': %s", arg, strerror (errno));
-
- sprintf (numbuf, "%d", fd);
- set_type_var (assign_to, numbuf, VARTYPE_FD);
-}
-
-
-static void
-cmd_pipeserver (const char *assign_to, char *arg)
-{
- if (!*arg)
- die ("syntax error: servername missing");
-
- start_server (arg);
-}
-
-
-static void
-cmd_quit_if(const char *assign_to, char *arg)
-{
- if (eval_boolean (arg))
- exit (0);
-}
-
-static void
-cmd_fail_if(const char *assign_to, char *arg)
-{
- if (eval_boolean (arg))
- exit (1);
-}
-
-
-static void
-cmd_cmpfiles (const char *assign_to, char *arg)
-{
- char *p = arg;
- char *second;
- FILE *fp1, *fp2;
- char buffer1[2048]; /* note: both must be of equal size. */
- char buffer2[2048];
- size_t nread1, nread2;
- int rc = 0;
-
- set_var (assign_to, "0");
- for (p=arg; *p && !spacep (p); p++)
- ;
- if (!*p)
- die ("cmpfiles: syntax error");
- for (*p++ = 0; spacep (p); p++)
- ;
- second = p;
- for (; *p && !spacep (p); p++)
- ;
- if (*p)
- {
- for (*p++ = 0; spacep (p); p++)
- ;
- if (*p)
- die ("cmpfiles: syntax error");
- }
-
- fp1 = fopen (arg, "rb");
- if (!fp1)
- {
- err ("can't open `%s': %s", arg, strerror (errno));
- return;
- }
- fp2 = fopen (second, "rb");
- if (!fp2)
- {
- err ("can't open `%s': %s", second, strerror (errno));
- fclose (fp1);
- return;
- }
- while ( (nread1 = fread (buffer1, 1, sizeof buffer1, fp1)))
- {
- if (ferror (fp1))
- break;
- nread2 = fread (buffer2, 1, sizeof buffer2, fp2);
- if (ferror (fp2))
- break;
- if (nread1 != nread2 || memcmp (buffer1, buffer2, nread1))
- {
- rc = 1;
- break;
- }
- }
- if (feof (fp1) && feof (fp2) && !rc)
- {
- if (opt_verbose)
- err ("files match");
- set_var (assign_to, "1");
- }
- else if (!rc)
- err ("cmpfiles: read error: %s", strerror (errno));
- else
- err ("cmpfiles: mismatch");
- fclose (fp1);
- fclose (fp2);
-}
-
-static void
-cmd_getenv (const char *assign_to, char *arg)
-{
- const char *s;
- s = *arg? getenv (arg):"";
- set_var (assign_to, s? s:"");
-}
-
-
-
-
-/* Process the current script line LINE. */
-static int
-interpreter (char *line)
-{
- static struct {
- const char *name;
- void (*fnc)(const char*, char*);
- } cmdtbl[] = {
- { "let" , cmd_let },
- { "echo" , cmd_echo },
- { "send" , cmd_send },
- { "expect-ok" , cmd_expect_ok },
- { "expect-err", cmd_expect_err },
- { "count-status", cmd_count_status },
- { "openfile" , cmd_openfile },
- { "createfile", cmd_createfile },
- { "pipeserver", cmd_pipeserver },
- { "quit" , NULL },
- { "quit-if" , cmd_quit_if },
- { "fail-if" , cmd_fail_if },
- { "cmpfiles" , cmd_cmpfiles },
- { "getenv" , cmd_getenv },
- { NULL }
- };
- char *p, *save_p;
- int i, save_c;
- char *stmt = NULL;
- char *assign_to = NULL;
- char *must_free = NULL;
-
- for ( ;spacep (line); line++)
- ;
- if (!*line || *line == '#')
- return 0; /* empty or comment */
- p = expand_line (line);
- if (p)
- {
- must_free = p;
- line = p;
- for ( ;spacep (line); line++)
- ;
- if (!*line || *line == '#')
- {
- free (must_free);
- return 0; /* empty or comment */
- }
- }
- for (p=line; *p && !spacep (p) && *p != '='; p++)
- ;
- if (*p == '=')
- {
- *p = 0;
- assign_to = line;
- }
- else if (*p)
- {
- for (*p++ = 0; spacep (p); p++)
- ;
- if (*p == '=')
- assign_to = line;
- }
- if (!*line)
- die ("syntax error");
- stmt = line;
- save_c = 0;
- save_p = NULL;
- if (assign_to)
- { /* this is an assignment */
- for (p++; spacep (p); p++)
- ;
- if (!*p)
- {
- unset_var (assign_to);
- free (must_free);
- return 0;
- }
- stmt = p;
- for (; *p && !spacep (p); p++)
- ;
- if (*p)
- {
- save_p = p;
- save_c = *p;
- for (*p++ = 0; spacep (p); p++)
- ;
- }
- }
- for (i=0; cmdtbl[i].name && strcmp (stmt, cmdtbl[i].name); i++)
- ;
- if (!cmdtbl[i].name)
- {
- if (!assign_to)
- die ("invalid statement `%s'\n", stmt);
- if (save_p)
- *save_p = save_c;
- set_var (assign_to, stmt);
- free (must_free);
- return 0;
- }
-
- if (cmdtbl[i].fnc)
- cmdtbl[i].fnc (assign_to, p);
- free (must_free);
- return cmdtbl[i].fnc? 0:1;
-}
-
-
-
-int
-main (int argc, char **argv)
-{
- char buffer[2048];
- char *p, *pend;
-
- if (!argc)
- invocation_name = "asschk";
- else
- {
- invocation_name = *argv++;
- argc--;
- p = strrchr (invocation_name, '/');
- if (p)
- invocation_name = p+1;
- }
-
-
- set_var ("?","1"); /* defaults to true */
-
- for (; argc; argc--, argv++)
- {
- p = *argv;
- if (*p != '-')
- break;
- if (!strcmp (p, "--verbose"))
- opt_verbose++;
- else if (!strcmp (p, "--no-echo"))
- opt_no_echo++;
- else if (*p == '-' && p[1] == 'D')
- {
- p += 2;
- pend = strchr (p, '=');
- if (pend)
- {
- int tmp = *pend;
- *pend = 0;
- set_var (p, pend+1);
- *pend = tmp;
- }
- else
- set_var (p, "1");
- }
- else if (*p == '-' && p[1] == '-' && !p[2])
- {
- argc--; argv++;
- break;
- }
- else
- break;
- }
- if (argc)
- die ("usage: asschk [--verbose] {-D<name>[=<value>]}");
-
-
- while (fgets (buffer, sizeof buffer, stdin))
- {
- p = strchr (buffer,'\n');
- if (!p)
- die ("incomplete script line");
- *p = 0;
- if (interpreter (buffer))
- break;
- fflush (stdout);
- }
- return 0;
-}
-
diff --git a/tests/cert_cci_sphinx_ca.pem b/tests/cert_cci_sphinx_ca.pem
deleted file mode 100644
index b426c2f33..000000000
--- a/tests/cert_cci_sphinx_ca.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIEOp0SzjANBgkqhkiG9w0BAQUFADAzMQswCQYDVQQGEwJERTERMA8G
-A1UEChQIVEVTVF9QS0kxETAPBgNVBAMUCFRFU1RfUENBMB4XDTAxMDIyODE1MDEzNFoXDTAx
-MDQxMTE0MDEzNFowNDELMAkGA1UEBhMCREUxETAPBgNVBAoTCENDSSBHbWJIMRIwEAYDVQQD
-EwlTUEhJTlgtQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAP9STo2ReixFod9ItCJJ
-QtmAs0Emajr9SvKmE8xzHmEmOP1rZzYZtqkSScIeVaOD1+6GMhNLHGxn+laAbANuxbV489yF
-XjpiKlFKOKTzUyuZOO9BJDnRGaSyRyKICK9787RkP377lorO1eziqkCoxP75NIqVlOjajHVH
-z0pzZCNNAgMBAAGjgeowgecwEgYDVR0TAQH/BAgwBgEB/wIBAzAOBgNVHQ8BAf8EBAMCAQYw
-FgYDVR0gBA8wDTALBgkrBgEEAbMBAQEwTAYDVR0fBEUwQzBBoD+gPYY7bGRhcDovLy9jbj1U
-RVNUX1BDQSxvPVRFU1RfUEtJLGM9REU/YXV0aG9yaXR5UmV2b2NhdGlvbkxpc3QwSAYDVR0j
-BEEwP6E3pDUwMzELMAkGA1UEBhMCREUxETAPBgNVBAoUCFRFU1RfUEtJMREwDwYDVQQDFAhU
-RVNUX1BDQYIEOo0HwTARBgNVHQ4ECgQITJJvsx0o58QwDQYJKoZIhvcNAQEFBQADggEBAHjK
-fRKOo2uzIyVH5s8ii+hIqJiPL6Z06siqo0XeVxoY3BTtfMo089q1krWJuSIoUPSeg4+OG7Go
-Ga3qb33TF7zghUayLwWt4vsXBYkrU5VEEc6jN4NO80rPHsaMHPfGDko5BKmeXVkHPOBaFVLk
-I6BuOCNQtRQrVaCbeEjqJkAWJtYG4Yhh63Vyv+bpfMfbm8oBE186pnUxZT1XHynIvrh5gjlX
-9sbqqPPd5VqAmql+j4Hy1eC2XpU8JOqX1mif5uIdz0a8FtJP4bBX9lwL3zIhTtNOGiMYKxbT
-TOpjDRA9dfpYS7qEq3kYNtqttfAxS67iq1BHafjskOF9jaStk+Y=
------END CERTIFICATE-----
diff --git a/tests/cert_cci_test_wzs.pem b/tests/cert_cci_test_wzs.pem
deleted file mode 100644
index 7ba60ce0c..000000000
--- a/tests/cert_cci_test_wzs.pem
+++ /dev/null
@@ -1,4 +0,0 @@
------BEGIN CERTIFICATE-----
-LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCkxTMHRMUzFDUlVkSlRpQkRSVkpVU1VaSlEw
-RlVSUzB0TFMwdENnPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
------END CERTIFICATE-----
diff --git a/tests/cert_cci_test_zs.pem b/tests/cert_cci_test_zs.pem
deleted file mode 100644
index 025a22c8c..000000000
--- a/tests/cert_cci_test_zs.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICyzCCAjSgAwIBAgIBBTANBgkqhkiG9w0BAQUFADA6MQswCQYDVQQGEwJERTERMA8GA1UE
-ChMIQ0NJIEdtYkgxGDAWBgNVBAMTD1NQSElOWC1UZXN0LVdaUzAeFw0wMTA4MjQxMDA5MDNa
-Fw0wMzA4MjQxMDA5MDNaMDkxCzAJBgNVBAYTAkRFMREwDwYDVQQKEwhDQ0kgR21iSDEXMBUG
-A1UEAxMOU1BISU5YLVRlc3QtWlMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAP+E1LeX
-nwq5qAmfHX+zfabAaeMR9Ufow/1ojNg8md+XGVUFJ0a9GZJVQ4ngmxKHmO+6fT77Z0Sj7BQT
-bxLbZEqvBxYDSoJgN6K7q2LdbTPIKMOzVF+TxtNyauZx+yxJxTMYYkyVmAlfjAx8Wlznf8Aj
-kZywmjVtYWpoN0WedGsbAgMBAAGjgeEwgd4wVwYDVR0fBFAwTjBMoEqgSIZGbGRhcDovLy9j
-bj1TUEhJTlgtVGVzdC1XWlMsIG89Q0NJIEdtYkgsIEM9REU/Y2VydGlmaWNhdGVSZXZvY2F0
-aW9uTGlzdDASBgNVHRMBAf8ECDAGAQH/AgEAMBEGA1UdIAQKMAgwBgYEgnEJCTAOBgNVHQ8B
-Af8EBAMCAQYwTAYDVR0jBEUwQ6E+pDwwOjELMAkGA1UEBhMCREUxETAPBgNVBAoTCENDSSBH
-bWJIMRgwFgYDVQQDEw9TUEhJTlgtVGVzdC1XWlOCAQEwDQYJKoZIhvcNAQEFBQADgYEAGWjq
-TsoWQmUiY3c5Tju+jL51AapWWZbZP8xpBTFjXNRQcRPzWrtHCWS3fhae+aMyGFxiqEhGLePc
-QvNdgZmZtzNYSfmeS3iji3zSj7CFmUQKwFrAXUDQNvkS+87FwVno8LilnC0zMfhSW699HtWe
-DW/o0CuhXX6IJXXWuSudCH8=
------END CERTIFICATE-----
diff --git a/tests/cert_cci_user02.pem b/tests/cert_cci_user02.pem
deleted file mode 100644
index b1fba0df7..000000000
--- a/tests/cert_cci_user02.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDBDCCAm2gAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJERTERMA8GA1UE
-ChMIQ0NJIEdtYkgxFzAVBgNVBAMTDlNQSElOWC1UZXN0LVpTMB4XDTAxMTIxMTA3MTYyMloX
-DTAyMTIxMTA3MTYyMlowODELMAkGA1UEBhMCREUxETAPBgNVBAoTCENDSSBHbWJIMRYwFAYD
-VQQDEw1TcGhpbnggVXNlcjAyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD+Gt/ahGJL
-uEUVFgceVUsShMgJirndaGjJb/kR3cHQ4Yh4XM9WvP2ze6SRb1cn3Xq9bR1RTFwRoupp9h94
-OwhxjhOTKtTtwFv/OcffJPwAF6K+ms5s8oSBzNX6mo+sLwoVWHaXaSP7rzvOhvYPJpCE6zrS
-GO4aUcH50f63wusSKQIDAQABo4IBGzCCARcwVgYDVR0fBE8wTTBLoEmgR4ZFbGRhcDovLy9j
-bj1TUEhJTlgtVGVzdC1aUywgbz1DQ0kgR21iSCwgYz1ERT9jZXJ0aWZpY2F0ZVJldm9jYXRp
-b25MaXN0MAwGA1UdEwEB/wQCMAAwHwYDVR0RBBgwFoEUc3BoaW54X3VzZXIwMkBjY2kuZGUw
-EQYDVR0gBAowCDAGBgSCcQkJMA4GA1UdDwEB/wQEAwIF4DAdBgNVHQ4EFgQUZpxNoy1I5cIT
-OmeF8LSUJjWnlaowTAYDVR0jBEUwQ6E+pDwwOjELMAkGA1UEBhMCREUxETAPBgNVBAoTCEND
-SSBHbWJIMRgwFgYDVQQDEw9TUEhJTlgtVGVzdC1XWlOCAQUwDQYJKoZIhvcNAQEFBQADgYEA
-UU1L9U5LOBaa99Q2ogsLS3PuSOhMKSKWwK+rG5YzNGh9L3+Ecp6/cdZeGY8IV4kQHx2YDhon
-tX+SfEnAU5WKN+YfxbLQz5jbDYeyIkFXPFn4Pzt4+1gFLOVvdHFJKT6tb0ZbbLkJkrK+gf29
-sFHz/tVEIiwvWdzCQh669TvmSLc=
------END CERTIFICATE-----
diff --git a/tests/cert_cci_user03.pem b/tests/cert_cci_user03.pem
deleted file mode 100644
index 44a8510d2..000000000
--- a/tests/cert_cci_user03.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDBDCCAm2gAwIBAgIBHzANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJERTERMA8GA1UE
-ChMIQ0NJIEdtYkgxFzAVBgNVBAMTDlNQSElOWC1UZXN0LVpTMB4XDTAxMTIxMTA4NDMwNVoX
-DTAyMTIxMTA4NDMwNVowODELMAkGA1UEBhMCREUxETAPBgNVBAoTCENDSSBHbWJIMRYwFAYD
-VQQDEw1TcGhpbnggVXNlcjAzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWLHGzEVlh
-NKr5RkWi80jZpuVg20C+1W4H/ez2fuGP8IXZAyy6MYPLQSsFuuwfTtLwFDccJ4PubN/JhSLj
-37/AGyygJODQd41CcQxLyB4NqhsYz+dXJv/Rx/E9HDbgsf7fCVwmCpF71phTzeq+zzJYYlDK
-uLLvr2auODr4h24jSwIDAQABo4IBGzCCARcwVgYDVR0fBE8wTTBLoEmgR4ZFbGRhcDovLy9j
-bj1TUEhJTlgtVGVzdC1aUywgbz1DQ0kgR21iSCwgYz1ERT9jZXJ0aWZpY2F0ZVJldm9jYXRp
-b25MaXN0MAwGA1UdEwEB/wQCMAAwHwYDVR0RBBgwFoEUc3BoaW54X3VzZXIwM0BjY2kuZGUw
-EQYDVR0gBAowCDAGBgSCcQkJMA4GA1UdDwEB/wQEAwIF4DAdBgNVHQ4EFgQU04AGVPNiznW2
-ZoKD0hqNulIe0zIwTAYDVR0jBEUwQ6E+pDwwOjELMAkGA1UEBhMCREUxETAPBgNVBAoTCEND
-SSBHbWJIMRgwFgYDVQQDEw9TUEhJTlgtVGVzdC1XWlOCAQUwDQYJKoZIhvcNAQEFBQADgYEA
-qvifydhixBkVQ0ZesWHXVDwhPOjWtHMuYafMP+9Vn46HCqsbl4gnQqwdwHKl2ox4qd4VOOu8
-PmfKgLysWq11tp/+LCFIEDSLHKCQ1YpBaAxbBg4JxqeTXDF3a3u1RnYOEaVhMZ6L91u16vHT
-MJ93W8Fphgf2Fj7EUBPhpyhsnKw=
------END CERTIFICATE-----
diff --git a/tests/cert_cci_user04.pem b/tests/cert_cci_user04.pem
deleted file mode 100644
index e76880162..000000000
--- a/tests/cert_cci_user04.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDBDCCAm2gAwIBAgIBGzANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJERTERMA8GA1UE
-ChMIQ0NJIEdtYkgxFzAVBgNVBAMTDlNQSElOWC1UZXN0LVpTMB4XDTAxMTIxMTA3MTIxM1oX
-DTAyMTIxMTA3MTIxM1owODELMAkGA1UEBhMCREUxETAPBgNVBAoTCENDSSBHbWJIMRYwFAYD
-VQQDEw1TcGhpbnggVXNlcjA0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrExMHDJKt
-W6ByaO3hVYJCZXJmyMAhHxm31yLXzbd2V5R3Q6ZH4ARk00AMRPDgPLf/NK913OcUFJDrlhLh
-aVUfdtz7V095S6Xl38gaClidx2ZJ2EwM4pNxCDeWS1ZFsJMGcis74L5QGrn3/L+76psz7erW
-usP+qwy3+3HzL6/hWQIDAQABo4IBGzCCARcwVgYDVR0fBE8wTTBLoEmgR4ZFbGRhcDovLy9j
-bj1TUEhJTlgtVGVzdC1aUywgbz1DQ0kgR21iSCwgYz1ERT9jZXJ0aWZpY2F0ZVJldm9jYXRp
-b25MaXN0MAwGA1UdEwEB/wQCMAAwHwYDVR0RBBgwFoEUc3BoaW54X3VzZXIwNEBjY2kuZGUw
-EQYDVR0gBAowCDAGBgSCcQkJMA4GA1UdDwEB/wQEAwIF4DAdBgNVHQ4EFgQU/UkAw08BpS4w
-bM1Eo5MTX21niG4wTAYDVR0jBEUwQ6E+pDwwOjELMAkGA1UEBhMCREUxETAPBgNVBAoTCEND
-SSBHbWJIMRgwFgYDVQQDEw9TUEhJTlgtVGVzdC1XWlOCAQUwDQYJKoZIhvcNAQEFBQADgYEA
-3mZM7XFH3CuiGQYe7Wrom+t/QH9BWwORHrskGiVyzBh5Z40HboB8vIN6I6CrQYJHK9DGKnAL
-x5AjZ8MUUG3le5M2G6QdhbtGW0jZg5nF1LHx8QYIx8NJSoYa6uPcfr7Q9WgMvTcmA+gXGgzY
-Uqv0AMWOx0f3ww0gUpFYIp22ZCc=
------END CERTIFICATE-----
diff --git a/tests/cert_cci_user06.pem b/tests/cert_cci_user06.pem
deleted file mode 100644
index 7026112b4..000000000
--- a/tests/cert_cci_user06.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDBDCCAm2gAwIBAgIBIzANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJERTERMA8GA1UE
-ChMIQ0NJIEdtYkgxFzAVBgNVBAMTDlNQSElOWC1UZXN0LVpTMB4XDTAxMTIxMTEyNDMwNVoX
-DTAyMTIxMTEyNDMwNVowODELMAkGA1UEBhMCREUxETAPBgNVBAoTCENDSSBHbWJIMRYwFAYD
-VQQDEw1TcGhpbnggVXNlcjA2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCQ/o0hz0Uz
-OGOUfDkzeburb1AO9VChEkO+x8ROoepsjJjkNDtC/4924biA8irfAymzqWP/QwQryS4+Zy6S
-O9Jl4yoYNswoZuVhTc+WBkjFMC6qz/Y8mZZb5Fgysf+KAz0Swm0FlWjCYNMcWUp4FHJluG1m
-iBarOZRharIVj+HNBwIDAQABo4IBGzCCARcwVgYDVR0fBE8wTTBLoEmgR4ZFbGRhcDovLy9j
-bj1TUEhJTlgtVGVzdC1aUywgbz1DQ0kgR21iSCwgYz1ERT9jZXJ0aWZpY2F0ZVJldm9jYXRp
-b25MaXN0MAwGA1UdEwEB/wQCMAAwHwYDVR0RBBgwFoEUc3BoaW54X3VzZXIwNkBjY2kuZGUw
-EQYDVR0gBAowCDAGBgSCcQkJMA4GA1UdDwEB/wQEAwIF4DAdBgNVHQ4EFgQUSIIT/NH6GsX/
-f1C44FyKEokGNVswTAYDVR0jBEUwQ6E+pDwwOjELMAkGA1UEBhMCREUxETAPBgNVBAoTCEND
-SSBHbWJIMRgwFgYDVQQDEw9TUEhJTlgtVGVzdC1XWlOCAQUwDQYJKoZIhvcNAQEFBQADgYEA
-aBq+Qi0+Cb8XpnZqUITOmRC9VspxnMcE5IskEtbb2aCU2WkCGCTYMrVzug3BIKo4eNnOHl4k
-2oKL8tANapawZSMQb3DtnAvQykYK9DAMYjojOao/2doYKNFoUszg1k+PI+Q1IuV4VjM79R9s
-OwpipIj2q08Kx0NrliREuzB75Sg=
------END CERTIFICATE-----
diff --git a/tests/cert_cci_user07.pem b/tests/cert_cci_user07.pem
deleted file mode 100644
index 2dfadf872..000000000
--- a/tests/cert_cci_user07.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC/jCCAmegAwIBAgIBIDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJERTERMA8GA1UE
-ChMIQ0NJIEdtYkgxFzAVBgNVBAMTDlNQSElOWC1UZXN0LVpTMB4XDTAxMTIxMTA4NTgzOFoX
-DTAyMTIxMTA4NTgzOFowMzELMAkGA1UEBhMCREUxETAPBgNVBAoTCENDSSBHbWJIMREwDwYD
-VQQDEwhTcGhpbngwNzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtV86FCbl5CQqthMK
-vjWjCFOfQZW2v66oiIuE/WZjyOIu1n4FC6z0+pI3FmeKrKhiYeXP8A2J/BzwS9ZD+0as5EyU
-+QUzMPdm8pkzvkZCUPKRVi2cyRrBwwqnhH8Bwk2L2o2WMe46D3WBx4hSG+vhQvNMP4nrIGbs
-oh+3XJjkoXcCAwCnU6OCARowggEWMFYGA1UdHwRPME0wS6BJoEeGRWxkYXA6Ly8vY249U1BI
-SU5YLVRlc3QtWlMsIG89Q0NJIEdtYkgsIGM9REU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlz
-dDAMBgNVHRMBAf8EAjAAMB4GA1UdEQQXMBWBE3NwaGlueDA3QGl0cy5jY2kuZGUwEQYDVR0g
-BAowCDAGBgSCcQkJMA4GA1UdDwEB/wQEAwIF4DAdBgNVHQ4EFgQUdyGyVPOTruMiE7OLekoP
-8oJttzcwTAYDVR0jBEUwQ6E+pDwwOjELMAkGA1UEBhMCREUxETAPBgNVBAoTCENDSSBHbWJI
-MRgwFgYDVQQDEw9TUEhJTlgtVGVzdC1XWlOCAQUwDQYJKoZIhvcNAQEFBQADgYEABjjhOFKV
-3cVF7EGsPfnCq9CYjanFr7jhPxEYG0BuY+x1zgpsTkJm4/wk+NhGo/sFjrq7YExkhQgQViGt
-9UhnXZQPsayna1lmkwl/edzpR3A1ELbiULTVGdLarP3MmWEMzKl/Z6prbb+cD1Qwb8D5DG+Q
-u3E39VxgzG8i9wMSFh8=
------END CERTIFICATE-----
diff --git a/tests/cert_testpki_testpca.pem b/tests/cert_testpki_testpca.pem
deleted file mode 100644
index 255d6f4af..000000000
--- a/tests/cert_testpki_testpca.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDzDCCArSgAwIBAgIEOo0HwTANBgkqhkiG9w0BAQUFADAzMQswCQYDVQQGEwJERTERMA8G
-A1UEChQIVEVTVF9QS0kxETAPBgNVBAMUCFRFU1RfUENBMB4XDTAxMDIxNjExMDAwNloXDTA2
-MDIxNjExMDAwNlowMzELMAkGA1UEBhMCREUxETAPBgNVBAoUCFRFU1RfUEtJMREwDwYDVQQD
-FAhURVNUX1BDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANTELO2lGugWqO5B
-cLGU61TMZzUoR0yDAhPOjNU/CkLy9x+bDLJFAuvYQOm7SRcbTNcviUyot064ROWCcVn51kNf
-+fmZhTyMix36ffcEERO7NaN4ZN7eXi39u9udTfPoQjUpy2tBVOwHlzBdHhklG1hBodqlmbfE
-5Yt6ku0jm4wfxoiqgbF2dh9PhuCClt4YuBcnELw52duAKYNiHwfIqrwgDvAdi/J+mdgcxy1Z
-xl/oIIVEy5FiQlMkleCDxstuEhVde8/ZzzyDbC+22Ok5xr6wexgUK792G6NZ+q+0BK+9Hqtw
-m8/7UHyuUGboyHAT8V7ecgrpEg5rvJgRxtxUYA8CAwEAAaOB5zCB5DAPBgNVHRMBAf8EBTAD
-AQH/MBYGA1UdIAQPMA0wCwYJKwYBBAGzAQEBMEwGA1UdHwRFMEMwQaA/oD2GO2xkYXA6Ly8v
-Y249VEVTVF9QQ0Esbz1URVNUX1BLSSxjPURFP2F1dGhvcml0eVJldm9jYXRpb25MaXN0MBEG
-A1UdDgQKBAhOFXmpxh5ysDBIBgNVHSMEQTA/oTekNTAzMQswCQYDVQQGEwJERTERMA8GA1UE
-ChQIVEVTVF9QS0kxETAPBgNVBAMUCFRFU1RfUENBggQ6jQfBMA4GA1UdDwEB/wQEAwIBBjAN
-BgkqhkiG9w0BAQUFAAOCAQEAs/wp8umfNLnEQ56DyIAOdWUwgJNrLYK2hk84G+lQKhem+jD0
-BoklUd/DifJxXE6QVFMxjr9aoYjMcloCuYV2jLd0kdebDmFvFNl3O9+mR0br8wHRCXhfPMwg
-dThmhdtDs9qfyfStNStLch4F0edDYJtO3XaGWlQk52ykJy3yoyxmDUIzPTIKCV3LYO7bOXfw
-FVECQaoO2+HrrZef6d3h3XL7leWhGYZ2YV77yzfZuN41y8aXQKF/1J7mYvpjceUJAyMZCUMz
-FLDH4Zj4YGc8OH1xpAvGgztDuPQU8JXJBXuXIL0jmUcJRAZmgbeWWOgGIhYtJ4Stoy0pnHTZ
-dcn+jw==
------END CERTIFICATE-----
diff --git a/tests/crl_testpki_testpca.pem b/tests/crl_testpki_testpca.pem
deleted file mode 100644
index 458c48164..000000000
--- a/tests/crl_testpki_testpca.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDWTCCAkECAQEwDQYJKoZIhvcNAQEFBQAwMzELMAkGA1UEBhMCREUxETAPBgNVBAoUCFRF
-U1RfUEtJMREwDwYDVQQDFAhURVNUX1BDQRcNMDIwMTE0MDcwMDI4WhcNMDIwMjE0MDcwMDI4
-WjCCAXIwIwIEOpzbCxcNMDEwMjI4MTQ1NTE5WjAMMAoGA1UdFQQDCgEDMCMCBDr7z9QXDTAx
-MDUxNDExMTY0M1owDDAKBgNVHRUEAwoBAzAjAgQ7Cmq5Fw0wMTA1MjkxMzE1NTNaMAwwCgYD
-VR0VBAMKAQMwIwIEOxOgZBcNMDEwNjI5MDcwNzMwWjAMMAoGA1UdFQQDCgEDMCMCBDs8KH4X
-DTAxMDYyOTA3MTA0MVowDDAKBgNVHRUEAwoBAzAjAgQ7xr4IFw0wMTEwMzAwODIwMDdaMAww
-CgYDVR0VBAMKAQAwIwIEO95jKhcNMDExMTA3MTIxNzE2WjAMMAoGA1UdFQQDCgEAMCMCBDvp
-JwAXDTAxMTEwNzE0MTEwMFowDDAKBgNVHRUEAwoBAzAjAgQ8GHpuFw0wMTEyMTMxMDAzNTFa
-MAwwCgYDVR0VBAMKAQMwIwIEPBh8ihcNMDExMjEzMTAxMjE3WjAMMAoGA1UdFQQDCgEDoGQw
-YjALBgNVHRQEBAICAVAwSAYDVR0jBEEwP6E3pDUwMzELMAkGA1UEBhMCREUxETAPBgNVBAoU
-CFRFU1RfUEtJMREwDwYDVQQDFAhURVNUX1BDQYIEOo0HwTAJBgNVHRwEAjAAMA0GCSqGSIb3
-DQEBBQUAA4IBAQCCTBKii6N4bX7sH6d3fq6yFbn2Xr5xDbDkpjHYSvHhBnfEnFAQOjOsn9ar
-qk8NDUCT4j4AWD//i/9l5YbvY+32/ER32vZ5PDtSyhZ/pHIOaYUy0haf2pwDSXf7ESZKUM5a
-O8UOVBlXhniClnakZHI6z7r7Md5xIJ5C2W8JaLUswiycvyMg37eM6a+d+J+ZlFXQZNO/9cfN
-ItcSCBaRgUWm4LNdTJllNeZ9HMBOJ3pgS7yta4WNQi2mNgRzCcJJuVm5qmXo/9v7hMLmL+pb
-YUPnQIfyjYmJK0ea+8KsKsgIKtiU8xteqTxPQ3VJBbH7ChcO4SMUPq5yL3otGZu5zOoQ
------END CERTIFICATE-----
diff --git a/tests/inittests b/tests/inittests
deleted file mode 100755
index 05a94eb68..000000000
--- a/tests/inittests
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002 Free Software Foundation, Inc.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-set -e
-
-sample_certs='
-cert_g10code_test1.pem
-cert_g10code_pete1.pem
-cert_g10code_theo1.pem
-'
-
-private_keys='
-32100C27173EF6E9C4E9A25D3D69F86D37A4F939
-'
-
-clean_files='
-gpgsm.conf gpg-agent.conf trustlist.txt pubring.kbx
-msg msg.sig msg.unsig
-'
-
-
-[ -z "$srcdir" ] && srcdir=.
-[ -z "$GPGSM" ] && GPGSM=../sm/gpgsm
-
-if [ -d $srcdir/samplekeys ] \
- && grep TESTS_ENVIRONMENT Makefile >/dev/null 2>&1; then
- :
-else
- # During make distclean the Makefile has already been removed,
- # so we need this extra test.
- if ! grep gnupg-test-directory testdir.stamp >/dev/null 2>&1; then
- echo "inittests: please cd to the tests directory first" >&2
- exit 1
- fi
-fi
-
-if [ "$1" = "--clean" ]; then
- if [ -d private-keys-v1.d ]; then
- rm private-keys-v1.d/* 2>/dev/null || true
- rmdir private-keys-v1.d
- fi
- rm ${clean_files} testdir.stamp 2>/dev/null || true
- exit 0
-fi
-
-if [ "$GNUPGHOME" != "`pwd`" ]; then
- echo "inittests: please set GNUPGHOME to the test directory" >&2
- exit 1
-fi
-
-if [ -n "$GPG_AGENT_INFO" ]; then
- echo "inittests: please unset GPG_AGENT_INFO" >&2
- exit 1
-fi
-
-# A stamp file used with --clean
-echo gnupg-test-directory > testdir.stamp
-
-
-# Create the private key directy if it does not exists and copy
-# the sample keys.
-[ -d private-keys-v1.d ] || mkdir private-keys-v1.d
-for i in ${private_keys}; do
- cat ${srcdir}/samplekeys/$i.key >private-keys-v1.d/$i.key
-done
-
-# Create the configuration scripts
-# Note, die to an expired test certificate, we need to use
-# the faked system time option.
-cat > gpgsm.conf <<EOF
-no-secmem-warning
-disable-crl-checks
-agent-program ../agent/gpg-agent
-faked-system-time 1038835799
-EOF
-
-cat > gpg-agent.conf <<EOF
-no-grab
-pinentry-program /home/wk/work/pinentry/gtk/pinentry-gtk
-EOF
-
-cat > trustlist.txt <<EOF
-# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE
-3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E S
-EOF
-
-# Make sure that the sample certs are available but ignore errors here
-# because we are not a test script.
-for i in ${sample_certs}; do
- $GPGSM --import ${srcdir}/samplekeys/$i || true
-done
diff --git a/tests/key_g10code_pete1.pem b/tests/key_g10code_pete1.pem
deleted file mode 100644
index dc26c8eda..000000000
--- a/tests/key_g10code_pete1.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,A4885DDADE65FCB5
-
-6mK4tsaqaMQVILY2b0Wku2dGp0GmqJMXRb49Xl/hlDhqO6rF30ZnCbFSOWS0O74a
-+QydvNhACt+0lrIYv9E1pfU8ibmlPF1ei6n2GBcXgZGT8nFd5sb/+UJ1hEB9cRny
-BuWjUOWB4uFnNkkIcWJEK98Yfmiiisp8kjoW3SgWQPXW/WaZkclpgbk8SVWeZ+14
-S6GXvQsaVhiXGN1Kv5nL6Qk1LSCg8rS1jMAPsQEO/KhRCogVmjw06x2RuqM6eISz
-9mAio4AFMEhcY9Dg+2Ybf+iB4NnsvTaygUIZDDZ5TZGbr3O52CDblbKjswr2fO6B
-PqoBLODmhb1ZTEq0tf9kQAs0SPek8Rd7xYIQrEBmmZz7v0sU4yROyMkRU3EzEYXV
-Qsue1tqVtnBXB/d/Y0GG5NR4bo1oUwjzv8oUTxzPh8uDYDTNW2+KwPBmOx0hN2LG
-FkN5KzBeHmGyACvQTVZndzEBHuult+6lfdDFMkopt9dp8ePlUC0s+61x+fi3nfEs
-6AZLvRNDoi8Zv1+42RAbOA5ZKC1H9zjcbF5WzOCegRgKZyhZ+1+9IIoWqoCgK841
-pn/Iaog43Ba/npyNpJE63Q7khJueSkeN0NwtV9EeYB8xSF3RMlPDrakTdTTJJIAi
-wUFXCbUieMsOj5b9jw6A5H0Zls0HcUdBos/ipiE8jdAjyxOp+q2hXTaOn7eK3WaD
-CadRmfnRp383pfzFM+93MhsRZHg+Mw1BTnRghM4l/flykYXgDTFR+9citxbRzQfu
-sVfrcqNmHvjqdhR5054oZjZMUP0SxRm13XsUfUMhIWsB1wrqHkYa/A==
------END RSA PRIVATE KEY-----
diff --git a/tests/key_g10code_theo1.pem b/tests/key_g10code_theo1.pem
deleted file mode 100644
index 9722be26d..000000000
--- a/tests/key_g10code_theo1.pem
+++ /dev/null
@@ -1,21 +0,0 @@
-
- Passphrase is "test"
-
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,C1E4BE50963AE732
-
-xtD0InNwYZnG0z61ydRQ+UmDoKiUiiXiwbmZQREZUG2E5Tat77WAkiA8lwjqimmC
-kGPWnCUtoMpuXrBl4JC1fsvNCsOhPu9w90JcuNqlxzUltZjP9M9uj9Ic4Hut9FoR
-uSKY4sz7zGlOg+1kGZu1lXEKvGgrHO7sq66Q2Y1ugaWrlvdQt+1m2mTpk01rj2vZ
-fqZO2EZFYNPAgQRpfnHmfaD1zIefRLbxwjQUTUvLWTN4aOaOBBNE6AlzwSK4w0Ba
-4RAJpHuk7Kk6UNvNQriMjXMBvHCZLqKIJXGn99o8acK4E/Hrsyq8CHKT3ye81FoF
-JsJf1n6W9NG21BH/HuS6uDcyvhhBpgP9yJclRiHd29t0pmM2v+FQxlpycEIwMLcT
-hu7BaxdVrMmZHwwZXjFW8W0paltN65U3AevAddwyh6tmMRZR7OJP5P4qws4ehzWB
-M9VPgHiWHkCwgjMH1EjhCXqChj0KCW4pHHXevA3eNJP8yEuGzlHwvh6Y4b+FFqtO
-gib1MfWPsSYP2kW8XPrVzb2VMMWlqepUeKdBtZSC0s7TW7+bN7sgyWJYInBtqTZT
-VCTauwUaFfRflp1l+jPofypaVs5Dsom96kMjqe9Tg9b409ZvWps5A7lG1Q26Nkyk
-6/GA7Elt0lArwEs7lcHy40/5cIB5Bjgj7AL5B2/1hwoxFBsNa3k69OssJC6tY6ek
-qwwa2KfXHsG6gHlFgMW/gRCJENy4dqtxkaVM27d+ulRlWYP5INyXFiH0NPeSR9i0
-LUDpQoKaexXG3DSQZcGSdDGlBa16iuPfKOEQMqQiymgxjG5umSKrZQ==
------END RSA PRIVATE KEY-----
diff --git a/tests/runtest b/tests/runtest
deleted file mode 100755
index 71385fb46..000000000
--- a/tests/runtest
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-unset GPG_AGENT_INFO
-[ -x "$1" ] && exec $1 $2
-exec ./asschk --no-echo -DGPGSM=${GPGSM} <"$1"
-
diff --git a/tests/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key b/tests/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key
deleted file mode 100644
index cf0535ff7..000000000
--- a/tests/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key
+++ /dev/null
@@ -1,18 +0,0 @@
-(private-key
- (oid.1.2.840.113549.1.1.1
- (n #00e0ce96f90b6c9e02f3922beada93fe50a875eac6bcc18bb9a9cf2e84965caa2d1ff95a7f542465c6c0c19d276e4526ce048868a7a914fd343cc3a87dd74291ffc565506d5bbb25cbac6a0e2dd1f8bcaab0d4a29c2f37c950f363484bf269f7891440464baf79827e03a36e70b814938eebdc63e964247be75dc58b014b7ea251#)
- (e #010001#)
- (d #046129F2489D71579BE0A75FE029BD6CDB574EBF57EA8A5B0FDA942CAB943B117D7BB95E5D28875E0F9FC5FCC06A72F6D502464DABDED78EF6B716177B83D5BDC543DC5D3FED932E59F5897E92E6F58A0F33424106A3B6FA2CBF877510E4AC21C3EE47851E97D12996222AC3566D4CCB0B83D164074ABF7DE655FC2446DA1781#)
- (p #00e861b700e17e8afe6837e7512e35b6ca11d0ae47d8b85161c67baf64377213fe52d772f2035b3ca830af41d8a4120e1c1c70d12cc22f00d28d31dd48a8d424f1#)
- (q #00f7a7ca5367c661f8e62df34f0d05c10c88e5492348dd7bddc942c9a8f369f935a07785d2db805215ed786e4285df1658eed3ce84f469b81b50d358407b4ad361#)
- (u #304559a9ead56d2309d203811a641bb1a09626bc8eb36fffa23c968ec5bd891eebbafc73ae666e01ba7c8990bae06cc2bbe10b75e69fcacb353a6473079d8e9b#)
- )
-)
-
-
-
-
-
-
-
-
diff --git a/tests/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key b/tests/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key
deleted file mode 100644
index 2063610dc..000000000
--- a/tests/samplekeys/8D6D17B4B94BBE8304926C016D2C5C7805EB6705.key
+++ /dev/null
@@ -1,10 +0,0 @@
-(private-key
- (rsa
- (n #00DB26862FD7EAF7AC9A52BA22473E28C8DF4637B0A048230772F6D5CD96EEF905D7D650A84957CBD3CCCD720A9C941EB430FE5088E6A8DDD0D5770506A314DDB4F579A2696FB53E98E7A8750F400016A9885D1C1F5D19AC90D186186DF4B354F3BDCA978BCBFB1810DFE5AB68AFE4B2B09D1F8223265514AFECDF596628F8C58F#)
- (e #010001#)
- (d #674F76ECB0FE0CBA2A9A1B3333A0A2FB66FE241CB8C2A8F8C70283F202582FBEC86C38E3CC877E081FC12E24C081B723BD00F698431C924CF384C332C8C87A67080A88A0700DC36D671ECB4D7AE0EE9C645AF932B9B55BD3E16C043E9D972202399F021374C358E8B77CA37CFAC642637CFF31E6E5839A89CBD3E32B9BEF9A01#)
- (p #00EB664011AD44EFEDE2B40A3F753373F7CE39E2CF4A5E7812ABF5B957AFA8C9F9FEE1EE9D8F2FF7369B553749EADD0C605A581111A4D532ECC3ED3DC46DB1A501#)
- (q #00EE543E10FD86829889682BC4BECA1230924B7B4A19823566FA056C9033937B97F29665CF21F6F097F9BAB24D6F596C93EE348568FAA59BB325EA66DFBE7B9A8F#)
- (u #008BD460358A993D2B442BC7DC3F1E6EF9470F17E3E3BD85A496690A50D564BB585B66A3BF841B8FF9513293EA02C784C6142008A79948020FFF03440D9591C7D7#)
- )
- )
diff --git a/tests/samplekeys/cert_g10code_enconly_1.pem b/tests/samplekeys/cert_g10code_enconly_1.pem
deleted file mode 100644
index ef28b6924..000000000
--- a/tests/samplekeys/cert_g10code_enconly_1.pem
+++ /dev/null
@@ -1,26 +0,0 @@
-Issuer ...: /CN=Root-Test-CA/OU=Test CA on Kerckhoffs/O=g10 Code GmbH/L=Düsseldorf/ST=NRW/C=de/[email protected]
-Serial ...: 03
-Subject ..: /CN=Encrypt Only Key 1/OU=Testlab/O=g10 code/C=de
-
------BEGIN CERTIFICATE-----
-MIIDmDCCAwGgAwIBAgIBAzANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMCZGUx
-DDAKBgNVBAgTA05SVzETMBEGA1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMNZzEw
-IENvZGUgR21iSDEeMBwGA1UECxMVVGVzdCBDQSBvbiBLZXJja2hvZmZzMRUwEwYD
-VQQDEwxSb290LVRlc3QtQ0ExLDAqBgkqhkiG9w0BCQEWHXRlc3QtY2FAa2VyY2to
-b2Zmcy5nMTBjb2RlLmRlMB4XDTAyMDkwMzEwMzg1NloXDTEyMDgzMTEwMzg1Nlow
-TzELMAkGA1UEBhMCZGUxETAPBgNVBAoTCGcxMCBjb2RlMRAwDgYDVQQLEwdUZXN0
-bGFiMRswGQYDVQQDExJFbmNyeXB0IE9ubHkgS2V5IDEwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBANsmhi/X6vesmlK6Ikc+KMjfRjewoEgjB3L21c2W7vkF19ZQ
-qElXy9PMzXIKnJQetDD+UIjmqN3Q1XcFBqMU3bT1eaJpb7U+mOeodQ9AABapiF0c
-H10ZrJDRhhht9LNU873Kl4vL+xgQ3+WraK/ksrCdH4IjJlUUr+zfWWYo+MWPAgMB
-AAGjggEjMIIBHzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFIDAdBgNVHQ4EFgQUxWTi
-IXcx29tl0D0TYl9sQ4z4foIwgdoGA1UdIwSB0jCBz4AUilgNzsWIc4O+ang1CsXu
-Xu1NypOhgbOkgbAwga0xCzAJBgNVBAYTAmRlMQwwCgYDVQQIEwNOUlcxEzARBgNV
-BAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxHjAcBgNVBAsT
-FVRlc3QgQ0Egb24gS2VyY2tob2ZmczEVMBMGA1UEAxMMUm9vdC1UZXN0LUNBMSww
-KgYJKoZIhvcNAQkBFh10ZXN0LWNhQGtlcmNraG9mZnMuZzEwY29kZS5kZYIBADAJ
-BgNVHREEAjAAMA0GCSqGSIb3DQEBBQUAA4GBAGPwl3GN6TxYlwnN7Za2H4lJthUk
-Bdxrjoh7D7z4kxpo0JGgcBbDEpGPDNtwNg73ukwruGOiOJPGk6qZI1TtI+7joScH
-f1dtGUTcfFW+qpGkImJDrY1IV+ud6qhL2LxY4FLAuEv2iPNSbM9N3X8nB0ofWoPe
-fISRwikYCdR83m+t
------END CERTIFICATE-----
diff --git a/tests/samplekeys/cert_g10code_pete1.pem b/tests/samplekeys/cert_g10code_pete1.pem
deleted file mode 100644
index c6f778a56..000000000
--- a/tests/samplekeys/cert_g10code_pete1.pem
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID7jCCA1egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsTELMAkGA1UEBhMCREUx
-DDAKBgNVBAgTA05SVzETMBEGA1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMNZzEw
-IENvZGUgR21iSDEbMBkGA1UECxMSS2VyY2tob2ZmcyBUZXN0bGFiMRYwFAYDVQQD
-Ew1QZXRlciBQYW50aGVyMTIwMAYJKoZIhvcNAQkBFiNwZXRlci5wYW50aGVyQGtl
-cmNraG9mZnMuZzEwY29kZS5kZTAeFw0wMjA0MTIxNjU4MzFaFw0wMzA0MTIxNjU4
-MzFaMIGxMQswCQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMRMwEQYDVQQHFApE/HNz
-ZWxkb3JmMRYwFAYDVQQKEw1nMTAgQ29kZSBHbWJIMRswGQYDVQQLExJLZXJja2hv
-ZmZzIFRlc3RsYWIxFjAUBgNVBAMTDVBldGVyIFBhbnRoZXIxMjAwBgkqhkiG9w0B
-CQEWI3BldGVyLnBhbnRoZXJAa2VyY2tob2Zmcy5nMTBjb2RlLmRlMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQC/UYKEu+IZgvoUwbBaKT96SDsgnsOLkC7TWuP+
-td9qyjF+tQCSUdTqRDYyP44hLH24v4h9KsVxwl5iuncJCdNmpTHL4ika+3v7arGU
-DmGEHZOC3mHMzD+/dfqotse7C37AEMWSXguh4x2vmSESG9wnAxCgLl78j+RIuKUE
-RVK55wIDAQABo4IBEjCCAQ4wHQYDVR0OBBYEFDhJ93SfqHOecsryvYN01++o7qh/
-MIHeBgNVHSMEgdYwgdOAFDhJ93SfqHOecsryvYN01++o7qh/oYG3pIG0MIGxMQsw
-CQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMRMwEQYDVQQHFApE/HNzZWxkb3JmMRYw
-FAYDVQQKEw1nMTAgQ29kZSBHbWJIMRswGQYDVQQLExJLZXJja2hvZmZzIFRlc3Rs
-YWIxFjAUBgNVBAMTDVBldGVyIFBhbnRoZXIxMjAwBgkqhkiG9w0BCQEWI3BldGVy
-LnBhbnRoZXJAa2VyY2tob2Zmcy5nMTBjb2RlLmRlggEAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEEBQADgYEADoBAUnaZIjp+T60s1at/tLa03TfYT8DdTQz+p/UF
-MFGPz9CTqsoN7NLFoXyq+RN9FipsGEKLMif7e/buRqlcir+ntxqQFdy6EYfxfu4n
-Dys8JxnhjcEqXSz+uPUE8jiGho5Tkveo+hurDKZ54CVTeJtvKrWpA6YkuhmL/zRz
-T7Y=
------END CERTIFICATE-----
diff --git a/tests/samplekeys/cert_g10code_test1.pem b/tests/samplekeys/cert_g10code_test1.pem
deleted file mode 100644
index 61d1f9813..000000000
--- a/tests/samplekeys/cert_g10code_test1.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDFTCCAn6gAwIBAgIBADANBgkqhkiG9w0BAQQFADBrMQswCQYDVQQGEwJERTET
-MBEGA1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMNZzEwIENvZGUgR21iSDEZMBcG
-A1UECxMQQWVneXB0ZW4gUHJvamVjdDEUMBIGA1UEAxMLdGVzdCBjZXJ0IDEwHhcN
-MDExMjAzMDkzNjM4WhcNMDIxMjAzMDkzNjM4WjBrMQswCQYDVQQGEwJERTETMBEG
-A1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMNZzEwIENvZGUgR21iSDEZMBcGA1UE
-CxMQQWVneXB0ZW4gUHJvamVjdDEUMBIGA1UEAxMLdGVzdCBjZXJ0IDEwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBAODOlvkLbJ4C85Ir6tqT/lCoderGvMGLuanP
-LoSWXKotH/laf1QkZcbAwZ0nbkUmzgSIaKepFP00PMOofddCkf/FZVBtW7sly6xq
-Di3R+LyqsNSinC83yVDzY0hL8mn3iRRARkuveYJ+A6NucLgUk47r3GPpZCR7513F
-iwFLfqJRAgMBAAGjgcgwgcUwHQYDVR0OBBYEFDM3jRKRwFRxgzhfCGW/qUv5jjTz
-MIGVBgNVHSMEgY0wgYqAFDM3jRKRwFRxgzhfCGW/qUv5jjTzoW+kbTBrMQswCQYD
-VQQGEwJERTETMBEGA1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMNZzEwIENvZGUg
-R21iSDEZMBcGA1UECxMQQWVneXB0ZW4gUHJvamVjdDEUMBIGA1UEAxMLdGVzdCBj
-ZXJ0IDGCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQBshwQeijio
-2hsXZxZEIFoNldDpdxcbWUws5utNJ7hqxQr74fn2cL9rH7AycNWtZnyCTAk7Uqwc
-bH3z6CNoJH6U/k//ITk7w8PtM6nw6JhlXLD+C65Bifip6id2JtRQwl4kJ/tPpx+/
-42Muki3yVFN+BEGFPpI6hdJmh1Hz81k8GQ==
------END CERTIFICATE-----
diff --git a/tests/samplekeys/cert_g10code_test_ca.pem b/tests/samplekeys/cert_g10code_test_ca.pem
deleted file mode 100644
index d65a84c52..000000000
--- a/tests/samplekeys/cert_g10code_test_ca.pem
+++ /dev/null
@@ -1,27 +0,0 @@
-Issuer ...: /CN=Root-Test-CA/OU=Test CA on Kerckhoffs/O=g10 Code GmbH/L=Düsseldorf/ST=NRW/C=de/[email protected]
-Serial ...: 00
-Subject ..: /CN=Root-Test-CA/OU=Test CA on Kerckhoffs/O=g10 Code GmbH/L=Düsseldorf/ST=NRW/C=de/[email protected]
-
------BEGIN CERTIFICATE-----
-MIID4jCCA0ugAwIBAgIBADANBgkqhkiG9w0BAQQFADCBrTELMAkGA1UEBhMCZGUx
-DDAKBgNVBAgTA05SVzETMBEGA1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMNZzEw
-IENvZGUgR21iSDEeMBwGA1UECxMVVGVzdCBDQSBvbiBLZXJja2hvZmZzMRUwEwYD
-VQQDEwxSb290LVRlc3QtQ0ExLDAqBgkqhkiG9w0BCQEWHXRlc3QtY2FAa2VyY2to
-b2Zmcy5nMTBjb2RlLmRlMB4XDTAyMDMxMTA5MjUwMVoXDTAzMDMxMTA5MjUwMVow
-ga0xCzAJBgNVBAYTAmRlMQwwCgYDVQQIEwNOUlcxEzARBgNVBAcUCkT8c3NlbGRv
-cmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxHjAcBgNVBAsTFVRlc3QgQ0Egb24g
-S2VyY2tob2ZmczEVMBMGA1UEAxMMUm9vdC1UZXN0LUNBMSwwKgYJKoZIhvcNAQkB
-Fh10ZXN0LWNhQGtlcmNraG9mZnMuZzEwY29kZS5kZTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAyyMceR+2i6B111NZDqVzCWjB+vcymaKoNxM58+4nNjr08afx
-3M2duMX6oOapbxvpgdZOZhV9lbDMFsZ9Sc/8r8nPwKuTW93cS2qceTI12fOPd1am
-td53adxR9/7HdnG+2EUWcEO6bNtXSxHcWhGGFjSspKQekrszFZFabdTwGR0CAwEA
-AaOCAQ4wggEKMB0GA1UdDgQWBBSKWA3OxYhzg75qeDUKxe5e7U3KkzCB2gYDVR0j
-BIHSMIHPgBSKWA3OxYhzg75qeDUKxe5e7U3Kk6GBs6SBsDCBrTELMAkGA1UEBhMC
-ZGUxDDAKBgNVBAgTA05SVzETMBEGA1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMN
-ZzEwIENvZGUgR21iSDEeMBwGA1UECxMVVGVzdCBDQSBvbiBLZXJja2hvZmZzMRUw
-EwYDVQQDEwxSb290LVRlc3QtQ0ExLDAqBgkqhkiG9w0BCQEWHXRlc3QtY2FAa2Vy
-Y2tob2Zmcy5nMTBjb2RlLmRlggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE
-BQADgYEAkYHZYROou2z2MavOVFOdY5nUPqgqTHlD5z2ADotCekdiRQ7YsJHHqDaE
-wRdGxVxNvFPa31iA+VeZu4YTaOiAW0lFZ7SYYwjRvKjs+CDQxkPVBWxyB7JNeIOj
-tWyK4FTrzcu3aNgfIJxMuzYU8EUwuwwPr+GxYP5GUFSVhP+VOsw=
------END CERTIFICATE-----
diff --git a/tests/samplekeys/cert_g10code_theo1.pem b/tests/samplekeys/cert_g10code_theo1.pem
deleted file mode 100644
index a7685c415..000000000
--- a/tests/samplekeys/cert_g10code_theo1.pem
+++ /dev/null
@@ -1,40 +0,0 @@
-
- <GnupgKeyblock>
- <mainkey>
- <keyid></keyid>
- <fpr>E76B5D4BA2CF0B05BBBE425CDBF4E9DC4904941D</fpr>
- <algo>0</algo>
- <len>1024</len>
- <created>1017250241</created>
- <expire>1048786241</expire>
- </mainkey>
- <userid>
- <raw>1.2.840.113549.1.9.1=#7468656F62616C642E7469676572406B6572636B686F6666732E673130636F64652E6465,CN=Theobald Tiger,OU=Kerckhoffs Testlab,O=g10 Code GmbH,L=Düsseldorf,ST=NRW,C=de</raw>
- </userid>
- </GnupgKeyblock>
-
-
------BEGIN CERTIFICATE-----
-MIID9DCCA12gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBszELMAkGA1UEBhMCZGUx
-DDAKBgNVBAgTA05SVzETMBEGA1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMNZzEw
-IENvZGUgR21iSDEbMBkGA1UECxMSS2VyY2tob2ZmcyBUZXN0bGFiMRcwFQYDVQQD
-Ew5UaGVvYmFsZCBUaWdlcjEzMDEGCSqGSIb3DQEJARYkdGhlb2JhbGQudGlnZXJA
-a2VyY2tob2Zmcy5nMTBjb2RlLmRlMB4XDTAyMDMyNzE3MzA0MVoXDTAzMDMyNzE3
-MzA0MVowgbMxCzAJBgNVBAYTAmRlMQwwCgYDVQQIEwNOUlcxEzARBgNVBAcUCkT8
-c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxGzAZBgNVBAsTEktlcmNr
-aG9mZnMgVGVzdGxhYjEXMBUGA1UEAxMOVGhlb2JhbGQgVGlnZXIxMzAxBgkqhkiG
-9w0BCQEWJHRoZW9iYWxkLnRpZ2VyQGtlcmNraG9mZnMuZzEwY29kZS5kZTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N+6T7awrnWhg1g+HIE8TGn3e8OOkqmE
-v2k7uazL2aGUIk2Omg+2Jjq2dovotiSAjoVQFtJ+Ahk4aiGFA4Zdp34ZzijpXhD+
-+xbFt1Vz/zBWlExpN9A5m2XPAbcW5rTMcl9O6jXKgu4sLDXOGOVCSOIpaQGwB3g3
-ti/p7J4lvFcCAwEAAaOCARQwggEQMB0GA1UdDgQWBBQTVJsLsvwdrA5XJMZyCECy
-gFdHGzCB4AYDVR0jBIHYMIHVgBQTVJsLsvwdrA5XJMZyCECygFdHG6GBuaSBtjCB
-szELMAkGA1UEBhMCZGUxDDAKBgNVBAgTA05SVzETMBEGA1UEBxQKRPxzc2VsZG9y
-ZjEWMBQGA1UEChMNZzEwIENvZGUgR21iSDEbMBkGA1UECxMSS2VyY2tob2ZmcyBU
-ZXN0bGFiMRcwFQYDVQQDEw5UaGVvYmFsZCBUaWdlcjEzMDEGCSqGSIb3DQEJARYk
-dGhlb2JhbGQudGlnZXJAa2VyY2tob2Zmcy5nMTBjb2RlLmRlggEAMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEEBQADgYEASILHzi6O8Gf4Xd98FFtln3FGLhlHlxKV
-xuO4Qn+qcBN7dFfQE3B/WKRR5jC8NTZHgGzAzcVv/ha2AAVs/zbSxE6lU04OOSJv
-qm9lo6lsm5P+C/NH/hSdlUfSoKbmt5ZAPYpOhHvmPQpLi4Iv4hjeFqoCN5OVXOXN
-OSgvBzegSSA=
------END CERTIFICATE-----
diff --git a/tests/skey_g10code_test1.pem b/tests/skey_g10code_test1.pem
deleted file mode 100644
index 9f2db8e68..000000000
--- a/tests/skey_g10code_test1.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,CFA7DAB8D1EEDCFF
-
-KTLOYLEGXYFQ63WnUsqFp/vM5HWsJq758AQ5RaYp7jbtCoZdrSp5GovmLUBTPfR+
-hjfcJgGlyWIPDhPAcOObz2XnnpzcKEfmPKR/W+Ou7DFX/6WUh1xwzHq+ddPnCMHJ
-vfhx2iMf0e4Y9ZMATBPcU0YIE/Rp9F4wmMKmEAGtAPOSMNdvH17KHlNLXsX+VlXf
-scGi9Hr0KFcC/5ehA3J40vBlAg6oZeXwNuERX1PXOpAIlcGY0RklJhTvTBonCfaV
-7+CrfggFed3/b7QuqsNTlRdmW3ctf2rqNoFFIhRB5OVQsLG4CrzIQMdzxMqlZrGd
-Eks+0HLOMGO41ioaenz6015ClHORpAf3VXN8NUUrrDAvJL2HVlqFgDBCi9qi9Dp2
-TuVePAkJlpBYodgIdwvLN//dav6ZJ+FOOk3A5AnKOtNyTGO4I2Bz8nAS3JpVudk9
-ca8CEIIj52dEric6YMiBFokoiIEgMOI/6wjatDL1Yldev+kjH/el+FZT4jZm2lvQ
-l1xbg4sqmPNSyIKSv8V95gO2W5E5V9kO/MBiad2GdX4qrVT1c/LwFC96t+tZKFxr
-rHdN31CzZE3bHnXxvss3ai+k9IO1NZHfeeb9uqSmGd3AxbmBwWA50bxCsee+HP0R
-ihU2BE5NKdlw1faBk+DPVT569uScO4PDc6Jd4fh7g7oBzLhhhcCqNnLEZh8lqa3L
-rsb880baq8dm72cz8IXj//x5AppfCz8M8od/UkaQ0/pN2GGTpe4qSPPK0YJ/4MfR
-f9jdMbZA6O8si3t7I4jOF2z1UHkFGaseax54ILTsTVE=
------END RSA PRIVATE KEY-----
-
diff --git a/tests/sm-sign+verify b/tests/sm-sign+verify
deleted file mode 100644
index 1c3ae7dbd..000000000
--- a/tests/sm-sign+verify
+++ /dev/null
@@ -1,73 +0,0 @@
-# sm-sign+verify
-#
-# Creating a signature and verifying it
-# Requirements: a plain file "text-1.txt"
-
-srcdir = getenv srcdir
-plaintext = let $srcdir/text-1.txt
-
-in = openfile $plaintext
-out = createfile msg.sig
-in2 = openfile msg.sig
-out2 = createfile msg.unsig
-
-pipeserver $GPGSM
-send INPUT FD=$in
-expect-ok
-send OUTPUT FD=$out
-expect-ok
-send SIGN
-expect-ok
-
-send RESET
-expect-ok
-send INPUT FD=$in2
-expect-ok
-send OUTPUT FD=$out2
-expect-ok
-goodsig = count-status GOODSIG
-trusted = count-status TRUST_FULLY
-send VERIFY
-expect-ok
-echo goodsig=$goodsig trusted=$trusted
-fail-if !$goodsig
-fail-if !$trusted
-send BYE
-expect-ok
-
-# Unset variables so that the files get closed.
-in =
-out =
-in2 =
-out2=
-
-cmpfiles $plaintext msg.unsig
-fail-if !$?
-
-# Lets check it again with a new server instance, this time we keep
-# the server running to check whether the entire message has been
-# output after the VERIFY.
-in = openfile msg.sig
-out = createfile msg.unsig
-pipeserver $GPGSM
-send INPUT FD=$in
-expect-ok
-send OUTPUT FD=$out
-expect-ok
-goodsig = count-status GOODSIG
-trusted = count-status TRUST_FULLY
-send VERIFY
-expect-ok
-echo goodsig=$goodsig trusted=$trusted
-fail-if !$goodsig
-fail-if !$trusted
-
-cmpfiles $plaintext msg.unsig
-fail-if !$?
-
-send BYE
-expect-ok
-
-
-quit
-
diff --git a/tests/sm-verify b/tests/sm-verify
deleted file mode 100644
index b06dc16a4..000000000
--- a/tests/sm-verify
+++ /dev/null
@@ -1,114 +0,0 @@
-# sm-verify
-#
-# Verify a few distributed signatures.
-# Requirements:
-#
-
-srcdir = getenv srcdir
-
-# Check an opaque signature
-sig = openfile $srcdir/text-1.osig.pem
-out = createfile msg.unsig
-pipeserver $GPGSM
-send INPUT FD=$sig
-expect-ok
-send OUTPUT FD=$out
-expect-ok
-badsig = count-status BADSIG
-goodsig = count-status GOODSIG
-trusted = count-status TRUST_FULLY
-send VERIFY
-expect-ok
-echo badsig=$badsig goodsig=$goodsig trusted=$trusted
-fail-if $badsig
-fail-if !$goodsig
-fail-if !$trusted
-send BYE
-expect-ok
-
-sig =
-out =
-cmpfiles $srcdir/text-1.txt msg.unsig
-fail-if !$?
-
-# Check a detached signature.
-sig = openfile $srcdir/text-1.dsig.pem
-plain = openfile $srcdir/text-1.txt
-pipeserver $GPGSM
-send INPUT FD=$sig
-expect-ok
-send MESSAGE FD=$plain
-expect-ok
-badsig = count-status BADSIG
-goodsig = count-status GOODSIG
-trusted = count-status TRUST_FULLY
-send VERIFY
-expect-ok
-echo badsig=$badsig goodsig=$goodsig trusted=$trusted
-fail-if $badsig
-fail-if !$goodsig
-fail-if !$trusted
-send BYE
-expect-ok
-
-# Check a tampered opaque message
-sig = openfile $srcdir/text-1.osig-bad.pem
-out = createfile msg.unsig
-
-pipeserver $GPGSM
-send INPUT FD=$sig
-expect-ok
-send OUTPUT FD=$out
-expect-ok
-badsig = count-status BADSIG
-goodsig = count-status GOODSIG
-trusted = count-status TRUST_FULLY
-send VERIFY
-expect-ok
-echo badsig=$badsig goodsig=$goodsig trusted=$trusted
-fail-if $goodsig
-fail-if !$badsig
-fail-if $trusted
-send BYE
-expect-ok
-
-# Check another opaque signature but without asking for the output.
-sig = openfile $srcdir/text-2.osig.pem
-
-pipeserver $GPGSM
-send INPUT FD=$sig
-expect-ok
-badsig = count-status BADSIG
-goodsig = count-status GOODSIG
-trusted = count-status TRUST_FULLY
-send VERIFY
-expect-ok
-echo badsig=$badsig goodsig=$goodsig trusted=$trusted
-fail-if $badsig
-fail-if !$goodsig
-fail-if !$trusted
-send BYE
-expect-ok
-
-# We als have tampered version.
-sig = openfile $srcdir/text-2.osig-bad.pem
-
-pipeserver $GPGSM
-send INPUT FD=$sig
-expect-ok
-badsig = count-status BADSIG
-goodsig = count-status GOODSIG
-trusted = count-status TRUST_FULLY
-send VERIFY
-expect-ok
-echo badsig=$badsig goodsig=$goodsig trusted=$trusted
-fail-if $goodsig
-fail-if !$badsig
-fail-if $trusted
-send BYE
-expect-ok
-
-
-quit
-
-
diff --git a/tests/text-1.dsig.pem b/tests/text-1.dsig.pem
deleted file mode 100644
index a031ec259..000000000
--- a/tests/text-1.dsig.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN SIGNED MESSAGE-----
-MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAA
-oIIDGTCCAxUwggJ+oAMCAQICAQAwDQYJKoZIhvcNAQEEBQAwazELMAkGA1UEBhMC
-REUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgx
-GTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3QgY2VydCAx
-MB4XDTAxMTIwMzA5MzYzOFoXDTAyMTIwMzA5MzYzOFowazELMAkGA1UEBhMCREUx
-EzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxGTAX
-BgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3QgY2VydCAxMIGf
-MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgzpb5C2yeAvOSK+rak/5QqHXqxrzB
-i7mpzy6EllyqLR/5Wn9UJGXGwMGdJ25FJs4EiGinqRT9NDzDqH3XQpH/xWVQbVu7
-Jcusag4t0fi8qrDUopwvN8lQ82NIS/Jp94kUQEZLr3mCfgOjbnC4FJOO69xj6WQk
-e+ddxYsBS36iUQIDAQABo4HIMIHFMB0GA1UdDgQWBBQzN40SkcBUcYM4Xwhlv6lL
-+Y408zCBlQYDVR0jBIGNMIGKgBQzN40SkcBUcYM4Xwhlv6lL+Y4086FvpG0wazEL
-MAkGA1UEBhMCREUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBD
-b2RlIEdtYkgxGTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rl
-c3QgY2VydCAxggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAbIcE
-Hoo4qNobF2cWRCBaDZXQ6XcXG1lMLObrTSe4asUK++H59nC/ax+wMnDVrWZ8gkwJ
-O1KsHGx98+gjaCR+lP5P/yE5O8PD7TOp8OiYZVyw/guuQYn4qeondibUUMJeJCf7
-T6cfv+NjLpIt8lRTfgRBhT6SOoXSZodR8/NZPBkxggFXMIIBUwIBATBwMGsxCzAJ
-BgNVBAYTAkRFMRMwEQYDVQQHFApE/HNzZWxkb3JmMRYwFAYDVQQKEw1nMTAgQ29k
-ZSBHbWJIMRkwFwYDVQQLExBBZWd5cHRlbiBQcm9qZWN0MRQwEgYDVQQDEwt0ZXN0
-IGNlcnQgMQIBADAHBgUrDgMCGqBDMBwGCSqGSIb3DQEJBTEPFw0wMjA4MDgxMjIy
-NTRaMCMGCSqGSIb3DQEJBDEWBBR5MsAm+0wJAVQl3AAGYmnpxA4XLjALBgkqhkiG
-9w0BAQEEgYAZpBbucgorq56kl2rokCV1EAZcKgylfpEkqSz4RU6qNid+0NtjSAxi
-5164wjMLG71U9qSBX4XDdDQPHpH+PPF/8021kne2kPfeP68NiXK8CagdIqlnuJEj
-K934mVre7AIjrXqoob1ipUtCWeK+2uHXsUjtUn3u1Y3eWVZ6+1hDTAAAAAAAAA==
------END SIGNED MESSAGE-----
diff --git a/tests/text-1.osig-bad.pem b/tests/text-1.osig-bad.pem
deleted file mode 100644
index 0b5f4a439..000000000
--- a/tests/text-1.osig-bad.pem
+++ /dev/null
@@ -1,45 +0,0 @@
-The text in this message has been tampered.
-
------BEGIN SIGNED MESSAGE-----
-MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCAJIAEggPh
-SGlnaCBQcmllc3Q6CUFybWFtZW50cyBDaGFwdGVyIE9uZSwgdmVyc2VzIG5pbmUgdGhyb3Vn
-aCB0d2VudHktc2V2ZW46CkJyby4gTWF5bmFyZDoJQW5kIFNhaW50IEF0dGlsYSByYWlzZWQg
-dGhlIEhvbHkgSGFuZCBHcmVuYWRlIHVwIG9uIGhpZ2gKCXNheWluZywgIk9oIExvcmQsIEJs
-ZXNzIHVzIHRoaXMgSG9seSBIYW5kIEdyZW5hZGUsIGFuZCB3aXRoIGl0CglzbWFzaCBvdXIg
-ZW5lbWllcyB0byB0aW55IGJpdHMuIiAgQW5kIHRoZSBMb3JkIGRpZCBncmluLCBhbmQgdGhl
-CglwZW9wbGUgZGlkIGZlYXN0IHVwb24gdGhlIGxhbWJzLCBhbmQgc3RvYXRzLCBhbmQgb3Jh
-bmd1dGFucywgYW5kCglicmVha2Zhc3QgY2VyZWFscywgYW5kIGxpbWEgYmVhbi0KSGlnaCBQ
-cmllc3Q6CVNraXAgYSBiaXQsIHNpc3Rlci4gCkJyby4gTWF5bmFyZDoJQW5kIHRoZW4gdGhl
-IExvcmQgc3Bha2UsIHNheWluZzogIkZpcnN0LCBzaGFsdCB0aG91IHRha2UKCW91dCB0aGUg
-aG9seSBwaW4uICBUaGVuIHNoYWx0IHRob3UgY291bnQgdG8gdGhyZWUuICBObyBtb3JlLCBu
-byBsZXNzLgoJKlRocmVlKiBzaGFsbCBiZSB0aGUgbnVtYmVyIG9mIHRoZSBjb3VudGluZywg
-YW5kIHRoZSBudW1iZXIgb2YgdGhlCgljb3VudGluZyBzaGFsbCBiZSB0aHJlZS4gICpGb3Vy
-KiBzaGFsdCB0aG91IG5vdCBjb3VudCwgYW5kIG5laXRoZXIKCWNvdW50IHRob3UgdHdvLCBl
-eGNlcHRpbmcgdGhhdCB0aG91IHRoZW4gZ29lc3Qgb24gdG8gdGhyZWUuICBGaXZlIGlzCglS
-SUdIVCBPVVQuICBPbmNlIHRoZSBudW1iZXIgdGhyZWUsIGJlaW5nIHRoZSB0aGlyZCBudW1i
-ZXIgYmUgcmVhY2hlZCwKCXRoZW4gbG9iYmVzdCB0aG91IHRoeSBIb2x5IEhhbmQgR3JlbmFk
-ZSB0b3dhcmRzIHRoeSBmb2UsIHdobywgYmVpbmcKCW5hdWdodHkgaW4gbXkgc2lnaHQsIHNo
-YWxsIHNudWZmIGl0LiAgQW1lbi4KQWxsOglBbWVuLgoJCS0tIE1vbnR5IFB5dGhvbiwgIlRo
-ZSBIb2x5IEhhbmQgR3JlbmFkZSIKAAAAAAAAoIIDGTCCAxUwggJ+oAMCAQICAQAwDQYJKoZI
-hvcNAQEEBQAwazELMAkGA1UEBhMCREUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoT
-DWcxMCBDb2RlIEdtYkgxGTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rl
-c3QgY2VydCAxMB4XDTAxMTIwMzA5MzYzOFoXDTAyMTIwMzA5MzYzOFowazELMAkGA1UEBhMC
-REUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxGTAXBgNV
-BAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3QgY2VydCAxMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQDgzpb5C2yeAvOSK+rak/5QqHXqxrzBi7mpzy6EllyqLR/5Wn9U
-JGXGwMGdJ25FJs4EiGinqRT9NDzDqH3XQpH/xWVQbVu7Jcusag4t0fi8qrDUopwvN8lQ82NI
-S/Jp94kUQEZLr3mCfgOjbnC4FJOO69xj6WQke+ddxYsBS36iUQIDAQABo4HIMIHFMB0GA1Ud
-DgQWBBQzN40SkcBUcYM4Xwhlv6lL+Y408zCBlQYDVR0jBIGNMIGKgBQzN40SkcBUcYM4Xwhl
-v6lL+Y4086FvpG0wazELMAkGA1UEBhMCREUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNV
-BAoTDWcxMCBDb2RlIEdtYkgxGTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMT
-C3Rlc3QgY2VydCAxggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAbIcEHoo4
-qNobF2cWRCBaDZXQ6XcXG1lMLObrTSe4asUK++H59nC/ax+wMnDVrWZ8gkwJO1KsHGx98+gj
-aCR+lP5P/yE5O8PD7TOp8OiYZVyw/guuQYn4qeondibUUMJeJCf7T6cfv+NjLpIt8lRTfgRB
-hT6SOoXSZodR8/NZPBkxggFXMIIBUwIBATBwMGsxCzAJBgNVBAYTAkRFMRMwEQYDVQQHFApE
-/HNzZWxkb3JmMRYwFAYDVQQKEw1nMTAgQ29kZSBHbWJIMRkwFwYDVQQLExBBZWd5cHRlbiBQ
-cm9qZWN0MRQwEgYDVQQDEwt0ZXN0IGNlcnQgMQIBADAHBgUrDgMCGqBDMBwGCSqGSIb3DQEJ
-BTEPFw0wMjA4MDgxMjIyNDZaMCMGCSqGSIb3DQEJBDEWBBR5MsAm+0wJAVQl3AAGYmnpxA4X
-LjALBgkqhkiG9w0BAQEEgYC+7rFtegP8v+Z5yI4CH/0Y4RK48DM1oFMSz4xySpERFTk9p5RP
-BDhOqaaACVKUdmNW6xYJAFo53tQxbBTZ12woctFLbLm9rs/F6Tz2JIA9GxpXInkKYdvkaVHb
-pvEQgeoezFc4fd4yB87kgq4zZTViFcCJ3OvjboCu9ltIeIn73AAAAAAAAA==
------END SIGNED MESSAGE-----
diff --git a/tests/text-1.osig-badusage.pem b/tests/text-1.osig-badusage.pem
deleted file mode 100644
index 027f23ead..000000000
--- a/tests/text-1.osig-badusage.pem
+++ /dev/null
@@ -1,75 +0,0 @@
-This message was created by violating the keyUsage: keyEncipherment.
-
------BEGIN SIGNED MESSAGE-----
-MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCA
-JIAEggPhSGlnaCBQcmllc3Q6CUFybWFtZW50cyBDaGFwdGVyIE9uZSwgdmVyc2Vz
-IG5pbmUgdGhyb3VnaCB0d2VudHktc2V2ZW46CkJyby4gTWF5bmFyZDoJQW5kIFNh
-aW50IEF0dGlsYSByYWlzZWQgdGhlIEhvbHkgSGFuZCBHcmVuYWRlIHVwIG9uIGhp
-Z2gKCXNheWluZywgIk9oIExvcmQsIEJsZXNzIHVzIHRoaXMgSG9seSBIYW5kIEdy
-ZW5hZGUsIGFuZCB3aXRoIGl0CglzbWFzaCBvdXIgZW5lbWllcyB0byB0aW55IGJp
-dHMuIiAgQW5kIHRoZSBMb3JkIGRpZCBncmluLCBhbmQgdGhlCglwZW9wbGUgZGlk
-IGZlYXN0IHVwb24gdGhlIGxhbWJzLCBhbmQgc3RvYXRzLCBhbmQgb3Jhbmd1dGFu
-cywgYW5kCglicmVha2Zhc3QgY2VyZWFscywgYW5kIGxpbWEgYmVhbi0KSGlnaCBQ
-cmllc3Q6CVNraXAgYSBiaXQsIGJyb3RoZXIuCkJyby4gTWF5bmFyZDoJQW5kIHRo
-ZW4gdGhlIExvcmQgc3Bha2UsIHNheWluZzogIkZpcnN0LCBzaGFsdCB0aG91IHRh
-a2UKCW91dCB0aGUgaG9seSBwaW4uICBUaGVuIHNoYWx0IHRob3UgY291bnQgdG8g
-dGhyZWUuICBObyBtb3JlLCBubyBsZXNzLgoJKlRocmVlKiBzaGFsbCBiZSB0aGUg
-bnVtYmVyIG9mIHRoZSBjb3VudGluZywgYW5kIHRoZSBudW1iZXIgb2YgdGhlCglj
-b3VudGluZyBzaGFsbCBiZSB0aHJlZS4gICpGb3VyKiBzaGFsdCB0aG91IG5vdCBj
-b3VudCwgYW5kIG5laXRoZXIKCWNvdW50IHRob3UgdHdvLCBleGNlcHRpbmcgdGhh
-dCB0aG91IHRoZW4gZ29lc3Qgb24gdG8gdGhyZWUuICBGaXZlIGlzCglSSUdIVCBP
-VVQuICBPbmNlIHRoZSBudW1iZXIgdGhyZWUsIGJlaW5nIHRoZSB0aGlyZCBudW1i
-ZXIgYmUgcmVhY2hlZCwKCXRoZW4gbG9iYmVzdCB0aG91IHRoeSBIb2x5IEhhbmQg
-R3JlbmFkZSB0b3dhcmRzIHRoeSBmb2UsIHdobywgYmVpbmcKCW5hdWdodHkgaW4g
-bXkgc2lnaHQsIHNoYWxsIHNudWZmIGl0LiAgQW1lbi4KQWxsOglBbWVuLgoJCS0t
-IE1vbnR5IFB5dGhvbiwgIlRoZSBIb2x5IEhhbmQgR3JlbmFkZSIKAAAAAAAAoIIH
-gjCCA+IwggNLoAMCAQICAQAwDQYJKoZIhvcNAQEEBQAwga0xCzAJBgNVBAYTAmRl
-MQwwCgYDVQQIEwNOUlcxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcx
-MCBDb2RlIEdtYkgxHjAcBgNVBAsTFVRlc3QgQ0Egb24gS2VyY2tob2ZmczEVMBMG
-A1UEAxMMUm9vdC1UZXN0LUNBMSwwKgYJKoZIhvcNAQkBFh10ZXN0LWNhQGtlcmNr
-aG9mZnMuZzEwY29kZS5kZTAeFw0wMjAzMTEwOTI1MDFaFw0wMzAzMTEwOTI1MDFa
-MIGtMQswCQYDVQQGEwJkZTEMMAoGA1UECBMDTlJXMRMwEQYDVQQHFApE/HNzZWxk
-b3JmMRYwFAYDVQQKEw1nMTAgQ29kZSBHbWJIMR4wHAYDVQQLExVUZXN0IENBIG9u
-IEtlcmNraG9mZnMxFTATBgNVBAMTDFJvb3QtVGVzdC1DQTEsMCoGCSqGSIb3DQEJ
-ARYddGVzdC1jYUBrZXJja2hvZmZzLmcxMGNvZGUuZGUwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAMsjHHkftougdddTWQ6lcwlowfr3MpmiqDcTOfPuJzY69PGn
-8dzNnbjF+qDmqW8b6YHWTmYVfZWwzBbGfUnP/K/Jz8Crk1vd3EtqnHkyNdnzj3dW
-prXed2ncUff+x3ZxvthFFnBDumzbV0sR3FoRhhY0rKSkHpK7MxWRWm3U8BkdAgMB
-AAGjggEOMIIBCjAdBgNVHQ4EFgQUilgNzsWIc4O+ang1CsXuXu1NypMwgdoGA1Ud
-IwSB0jCBz4AUilgNzsWIc4O+ang1CsXuXu1NypOhgbOkgbAwga0xCzAJBgNVBAYT
-AmRlMQwwCgYDVQQIEwNOUlcxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoT
-DWcxMCBDb2RlIEdtYkgxHjAcBgNVBAsTFVRlc3QgQ0Egb24gS2VyY2tob2ZmczEV
-MBMGA1UEAxMMUm9vdC1UZXN0LUNBMSwwKgYJKoZIhvcNAQkBFh10ZXN0LWNhQGtl
-cmNraG9mZnMuZzEwY29kZS5kZYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-BAUAA4GBAJGB2WETqLts9jGrzlRTnWOZ1D6oKkx5Q+c9gA6LQnpHYkUO2LCRx6g2
-hMEXRsVcTbxT2t9YgPlXmbuGE2jogFtJRWe0mGMI0byo7Pgg0MZD1QVscgeyTXiD
-o7VsiuBU683Lt2jYHyCcTLs2FPBFMLsMD6/hsWD+RlBUlYT/lTrMMIIDmDCCAwGg
-AwIBAgIBAzANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMCZGUxDDAKBgNVBAgT
-A05SVzETMBEGA1UEBxQKRPxzc2VsZG9yZjEWMBQGA1UEChMNZzEwIENvZGUgR21i
-SDEeMBwGA1UECxMVVGVzdCBDQSBvbiBLZXJja2hvZmZzMRUwEwYDVQQDEwxSb290
-LVRlc3QtQ0ExLDAqBgkqhkiG9w0BCQEWHXRlc3QtY2FAa2VyY2tob2Zmcy5nMTBj
-b2RlLmRlMB4XDTAyMDkwMzEwMzg1NloXDTEyMDgzMTEwMzg1NlowTzELMAkGA1UE
-BhMCZGUxETAPBgNVBAoTCGcxMCBjb2RlMRAwDgYDVQQLEwdUZXN0bGFiMRswGQYD
-VQQDExJFbmNyeXB0IE9ubHkgS2V5IDEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANsmhi/X6vesmlK6Ikc+KMjfRjewoEgjB3L21c2W7vkF19ZQqElXy9PMzXIK
-nJQetDD+UIjmqN3Q1XcFBqMU3bT1eaJpb7U+mOeodQ9AABapiF0cH10ZrJDRhhht
-9LNU873Kl4vL+xgQ3+WraK/ksrCdH4IjJlUUr+zfWWYo+MWPAgMBAAGjggEjMIIB
-HzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFIDAdBgNVHQ4EFgQUxWTiIXcx29tl0D0T
-Yl9sQ4z4foIwgdoGA1UdIwSB0jCBz4AUilgNzsWIc4O+ang1CsXuXu1NypOhgbOk
-gbAwga0xCzAJBgNVBAYTAmRlMQwwCgYDVQQIEwNOUlcxEzARBgNVBAcUCkT8c3Nl
-bGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxHjAcBgNVBAsTFVRlc3QgQ0Eg
-b24gS2VyY2tob2ZmczEVMBMGA1UEAxMMUm9vdC1UZXN0LUNBMSwwKgYJKoZIhvcN
-AQkBFh10ZXN0LWNhQGtlcmNraG9mZnMuZzEwY29kZS5kZYIBADAJBgNVHREEAjAA
-MA0GCSqGSIb3DQEBBQUAA4GBAGPwl3GN6TxYlwnN7Za2H4lJthUkBdxrjoh7D7z4
-kxpo0JGgcBbDEpGPDNtwNg73ukwruGOiOJPGk6qZI1TtI+7joScHf1dtGUTcfFW+
-qpGkImJDrY1IV+ud6qhL2LxY4FLAuEv2iPNSbM9N3X8nB0ofWoPefISRwikYCdR8
-3m+tMYIBmzCCAZcCAQEwgbMwga0xCzAJBgNVBAYTAmRlMQwwCgYDVQQIEwNOUlcx
-EzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxHjAc
-BgNVBAsTFVRlc3QgQ0Egb24gS2VyY2tob2ZmczEVMBMGA1UEAxMMUm9vdC1UZXN0
-LUNBMSwwKgYJKoZIhvcNAQkBFh10ZXN0LWNhQGtlcmNraG9mZnMuZzEwY29kZS5k
-ZQIBAzAHBgUrDgMCGqBDMBwGCSqGSIb3DQEJBTEPFw0wMjA5MDMxMTA0MzBaMCMG
-CSqGSIb3DQEJBDEWBBR5MsAm+0wJAVQl3AAGYmnpxA4XLjALBgkqhkiG9w0BAQEE
-gYB0gCqSUCIvw+26dmMFDUz/s3MG9nusAvYJpig8DLIsAGwmAw6Pg0XsI3Wkufb6
-KMTkmyjZLAsNUYWpQgcWkUvIR68iYtI1hd610+YbZubK+IppGkxUrXtFuaMK0xQs
-tC0yMxlbcDBteiJYAZTDxn7cypmz106o6k4Utf0CPmd2LQAAAAAAAA==
------END SIGNED MESSAGE-----
diff --git a/tests/text-1.osig.pem b/tests/text-1.osig.pem
deleted file mode 100644
index 7317350ec..000000000
--- a/tests/text-1.osig.pem
+++ /dev/null
@@ -1,48 +0,0 @@
------BEGIN SIGNED MESSAGE-----
-MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCA
-JIAEggPhSGlnaCBQcmllc3Q6CUFybWFtZW50cyBDaGFwdGVyIE9uZSwgdmVyc2Vz
-IG5pbmUgdGhyb3VnaCB0d2VudHktc2V2ZW46CkJyby4gTWF5bmFyZDoJQW5kIFNh
-aW50IEF0dGlsYSByYWlzZWQgdGhlIEhvbHkgSGFuZCBHcmVuYWRlIHVwIG9uIGhp
-Z2gKCXNheWluZywgIk9oIExvcmQsIEJsZXNzIHVzIHRoaXMgSG9seSBIYW5kIEdy
-ZW5hZGUsIGFuZCB3aXRoIGl0CglzbWFzaCBvdXIgZW5lbWllcyB0byB0aW55IGJp
-dHMuIiAgQW5kIHRoZSBMb3JkIGRpZCBncmluLCBhbmQgdGhlCglwZW9wbGUgZGlk
-IGZlYXN0IHVwb24gdGhlIGxhbWJzLCBhbmQgc3RvYXRzLCBhbmQgb3Jhbmd1dGFu
-cywgYW5kCglicmVha2Zhc3QgY2VyZWFscywgYW5kIGxpbWEgYmVhbi0KSGlnaCBQ
-cmllc3Q6CVNraXAgYSBiaXQsIGJyb3RoZXIuCkJyby4gTWF5bmFyZDoJQW5kIHRo
-ZW4gdGhlIExvcmQgc3Bha2UsIHNheWluZzogIkZpcnN0LCBzaGFsdCB0aG91IHRh
-a2UKCW91dCB0aGUgaG9seSBwaW4uICBUaGVuIHNoYWx0IHRob3UgY291bnQgdG8g
-dGhyZWUuICBObyBtb3JlLCBubyBsZXNzLgoJKlRocmVlKiBzaGFsbCBiZSB0aGUg
-bnVtYmVyIG9mIHRoZSBjb3VudGluZywgYW5kIHRoZSBudW1iZXIgb2YgdGhlCglj
-b3VudGluZyBzaGFsbCBiZSB0aHJlZS4gICpGb3VyKiBzaGFsdCB0aG91IG5vdCBj
-b3VudCwgYW5kIG5laXRoZXIKCWNvdW50IHRob3UgdHdvLCBleGNlcHRpbmcgdGhh
-dCB0aG91IHRoZW4gZ29lc3Qgb24gdG8gdGhyZWUuICBGaXZlIGlzCglSSUdIVCBP
-VVQuICBPbmNlIHRoZSBudW1iZXIgdGhyZWUsIGJlaW5nIHRoZSB0aGlyZCBudW1i
-ZXIgYmUgcmVhY2hlZCwKCXRoZW4gbG9iYmVzdCB0aG91IHRoeSBIb2x5IEhhbmQg
-R3JlbmFkZSB0b3dhcmRzIHRoeSBmb2UsIHdobywgYmVpbmcKCW5hdWdodHkgaW4g
-bXkgc2lnaHQsIHNoYWxsIHNudWZmIGl0LiAgQW1lbi4KQWxsOglBbWVuLgoJCS0t
-IE1vbnR5IFB5dGhvbiwgIlRoZSBIb2x5IEhhbmQgR3JlbmFkZSIKAAAAAAAAoIID
-GTCCAxUwggJ+oAMCAQICAQAwDQYJKoZIhvcNAQEEBQAwazELMAkGA1UEBhMCREUx
-EzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxGTAX
-BgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3QgY2VydCAxMB4X
-DTAxMTIwMzA5MzYzOFoXDTAyMTIwMzA5MzYzOFowazELMAkGA1UEBhMCREUxEzAR
-BgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxGTAXBgNV
-BAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3QgY2VydCAxMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgzpb5C2yeAvOSK+rak/5QqHXqxrzBi7mp
-zy6EllyqLR/5Wn9UJGXGwMGdJ25FJs4EiGinqRT9NDzDqH3XQpH/xWVQbVu7Jcus
-ag4t0fi8qrDUopwvN8lQ82NIS/Jp94kUQEZLr3mCfgOjbnC4FJOO69xj6WQke+dd
-xYsBS36iUQIDAQABo4HIMIHFMB0GA1UdDgQWBBQzN40SkcBUcYM4Xwhlv6lL+Y40
-8zCBlQYDVR0jBIGNMIGKgBQzN40SkcBUcYM4Xwhlv6lL+Y4086FvpG0wazELMAkG
-A1UEBhMCREUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2Rl
-IEdtYkgxGTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3Qg
-Y2VydCAxggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAbIcEHoo4
-qNobF2cWRCBaDZXQ6XcXG1lMLObrTSe4asUK++H59nC/ax+wMnDVrWZ8gkwJO1Ks
-HGx98+gjaCR+lP5P/yE5O8PD7TOp8OiYZVyw/guuQYn4qeondibUUMJeJCf7T6cf
-v+NjLpIt8lRTfgRBhT6SOoXSZodR8/NZPBkxggFXMIIBUwIBATBwMGsxCzAJBgNV
-BAYTAkRFMRMwEQYDVQQHFApE/HNzZWxkb3JmMRYwFAYDVQQKEw1nMTAgQ29kZSBH
-bWJIMRkwFwYDVQQLExBBZWd5cHRlbiBQcm9qZWN0MRQwEgYDVQQDEwt0ZXN0IGNl
-cnQgMQIBADAHBgUrDgMCGqBDMBwGCSqGSIb3DQEJBTEPFw0wMjA4MDgxMjIyNDZa
-MCMGCSqGSIb3DQEJBDEWBBR5MsAm+0wJAVQl3AAGYmnpxA4XLjALBgkqhkiG9w0B
-AQEEgYC+7rFtegP8v+Z5yI4CH/0Y4RK48DM1oFMSz4xySpERFTk9p5RPBDhOqaaA
-CVKUdmNW6xYJAFo53tQxbBTZ12woctFLbLm9rs/F6Tz2JIA9GxpXInkKYdvkaVHb
-pvEQgeoezFc4fd4yB87kgq4zZTViFcCJ3OvjboCu9ltIeIn73AAAAAAAAA==
------END SIGNED MESSAGE-----
diff --git a/tests/text-1.txt b/tests/text-1.txt
deleted file mode 100644
index b14c1a27c..000000000
--- a/tests/text-1.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-High Priest: Armaments Chapter One, verses nine through twenty-seven:
-Bro. Maynard: And Saint Attila raised the Holy Hand Grenade up on high
- saying, "Oh Lord, Bless us this Holy Hand Grenade, and with it
- smash our enemies to tiny bits." And the Lord did grin, and the
- people did feast upon the lambs, and stoats, and orangutans, and
- breakfast cereals, and lima bean-
-High Priest: Skip a bit, brother.
-Bro. Maynard: And then the Lord spake, saying: "First, shalt thou take
- out the holy pin. Then shalt thou count to three. No more, no less.
- *Three* shall be the number of the counting, and the number of the
- counting shall be three. *Four* shalt thou not count, and neither
- count thou two, excepting that thou then goest on to three. Five is
- RIGHT OUT. Once the number three, being the third number be reached,
- then lobbest thou thy Holy Hand Grenade towards thy foe, who, being
- naughty in my sight, shall snuff it. Amen.
-All: Amen.
- -- Monty Python, "The Holy Hand Grenade"
diff --git a/tests/text-2.osig-bad.pem b/tests/text-2.osig-bad.pem
deleted file mode 100644
index 555844844..000000000
--- a/tests/text-2.osig-bad.pem
+++ /dev/null
@@ -1,28 +0,0 @@
-The signature time in this message has been tampered.
-
------BEGIN SIGNED MESSAGE-----
-MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCAJIAEU01p
-bGl0YXJ5IGludGVsbGlnZW5jZSBpcyBhIGNvbnRyYWRpY3Rpb24gaW4gdGVybXMuCiAgICAg
-ICAgICAgICAgICAtLSBHcm91Y2hvIE1hcngKAAAAAAAAoIIDGTCCAxUwggJ+oAMCAQICAQAw
-DQYJKoZIhvcNAQEEBQAwazELMAkGA1UEBhMCREUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAU
-BgNVBAoTDWcxMCBDb2RlIEdtYkgxGTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNV
-BAMTC3Rlc3QgY2VydCAxMB4XDTAxMTIwMzA5MzYzOFoXDTAyMTIwMzA5MzYzOFowazELMAkG
-A1UEBhMCREUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgx
-GTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3QgY2VydCAxMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgzpb5C2yeAvOSK+rak/5QqHXqxrzBi7mpzy6Ellyq
-LR/5Wn9UJGXGwMGdJ25FJs4EiGinqRT9NDzDqH3XQpH/xWVQbVu7Jcusag4t0fi8qrDUopwv
-N8lQ82NIS/Jp94kUQEZLr3mCfgOjbnC4FJOO69xj6WQke+ddxYsBS36iUQIDAQABo4HIMIHF
-MB0GA1UdDgQWBBQzN40SkcBUcYM4Xwhlv6lL+Y408zCBlQYDVR0jBIGNMIGKgBQzN40SkcBU
-cYM4Xwhlv6lL+Y4086FvpG0wazELMAkGA1UEBhMCREUxEzARBgNVBAcUCkT8c3NlbGRvcmYx
-FjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxGTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDAS
-BgNVBAMTC3Rlc3QgY2VydCAxggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEA
-bIcEHoo4qNobF2cWRCBaDZXQ6XcXG1lMLObrTSe4asUK++H59nC/ax+wMnDVrWZ8gkwJO1Ks
-HGx98+gjaCR+lP5P/yE5O8PD7TOp8OiYZVyw/guuQYn4qeondibUUMJeJCf7T6cfv+NjLpIt
-8lRTfgRBhT6SOoXSZodR8/NZPBkxggFXMIIBUwIBATBwMGsxCzAJBgNVBAYTAkRFMRMwEQYD
-VQQHFApE/HNzZWxkb3JmMRYwFAYDVQQKEw1nMTAgQ29kZSBHbWJIMRkwFwYDVQQLExBBZWd5
-cHRlbiBQcm9qZWN0MRQwEgYDVQQDEwt0ZXN0IGNlcnQgMQIBADAHBgUrDgMCGqBDMBwGCSqG
-SIb3DQEJBTEPFw0wMjA4MDcxMjM4MjJaMCMGCSqGSIb3DQEJBDEWBBSzI9M4i+WJMTDoCeLu
-lJP7p1PCezALBgkqhkiG9w0BAQEEgYAqoJR3uJkChUhaH0EH3U5JpQApIhVEqedaKPT6BCPP
-WALFPzEa6YKzftA5e+Dap41UnB8nQ9rfwYty3hw5EulzV9iLnhGornQIgI6D5o7ymxyacsiY
-EarezxGXjuPMnyXcpTOgt+vz2k3qisjzxU32zpsOuK6U82PSHysX8rH9QgAAAAAAAA==
------END SIGNED MESSAGE-----
diff --git a/tests/text-2.osig.pem b/tests/text-2.osig.pem
deleted file mode 100644
index 57b5da9b2..000000000
--- a/tests/text-2.osig.pem
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN SIGNED MESSAGE-----
-MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCA
-JIAEU01pbGl0YXJ5IGludGVsbGlnZW5jZSBpcyBhIGNvbnRyYWRpY3Rpb24gaW4g
-dGVybXMuCiAgICAgICAgICAgICAgICAtLSBHcm91Y2hvIE1hcngKAAAAAAAAoIID
-GTCCAxUwggJ+oAMCAQICAQAwDQYJKoZIhvcNAQEEBQAwazELMAkGA1UEBhMCREUx
-EzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxGTAX
-BgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3QgY2VydCAxMB4X
-DTAxMTIwMzA5MzYzOFoXDTAyMTIwMzA5MzYzOFowazELMAkGA1UEBhMCREUxEzAR
-BgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2RlIEdtYkgxGTAXBgNV
-BAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3QgY2VydCAxMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgzpb5C2yeAvOSK+rak/5QqHXqxrzBi7mp
-zy6EllyqLR/5Wn9UJGXGwMGdJ25FJs4EiGinqRT9NDzDqH3XQpH/xWVQbVu7Jcus
-ag4t0fi8qrDUopwvN8lQ82NIS/Jp94kUQEZLr3mCfgOjbnC4FJOO69xj6WQke+dd
-xYsBS36iUQIDAQABo4HIMIHFMB0GA1UdDgQWBBQzN40SkcBUcYM4Xwhlv6lL+Y40
-8zCBlQYDVR0jBIGNMIGKgBQzN40SkcBUcYM4Xwhlv6lL+Y4086FvpG0wazELMAkG
-A1UEBhMCREUxEzARBgNVBAcUCkT8c3NlbGRvcmYxFjAUBgNVBAoTDWcxMCBDb2Rl
-IEdtYkgxGTAXBgNVBAsTEEFlZ3lwdGVuIFByb2plY3QxFDASBgNVBAMTC3Rlc3Qg
-Y2VydCAxggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAbIcEHoo4
-qNobF2cWRCBaDZXQ6XcXG1lMLObrTSe4asUK++H59nC/ax+wMnDVrWZ8gkwJO1Ks
-HGx98+gjaCR+lP5P/yE5O8PD7TOp8OiYZVyw/guuQYn4qeondibUUMJeJCf7T6cf
-v+NjLpIt8lRTfgRBhT6SOoXSZodR8/NZPBkxggFXMIIBUwIBATBwMGsxCzAJBgNV
-BAYTAkRFMRMwEQYDVQQHFApE/HNzZWxkb3JmMRYwFAYDVQQKEw1nMTAgQ29kZSBH
-bWJIMRkwFwYDVQQLExBBZWd5cHRlbiBQcm9qZWN0MRQwEgYDVQQDEwt0ZXN0IGNl
-cnQgMQIBADAHBgUrDgMCGqBDMBwGCSqGSIb3DQEJBTEPFw0wMjA4MDgxMjM4MjJa
-MCMGCSqGSIb3DQEJBDEWBBSzI9M4i+WJMTDoCeLulJP7p1PCezALBgkqhkiG9w0B
-AQEEgYAqoJR3uJkChUhaH0EH3U5JpQApIhVEqedaKPT6BCPPWALFPzEa6YKzftA5
-e+Dap41UnB8nQ9rfwYty3hw5EulzV9iLnhGornQIgI6D5o7ymxyacsiYEarezxGX
-juPMnyXcpTOgt+vz2k3qisjzxU32zpsOuK6U82PSHysX8rH9QgAAAAAAAA==
------END SIGNED MESSAGE-----
diff --git a/tests/text-2.txt b/tests/text-2.txt
deleted file mode 100644
index 314c7a4e8..000000000
--- a/tests/text-2.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Military intelligence is a contradiction in terms.
- -- Groucho Marx
diff --git a/tests/text-3.txt b/tests/text-3.txt
deleted file mode 100644
index 9345b550f..000000000
--- a/tests/text-3.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Military justice is to justice what military music is to music.
- -- Groucho Marx