This commit was manufactured by cvs2git to create tag 'bluhm_20181106'.bluhm_20181106

380 files changed, 0 insertions, 56003 deletions

diff --git a/src/regress/lib/libc/Makefile b/src/regress/lib/libc/Makefile
deleted file mode 100644
index 0530008c49..0000000000
--- a/src/regress/lib/libc/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#       $OpenBSD: Makefile,v 1.51 2017/10/15 12:15:30 visa Exp $
-
-SUBDIR+= _setjmp
-SUBDIR+= alloca arc4random-fork atexit
-SUBDIR+= basename
-SUBDIR+= cephes cxa-atexit
-SUBDIR+= db dirname
-SUBDIR+= env explicit_bzero
-SUBDIR+= fmemopen fnmatch fpclassify
-SUBDIR+= getaddrinfo getcap getopt_long glob
-SUBDIR+= hsearch
-SUBDIR+= ieeefp ifnameindex
-SUBDIR+= ldexp longjmp locale
-SUBDIR+= malloc mkstemp modf
-SUBDIR+= netdb
-SUBDIR+= open_memstream orientation
-SUBDIR+= popen printf
-SUBDIR+= qsort
-SUBDIR+= regex
-SUBDIR+= setjmp setjmp-signal sigsetjmp sprintf stdio_threading
-SUBDIR+= stpncpy strerror strlcat strlcpy strnlen strtod strtol strtonum
-SUBDIR+= telldir time timingsafe
-SUBDIR+= vis
-
-.if defined(REGRESS_FULL) || make(clean) || make(cleandir) || make(obj)
-SUBDIR+= setjmp-fpu
-.endif
-
-.if exists(arch/${MACHINE_ARCH})
-SUBDIR+= arch/${MACHINE_ARCH}
-.endif
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/_setjmp/Makefile b/src/regress/lib/libc/_setjmp/Makefile
deleted file mode 100644
index 5d58242523..0000000000
--- a/src/regress/lib/libc/_setjmp/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2002/01/01 23:00:51 art Exp $
-#       $NetBSD: Makefile,v 1.2 1995/04/20 22:38:44 cgd Exp $
-
-PROG=   _setjmptest
-SRCS=   jmptest.c
-
-CFLAGS+= -DTEST_U_SETJMP
-
-.PATH:  ${.CURDIR}/../setjmp
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/alloca/Makefile b/src/regress/lib/libc/alloca/Makefile
deleted file mode 100644
index f31417cda7..0000000000
--- a/src/regress/lib/libc/alloca/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2003/02/12 06:49:04 mickey Exp $
-
-PROG=   alloca
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/alloca/alloca.c b/src/regress/lib/libc/alloca/alloca.c
deleted file mode 100644
index 54fa90edae..0000000000
--- a/src/regress/lib/libc/alloca/alloca.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*      $OpenBSD: alloca.c,v 1.7 2004/03/10 01:17:45 deraadt Exp $      */
-
-/*      Written by Michael Shalayeff, 2003, Public Domain.      */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int
-main(int argc, char *argv[])
-{
-        char *q, *p;
-
-        p = alloca(41);
-        strlcpy(p, "hellow world", 41);
-
-        q = alloca(53);
-        strlcpy(q, "hellow world", 53);
-
-        exit(strcmp(p, q));
-}
diff --git a/src/regress/lib/libc/arc4random-fork/Makefile b/src/regress/lib/libc/arc4random-fork/Makefile
deleted file mode 100644
index 05762e33ff..0000000000
--- a/src/regress/lib/libc/arc4random-fork/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/06/18 08:24:00 matthew Exp $
-
-PROG=   arc4random-fork
-
-REGRESS_TARGETS=        \
-        run             \
-        run-buf         \
-        run-prefork     \
-        run-buf-prefork
-
-run: ${PROG}
-        ./${PROG}
-
-run-buf: ${PROG}
-        ./${PROG} -b
-
-run-prefork: ${PROG}
-        ./${PROG} -p
-
-run-buf-prefork: ${PROG}
-        ./${PROG} -bp
-
-.PHONY: ${REGRESS_TARGETS}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/arc4random-fork/arc4random-fork.c b/src/regress/lib/libc/arc4random-fork/arc4random-fork.c
deleted file mode 100644
index 4bc9c634f1..0000000000
--- a/src/regress/lib/libc/arc4random-fork/arc4random-fork.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2014 Google Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdint.h>
-
-#define CHECK(x) assert(x)
-#define CHECK_EQ(a, b) assert((a) == (b))
-#define CHECK_NE(a, b) assert((a) != (b))
-#define CHECK_GE(a, b) assert((a) >= (b))
-#define CHECK_LE(a, b) assert((a) <= (b))
-
-/* Test arc4random_buf(3) instead of arc4random(3). */
-static int flagbuf;
-
-/* Initialize arc4random(3) before forking. */
-static int flagprefork;
-
-enum {
-        N = 4096
-};
-
-typedef struct {
-        uint32_t x[N];
-} Buf;
-
-static int
-isfullbuf(const Buf *buf)
-{
-        size_t i;
-        for (i = 0; i < N; i++)
-                if (buf->x[i])
-                        return (1);
-        return (0);
-}
-
-static void
-fillbuf(Buf *buf)
-{
-        if (flagbuf) {
-                arc4random_buf(buf->x, sizeof(buf->x));
-        } else {
-                size_t i;
-                for (i = 0; i < N; i++)
-                        buf->x[i] = arc4random();
-        }
-}
-
-static void
-usage()
-{
-        errx(1, "usage: arc4random-fork [-bp]");
-}
-
-static pid_t
-safewaitpid(pid_t pid, int *status, int options)
-{
-        pid_t ret;
-        do {
-                ret = waitpid(pid, status, options);
-        } while (ret == -1 && errno == EINTR);
-        return (ret);
-}
-
-int
-main(int argc, char *argv[])
-{
-        int opt, status;
-        Buf *bufparent, *bufchildone, *bufchildtwo;
-        pid_t pidone, pidtwo;
-        size_t i, countone = 0, counttwo = 0, countkids = 0;
-
-        /* Ensure SIGCHLD isn't set to SIG_IGN. */
-        const struct sigaction sa = {
-                .sa_handler = SIG_DFL,
-        };
-        CHECK_EQ(0, sigaction(SIGCHLD, &sa, NULL));
-
-        while ((opt = getopt(argc, argv, "bp")) != -1) {
-                switch (opt) {
-                case 'b':
-                        flagbuf = 1;
-                        break;
-                case 'p':
-                        flagprefork = 1;
-                        break;
-                default:
-                        usage();
-                }
-        }
-
-        if (flagprefork)
-                arc4random();
-
-        bufparent = mmap(NULL, sizeof(Buf), PROT_READ|PROT_WRITE,
-            MAP_ANON|MAP_PRIVATE, -1, 0);
-        CHECK_NE(MAP_FAILED, bufparent);
-
-        bufchildone = mmap(NULL, sizeof(Buf), PROT_READ|PROT_WRITE,
-            MAP_ANON|MAP_SHARED, -1, 0);
-        CHECK_NE(MAP_FAILED, bufchildone);
-
-        bufchildtwo = mmap(NULL, sizeof(Buf), PROT_READ|PROT_WRITE,
-            MAP_ANON|MAP_SHARED, -1, 0);
-        CHECK_NE(MAP_FAILED, bufchildtwo);
-
-        pidone = fork();
-        CHECK_GE(pidone, 0);
-        if (pidone == 0) {
-                fillbuf(bufchildone);
-                _exit(0);
-        }
-
-        pidtwo = fork();
-        CHECK_GE(pidtwo, 0);
-        if (pidtwo == 0) {
-                fillbuf(bufchildtwo);
-                _exit(0);
-        }
-
-        fillbuf(bufparent);
-
-        CHECK_EQ(pidone, safewaitpid(pidone, &status, 0));
-        CHECK(WIFEXITED(status));
-        CHECK_EQ(0, WEXITSTATUS(status));
-
-        CHECK_EQ(pidtwo, safewaitpid(pidtwo, &status, 0));
-        CHECK(WIFEXITED(status));
-        CHECK_EQ(0, WEXITSTATUS(status));
-
-        CHECK(isfullbuf(bufchildone));
-        CHECK(isfullbuf(bufchildtwo));
-
-        for (i = 0; i < N; i++) {
-                countone += bufparent->x[i] == bufchildone->x[i];
-                counttwo += bufparent->x[i] == bufchildtwo->x[i];
-                countkids += bufchildone->x[i] == bufchildtwo->x[i];
-        }
-
-        /*
-         * These checks are inherently probabilistic and theoretically risk
-         * flaking, but there's less than a 1 in 2^40 chance of more than
-         * one pairwise match between two vectors of 4096 32-bit integers.
-         */
-        CHECK_LE(countone, 1);
-        CHECK_LE(counttwo, 1);
-        CHECK_LE(countkids, 1);
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/arch/alpha/Makefile b/src/regress/lib/libc/arch/alpha/Makefile
deleted file mode 100644
index 8c4dfb735c..0000000000
--- a/src/regress/lib/libc/arch/alpha/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2002/02/23 01:25:11 art Exp $
-#       $NetBSD: Makefile,v 1.1 1995/04/24 05:53:31 cgd Exp $
-
-# do nothing here; none of the tests here can be run automatically
-SUBDIR=
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/arch/alpha/divremtest/Makefile b/src/regress/lib/libc/arch/alpha/divremtest/Makefile
deleted file mode 100644
index 1da3ac8494..0000000000
--- a/src/regress/lib/libc/arch/alpha/divremtest/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2001/01/29 02:05:39 niklas Exp $
-#       $NetBSD: Makefile,v 1.1 1995/04/24 05:53:34 cgd Exp $
-
-PROG=   divremtest
-NOMAN=
-
-CLEANFILES+=    mkcases cases.c mktestcases testcases
-
-divremtest.c: cases.c
-
-cases.c: mkcases
-        /bin/rm -f cases.c
-        mkcases > cases.c
-
-# a typical strategy to use this:
-# compile a NetBSD divremtest binary, an OSF/1 divremtest binary, and an
-# OSF/1 mktestcases binary.  You then run mktestecases | divremtest -g
-# on an OSF/1 machine, and pipe the output to an rsh to a NetBSD machine
-# which then runs divremtest.  You can test an infinite number of random
-# values that way; I like to put a 'dd' in, so I can see how much I've done.
-
-testcases: mktestcases divremtest
-        /bin/rm -f testcases
-        mktestcases | divremtest -g > testcases
-
-regress:
-        @echo THIS TEST CANNOT BE RUN AUTOMATICALLY.
-        @false
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/arch/alpha/divremtest/divremtest.c b/src/regress/lib/libc/arch/alpha/divremtest/divremtest.c
deleted file mode 100644
index 3d9e8a6de2..0000000000
--- a/src/regress/lib/libc/arch/alpha/divremtest/divremtest.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*      $OpenBSD: divremtest.c,v 1.2 2001/01/29 02:05:39 niklas Exp $   */
-/*      $NetBSD: divremtest.c,v 1.1 1995/04/24 05:53:35 cgd Exp $       */
-
-/*
- * Copyright (c) 1995 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *      for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
-
-void    testfile();
-void    usage();
-
-int generate;
-
-int
-main(argc, argv)
-        int argc;
-        char **argv;
-{
-        int c;
-
-        signal(SIGFPE, SIG_IGN);
-
-        while ((c = getopt(argc, argv, "g")) != -1)
-                switch (c) {
-                case 'g':
-                        generate = 1;
-                        break;
-
-                default:
-                        usage();
-                        break;
-        }
-
-        argc -= optind;
-        argv += optind;
-
-        if (argc == 0)
-                testfile();
-        else
-                for (; argc != 0; argc--, argv++) {
-                        if (freopen(argv[0], "r", stdin) == NULL) {
-                                fprintf(stderr,
-                                    "divremtest: couldn't open %s\n",
-                                    argv[0]);
-                                exit(1);
-                        }
-
-                        testfile();
-                }
-
-        exit(0);
-}
-
-void
-testfile()
-{
-        union operand {
-                unsigned long   input;
-                int             op_int;
-                unsigned int    op_u_int;
-                long            op_long;
-                unsigned long   op_u_long;
-        } op1, op2, divres, modres, divwant, modwant;
-        char opspec[6];
-        int encoded, i;
-
-        while (scanf("%6c %lx %lx %lx %lx\n", opspec, &op1.input,
-            &op2.input, &divwant.input, &modwant.input) != EOF) {
-
-                encoded = 0;
-
-                for (i = 0; i < 6; i += 2) {
-                        int posval;
-
-                        switch (opspec[i]) {
-                        case '.':
-                                posval = 0;
-                                break;
-                        case '-':
-                                posval = 1;
-                                break;
-                        default:
-                                fprintf(stderr,
-                                    "unknown signedness spec %c\n",
-                                    opspec[i]);
-                                exit(1);
-                        }
-                        encoded |= posval << ((5 - i) * 4);
-                }
-                        
-                for (i = 1; i < 6; i += 2) {
-                        int posval;
-
-                        switch (opspec[i]) {
-                        case 'i':
-                                posval = 0;
-                                break;
-                        case 'l':
-                                posval = 1;
-                                break;
-                        default:
-                                fprintf(stderr, "unknown length spec %c\n",
-                                    opspec[i]);
-                                exit(1);
-                        }
-                        encoded |= posval << ((5 - i) * 4);
-                }
-
-                /* KILL ME!!! */
-                switch (encoded) {
-
-#define TRY_IT(a, b, c)                                                 \
-        divres.a = op1.b / op2.c;                                       \
-        modres.a = op1.b % op2.c;                                       \
-        if (generate) {                                                 \
-                printf("%6s 0x%016lx 0x%016lx 0x%016lx 0x%016lx\n",     \
-                    opspec, op1.input, op2.input,                       \
-                    divres.a, modres.a);                                \
-        } else {                                                        \
-                if ((divres.a != divwant.a) ||                          \
-                    (modres.a != modwant.a)) {                          \
-                        fprintf(stderr, "%6s 0x%016lx 0x%016lx\n",      \
-                            opspec, op1.input, op2.input);              \
-                        fprintf(stderr, "FAILED:\n");                   \
-                        fprintf(stderr,                                 \
-                            "div:\twanted 0x%16lx, got 0x%16lx\n",      \
-                            divwant.a, divres.a);                       \
-                        fprintf(stderr,                                 \
-                            "mod:\twanted 0x%16lx, got 0x%16lx\n",      \
-                            modwant.a, modres.a);                       \
-                                                                        \
-                        exit(1);                                        \
-                }                                                       \
-        }
-
-#include "cases.c"
-
-#undef TRY_IT
-
-                default:
-                        fprintf(stderr,
-                            "INTERNAL ERROR: unknown encoding %x\n", encoded);
-                        exit(1);
-                }
-        }
-}
-
-void
-usage()
-{
-
-        fprintf(stderr, "usage: divremtest [-v] [testfile ...]\n");
-        exit(1);
-}
diff --git a/src/regress/lib/libc/arch/alpha/divremtest/mkcases.c b/src/regress/lib/libc/arch/alpha/divremtest/mkcases.c
deleted file mode 100644
index fcb4765b8c..0000000000
--- a/src/regress/lib/libc/arch/alpha/divremtest/mkcases.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*      $OpenBSD: mkcases.c,v 1.2 2001/01/29 02:05:39 niklas Exp $      */
-/*      $NetBSD: mkcases.c,v 1.1 1995/04/24 05:53:36 cgd Exp $  */
-
-/*
- * Copyright (c) 1995 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *      for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-char *tab[4] = { "u_int", "int", "u_long", "long" };
-
-int
-main()
-{
-        int i;
-
-        for (i = 0; i < 64; i++) {
-                printf(
-"               case 0x%d%d%d%d%d%d:    /* %s <= %s op %s */\n",
-                        (i >> 5) & 1,
-                        (i >> 4) & 1,
-                        (i >> 3) & 1,
-                        (i >> 2) & 1,
-                        (i >> 1) & 1,
-                        (i >> 0) & 1,
-                        tab[(i >> 4) & 0x3],
-                        tab[(i >> 2) & 0x3],
-                        tab[(i >> 0) & 0x3]);
-                printf(
-"                       TRY_IT(op_%s, op_%s, op_%s);\n",
-                        tab[(i >> 4) & 0x3],
-                        tab[(i >> 2) & 0x3],
-                        tab[(i >> 0) & 0x3]);
-                printf(
-"                       break;\n\n");
-        }
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/arch/alpha/divremtest/mktestcases.c b/src/regress/lib/libc/arch/alpha/divremtest/mktestcases.c
deleted file mode 100644
index 3b01653f32..0000000000
--- a/src/regress/lib/libc/arch/alpha/divremtest/mktestcases.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*      $OpenBSD: mktestcases.c,v 1.2 2001/01/29 02:05:40 niklas Exp $  */
-/*      $NetBSD: mktestcases.c,v 1.1 1995/04/24 05:53:37 cgd Exp $      */
-
-/*
- * Copyright (c) 1995 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *      for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-
-int
-main()
-{
-        int i, j;
-        unsigned long n1, n2;
-
-        srandom(time(NULL));
-
-        for (i = 1; /* i < 10240 */ 1; i++) {
-                n1 = (unsigned)
-                    (random() & ((random() & random()) | 0x80000000));
-                n1 <<= 32;
-                n1 |= (unsigned)(random() & random() & random());
-
-                n2 = (unsigned)
-                    (random() & ((random() & random()) | 0x80000000));
-                n2 <<= 32;
-                n2 |= (unsigned)(random() & random() & random());
-
-                for (j = 0; j < 64; j++) {
-                        char *tab[] = { ".i", ".l", "-i", "-l" };
-
-                        printf("%s%s%s 0x%lx 0x%lx 0 0\n",
-                            tab[(j >> 4) & 0x3],
-                            tab[(j >> 2) & 0x3],
-                            tab[(j >> 0) & 0x3],
-                            n1, n2);
-                }
-        }
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/asr/Makefile b/src/regress/lib/libc/asr/Makefile
deleted file mode 100644
index 12e59536e0..0000000000
--- a/src/regress/lib/libc/asr/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2017/03/10 17:23:48 eric Exp $
-
-#
-# Notes on building and running the regression tests
-#
-# The regress suite builds two sets of static executables: the former linked
-# against the system libc, and the latter against the libc found in /usr/obj
-# The idea is to compare the output of all programs with internal changes in
-# the libc (more specifically the resolver).  They will be run in a chrooted
-# environment to test various /etc configurations without touching the local
-# machine config files.
-#
-# First, build a libc that needs testing, then:
-#
-# $ make
-# $ doas make install
-# $ doas make regress
-#
-# Tests output goes into a $REGRESSDIR/tmp.XXXXXXXXXX directory, and a digest
-# is displayed at the end.
-#
-
-REGRESSDIR?=    /tmp/regress-asr
-REGRESS?=       regress.sh
-
-A?=     .a
-B?=     .b
-
-DIRA?=  /usr/lib
-DIRB?=  /usr/obj/lib/libc
-
-
-all: build
-
-build:
-        cd bin && EXT=${A} LDFLAGS=-L${DIRA} make
-        cd bin && EXT=${B} LDFLAGS=-L${DIRB} make
-
-clean:
-        cd bin && EXT=${A} make clean
-        cd bin && EXT=${B} make clean
-
-install:
-        mkdir -p ${REGRESSDIR}/bin
-        cd bin && BINDIR=${REGRESSDIR}/bin EXT=${A} make install
-        cd bin && BINDIR=${REGRESSDIR}/bin EXT=${B} make install
-
-uninstall:
-        rm -rf ${REGRESSDIR}
-
-regress:
-        RUNDIR=${REGRESSDIR} A=${A} B=${B} sh ${.CURDIR}/${REGRESS}
diff --git a/src/regress/lib/libc/asr/bin/Makefile b/src/regress/lib/libc/asr/bin/Makefile
deleted file mode 100644
index 1f986a8e69..0000000000
--- a/src/regress/lib/libc/asr/bin/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIR=         res_mkquery
-SUBDIR+=        res_query
-SUBDIR+=        gethostnamadr
-SUBDIR+=        getnetnamadr
-SUBDIR+=        getrrsetbyname
-SUBDIR+=        getnameinfo
-SUBDIR+=        getaddrinfo
-SUBDIR+=        threads
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/asr/bin/Makefile.inc b/src/regress/lib/libc/asr/bin/Makefile.inc
deleted file mode 100644
index 80b4805136..0000000000
--- a/src/regress/lib/libc/asr/bin/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile.inc,v 1.2 2012/09/05 21:21:13 eric Exp $
-
-NOMAN=  noman
-
-SRCS+=          common.c
-CFLAGS+=        -Wall -Wstrict-prototypes -Werror -Wundef -g
-LDSTATIC=       ${STATIC}
-PROG:=          ${PROG}${EXT}
diff --git a/src/regress/lib/libc/asr/bin/common.c b/src/regress/lib/libc/asr/bin/common.c
deleted file mode 100644
index c808c86d61..0000000000
--- a/src/regress/lib/libc/asr/bin/common.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/*      $OpenBSD: common.c,v 1.3 2014/08/10 07:31:58 guenther Exp $     */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <err.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "common.h"
-
-int long_err;
-int gai_errno;
-int rrset_errno;
-
-
-char *
-gethostarg(char *n)
-{
-        if (n == NULL)
-                return (n);
-        if (!strcmp(n, "NULL"))
-                return (NULL);
-        if (!strcmp(n, "EMPTY"))
-                return ("");
-        return (n);
-}
-
-const char *rrsetstrerror(int);
-char * print_addr(const struct sockaddr *, char *, size_t);
-
-struct kv { int code; const char *name; };
-
-struct kv kv_family[] = {
-        { AF_UNIX,      "unix" },
-        { AF_INET,      "inet" },
-        { AF_INET6,     "inet6" },
-        { 0,    NULL, }
-};
-struct kv kv_socktype[] = {
-        { SOCK_STREAM,          "stream" },
-        { SOCK_DGRAM,           "dgram" },
-        { SOCK_RAW,             "raw" },
-        { SOCK_SEQPACKET,       "seqpacket" },
-        { 0,    NULL, }
-};
-struct kv kv_protocol[] = {
-        { IPPROTO_UDP, "udp" },
-        { IPPROTO_TCP, "tcp" },
-        { IPPROTO_ICMP, "icmp" },
-        { IPPROTO_ICMPV6, "icmpv6" },
-        { 0,    NULL, }
-};
-
-static const char *
-kv_lookup_name(struct kv *kv, int code, char *buf, size_t sz)
-{
-        while (kv->name) {
-                if (kv->code == code)
-                        return (kv->name);
-                kv++;
-        }
-        snprintf(buf, sz, "%i", code);
-        return (buf);
-}
-
-struct keyval {
-        const char      *key;
-        uint16_t         value;   
-};
-
-static struct keyval kv_class[] = {
-        { "IN", C_IN },
-        { "CHAOS", C_CHAOS },
-        { "HS", C_HS },
-        { "ANY", C_ANY },
-        { NULL,         0 },
-};
-
-static struct keyval kv_type[] = {
-        { "A",          T_A     },
-        { "NS",         T_NS    },
-        { "MD",         T_MD    },
-        { "MF",         T_MF    },
-        { "CNAME",      T_CNAME },
-        { "SOA",        T_SOA   },
-        { "MB",         T_MB    },
-        { "MG",         T_MG    },
-        { "MR",         T_MR    },
-        { "NULL",       T_NULL  },
-        { "WKS",        T_WKS   },
-        { "PTR",        T_PTR   },
-        { "HINFO",      T_HINFO },
-        { "MINFO",      T_MINFO },
-        { "MX",         T_MX    },
-        { "TXT",        T_TXT   },
-
-        { "AAAA",       T_AAAA  },
-
-        { "AXFR",       T_AXFR  },
-        { "MAILB",      T_MAILB },
-        { "MAILA",      T_MAILA },
-        { "ANY",        T_ANY   },
-        { NULL,         0 },
-};
-
-static struct keyval kv_rcode[] = {
-        { "NOERROR",    NOERROR },
-        { "FORMERR",    FORMERR },
-        { "SERVFAIL",   SERVFAIL },
-        { "NXDOMAIN",   NXDOMAIN },
-        { "NOTIMP",     NOTIMP },
-        { "REFUSED",    REFUSED },
-        { NULL,         0 },
-};
-
-
-const char *
-rcodetostr(uint16_t v)
-{
-        static char     buf[16];
-        size_t          i;
-
-        for(i = 0; kv_rcode[i].key; i++)
-                if (kv_rcode[i].value == v)
-                        return (kv_rcode[i].key);
-
-        snprintf(buf, sizeof buf, "%"PRIu16"?", v);
-
-        return (buf);
-}
-
-const char *
-typetostr(uint16_t v)
-{
-        static char      buf[16];
-        size_t           i;
-
-        for(i = 0; kv_type[i].key; i++)
-                if (kv_type[i].value == v)
-                        return (kv_type[i].key);
-
-        snprintf(buf, sizeof buf, "%"PRIu16"?", v);
-
-        return (buf);
-}
-
-const char *
-classtostr(uint16_t v)
-{
-        static char      buf[16];
-        size_t           i;
-
-        for(i = 0; kv_class[i].key; i++)
-                if (kv_class[i].value == v)
-                        return (kv_class[i].key);
-
-        snprintf(buf, sizeof buf, "%"PRIu16"?", v);
-
-        return (buf);
-}
-
-uint16_t
-strtotype(const char *name)
-{
-        size_t  i;
-
-        for(i = 0; kv_type[i].key; i++)
-                if (!strcmp(kv_type[i].key, name))
-                        return (kv_type[i].value);
-
-        return (0);
-}
-
-uint16_t
-strtoclass(const char *name)
-{
-        size_t  i;
-
-        for(i = 0; kv_class[i].key; i++)
-                if (!strcmp(kv_class[i].key, name))
-                        return (kv_class[i].value);
-
-        return (0);
-}
-
-void
-print_hostent(struct hostent *e)
-{
-        char    buf[256], **c;
-
-        printf("name = \"%s\"\n", e->h_name);
-        printf("aliases =");
-        for(c = e->h_aliases; *c; c++)
-                printf(" \"%s\"", *c);
-        printf("\n");
-        printf("addrtype = %i\n", e->h_addrtype);
-        printf("addrlength = %i\n", e->h_length);
-        printf("addr_list =");
-        for(c = e->h_addr_list; *c; c++) {
-                printf(" %s", inet_ntop(e->h_addrtype, *c, buf, sizeof buf));
-        }
-        printf("\n");
-}
-
-void
-print_netent(struct netent *e)
-{
-        char    buf[256], **c;
-        uint32_t addr;
-
-        /* network number are given in host order */
-        addr = htonl(e->n_net);
-
-        printf("name = \"%s\"\n", e->n_name);
-        printf("aliases =");
-        for (c = e->n_aliases; *c; c++)
-                printf(" \"%s\"", *c);
-        printf("\n");
-        printf("addrtype = %i\n", e->n_addrtype);
-        printf("net = %s\n", inet_ntop(e->n_addrtype, &addr, buf, sizeof buf));
-}
-
-void
-print_addrinfo(struct addrinfo *ai)
-{
-        char    buf[256], bf[64], bt[64], bp[64];
-
-        printf("family=%s socktype=%s protocol=%s addr=%s canonname=%s\n",
-                kv_lookup_name(kv_family, ai->ai_family, bf, sizeof bf),
-                kv_lookup_name(kv_socktype, ai->ai_socktype, bt, sizeof bt),
-                kv_lookup_name(kv_protocol, ai->ai_protocol, bp, sizeof bp),
-                print_addr(ai->ai_addr, buf, sizeof buf),
-                ai->ai_canonname);
-}
-
-const char *
-rrsetstrerror(int e)
-{
-        switch (e) {
-        case 0:
-                return "OK";
-        case ERRSET_NONAME:
-                return "ERRSET_NONAME";
-        case ERRSET_NODATA:
-                return "ERRSET_NODATA";
-        case ERRSET_NOMEMORY:
-                return "ERRSET_NOMEMORY";
-        case ERRSET_INVAL:
-                return "ERRSET_INVAL";
-        case ERRSET_FAIL:
-                return "ERRSET_FAIL";
-        default:
-                return "???";
-        }
-}
-
-void
-print_rrsetinfo(struct rrsetinfo * rrset)
-{
-        printf("rri_flags=%u\n", rrset->rri_flags);
-        printf("rri_rdclass=%u\n", rrset->rri_rdclass);
-        printf("rri_rdtype=%u\n", rrset->rri_rdtype);
-        printf("rri_ttl=%u\n", rrset->rri_ttl);
-        printf("rri_nrdatas=%u\n", rrset->rri_nrdatas);
-        printf("rri_nsigs=%u\n", rrset->rri_nsigs);
-        printf("rri_name=\"%s\"\n", rrset->rri_name);
-}
-
-void
-print_errors(void)
-{
-        switch (long_err) {
-        case 0:
-                return;
-        case 1:
-                printf("  => errno %i, h_errno %i", errno, h_errno);
-                printf(", rrset_errno %i", rrset_errno);
-                printf(", gai_errno %i", gai_errno);
-                printf ("\n");
-                return;
-        default:
-                printf("  => errno %i: %s\n  => h_errno %i: %s\n  => rrset_errno %i: %s\n",
-                    errno, errno ? strerror(errno) : "ok",
-                    h_errno, h_errno ? hstrerror(h_errno) : "ok",
-                    rrset_errno, rrset_errno ? rrsetstrerror(rrset_errno) : "ok");
-                printf("  => gai_errno %i: %s\n",
-                    gai_errno, gai_errno ? gai_strerror(gai_errno) : "ok");
-        }
-}
-
-
-static char *
-print_host(const struct sockaddr *sa, char *buf, size_t len)
-{
-        switch (sa->sa_family) {
-        case AF_INET:
-                inet_ntop(AF_INET, &((struct sockaddr_in*)sa)->sin_addr,
-                          buf, len);
-                break;
-        case AF_INET6:
-                inet_ntop(AF_INET6, &((struct sockaddr_in6*)sa)->sin6_addr,
-                          buf, len);
-                break;
-        default:
-                buf[0] = '\0';
-        }
-        return (buf);
-}
-
-
-char *
-print_addr(const struct sockaddr *sa, char *buf, size_t len)
-{
-        char    h[256];
-
-        print_host(sa, h, sizeof h);
-
-        switch (sa->sa_family) {
-        case AF_INET:
-                snprintf(buf, len, "%s:%i", h,
-                    ntohs(((struct sockaddr_in*)(sa))->sin_port));
-                break;
-        case AF_INET6:
-                snprintf(buf, len, "[%s]:%i", h,
-                    ntohs(((struct sockaddr_in6*)(sa))->sin6_port));
-                break;
-        default:
-                snprintf(buf, len, "?");
-                break;
-        }
-
-        return (buf);
-}
-
-void
-packed_init(struct packed *pack, char *data, size_t len)
-{
-        pack->data = data;
-        pack->len = len;
-        pack->offset = 0;
-        pack->err = NULL;
-}
-
-
-static ssize_t
-dname_expand(const unsigned char *data, size_t len, size_t offset,
-    size_t *newoffset, char *dst, size_t max)
-{
-        size_t           n, count, end, ptr, start;
-        ssize_t          res;
-
-        if (offset >= len)
-                return (-1);
-
-        res = 0;
-        end = start = offset;
-
-        for(; (n = data[offset]); ) {
-                if ((n & 0xc0) == 0xc0) {
-                        if (offset + 2 > len)
-                                return (-1);
-                        ptr = 256 * (n & ~0xc0) + data[offset + 1];
-                        if (ptr >= start)
-                                return (-1);
-                        if (end < offset + 2)
-                                end = offset + 2;
-                        offset = ptr;
-                        continue;
-                }
-                if (offset + n + 1 > len)
-                        return (-1);
-
-
-                /* copy n + at offset+1 */
-                if (dst != NULL && max != 0) {
-                        count = (max < n + 1) ? (max) : (n + 1);
-                        memmove(dst, data + offset, count);
-                        dst += count;
-                        max -= count;
-                }
-                res += n + 1;
-                offset += n + 1;
-                if (end < offset)
-                        end = offset;
-        }
-        if (end < offset + 1)
-                end = offset + 1;
-
-        if (dst != NULL && max != 0)
-                dst[0] = 0;
-        if (newoffset)
-                *newoffset = end;
-        return (res + 1);
-}
-
-static int
-unpack_data(struct packed *p, void *data, size_t len)
-{
-        if (p->err)
-                return (-1);
-
-        if (p->len - p->offset < len) {
-                p->err = "too short";
-                return (-1);
-        }
-
-        memmove(data, p->data + p->offset, len);
-        p->offset += len;
-
-        return (0);
-}
-
-static int
-unpack_u16(struct packed *p, uint16_t *u16)
-{
-        if (unpack_data(p, u16, 2) == -1)
-                return (-1);
-
-        *u16 = ntohs(*u16);
-
-        return (0);
-}
-
-static int
-unpack_u32(struct packed *p, uint32_t *u32)
-{
-        if (unpack_data(p, u32, 4) == -1)
-                return (-1);
-
-        *u32 = ntohl(*u32);
-
-        return (0);
-}
-
-static int
-unpack_inaddr(struct packed *p, struct in_addr *a)
-{
-        return (unpack_data(p, a, 4));
-}
-
-static int
-unpack_in6addr(struct packed *p, struct in6_addr *a6)
-{
-        return (unpack_data(p, a6, 16));
-}
-
-static int
-unpack_dname(struct packed *p, char *dst, size_t max)
-{
-        ssize_t e;
-
-        if (p->err)
-                return (-1);
-
-        e = dname_expand(p->data, p->len, p->offset, &p->offset, dst, max);
-        if (e == -1) {
-                p->err = "bad domain name";
-                return (-1);
-        }
-        if (e < 0 || e > MAXDNAME) {
-                p->err = "domain name too long";
-                return (-1);
-        }
-
-        return (0);
-}
-
-int
-unpack_header(struct packed *p, struct header *h)
-{
-        if (unpack_data(p, h, HFIXEDSZ) == -1)
-                return (-1);
-
-        h->flags = ntohs(h->flags);
-        h->qdcount = ntohs(h->qdcount);
-        h->ancount = ntohs(h->ancount);
-        h->nscount = ntohs(h->nscount);
-        h->arcount = ntohs(h->arcount);
-
-        return (0);
-}
-
-int
-unpack_query(struct packed *p, struct query *q)
-{
-        unpack_dname(p, q->q_dname, sizeof(q->q_dname));
-        unpack_u16(p, &q->q_type);
-        unpack_u16(p, &q->q_class);
-
-        return (p->err) ? (-1) : (0);
-}
-
-int
-unpack_rr(struct packed *p, struct rr *rr)
-{
-        uint16_t        rdlen;
-        size_t          save_offset;
-
-        unpack_dname(p, rr->rr_dname, sizeof(rr->rr_dname));
-        unpack_u16(p, &rr->rr_type);
-        unpack_u16(p, &rr->rr_class);
-        unpack_u32(p, &rr->rr_ttl);
-        unpack_u16(p, &rdlen);
-
-        if (p->err)
-                return (-1);
-
-        if (p->len - p->offset < rdlen) {
-                p->err = "too short";
-                return (-1);
-        }
-
-        save_offset = p->offset;
-
-        switch(rr->rr_type) {
-
-        case T_CNAME:
-                unpack_dname(p, rr->rr.cname.cname, sizeof(rr->rr.cname.cname));
-                break;
-
-        case T_MX:
-                unpack_u16(p, &rr->rr.mx.preference);
-                unpack_dname(p, rr->rr.mx.exchange, sizeof(rr->rr.mx.exchange));
-                break;
-
-        case T_NS:
-                unpack_dname(p, rr->rr.ns.nsname, sizeof(rr->rr.ns.nsname));
-                break;
-
-        case T_PTR:
-                unpack_dname(p, rr->rr.ptr.ptrname, sizeof(rr->rr.ptr.ptrname));
-                break;
-
-        case T_SOA:
-                unpack_dname(p, rr->rr.soa.mname, sizeof(rr->rr.soa.mname));
-                unpack_dname(p, rr->rr.soa.rname, sizeof(rr->rr.soa.rname));
-                unpack_u32(p, &rr->rr.soa.serial);
-                unpack_u32(p, &rr->rr.soa.refresh);
-                unpack_u32(p, &rr->rr.soa.retry);
-                unpack_u32(p, &rr->rr.soa.expire);
-                unpack_u32(p, &rr->rr.soa.minimum);
-                break;
-
-        case T_A:
-                if (rr->rr_class != C_IN)
-                        goto other;
-                unpack_inaddr(p, &rr->rr.in_a.addr);
-                break;
-
-        case T_AAAA:
-                if (rr->rr_class != C_IN)
-                        goto other;
-                unpack_in6addr(p, &rr->rr.in_aaaa.addr6);
-                break;
-        default:
-        other:
-                rr->rr.other.rdata = p->data + p->offset;
-                rr->rr.other.rdlen = rdlen;
-                p->offset += rdlen;
-        }
-
-        if (p->err)
-                return (-1);
-
-        /* make sure that the advertised rdlen is really ok */
-        if (p->offset - save_offset != rdlen)
-                p->err = "bad dlen";
-
-        return (p->err) ? (-1) : (0);
-}
-
-int
-sockaddr_from_str(struct sockaddr *sa, int family, const char *str)
-{
-        struct in_addr           ina;
-        struct in6_addr          in6a;
-        struct sockaddr_in      *sin;
-        struct sockaddr_in6     *sin6;
-
-        switch (family) {
-        case PF_UNSPEC:
-                if (sockaddr_from_str(sa, PF_INET, str) == 0)
-                        return (0);
-                return sockaddr_from_str(sa, PF_INET6, str);
-
-        case PF_INET:
-                if (inet_pton(PF_INET, str, &ina) != 1)
-                        return (-1);
-
-                sin = (struct sockaddr_in *)sa;
-                memset(sin, 0, sizeof *sin);
-                sin->sin_len = sizeof(struct sockaddr_in);
-                sin->sin_family = PF_INET;
-                sin->sin_addr.s_addr = ina.s_addr;
-                return (0);
-
-        case PF_INET6:
-                if (inet_pton(PF_INET6, str, &in6a) != 1)
-                        return (-1);
-
-                sin6 = (struct sockaddr_in6 *)sa;
-                memset(sin6, 0, sizeof *sin6);
-                sin6->sin6_len = sizeof(struct sockaddr_in6);
-                sin6->sin6_family = PF_INET6;
-                sin6->sin6_addr = in6a;
-                return (0);
-
-        default:
-                break;
-        }
-
-        return (-1);
-}
diff --git a/src/regress/lib/libc/asr/bin/common.h b/src/regress/lib/libc/asr/bin/common.h
deleted file mode 100644
index 87df4ae4a2..0000000000
--- a/src/regress/lib/libc/asr/bin/common.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*      $OpenBSD: common.h,v 1.1.1.1 2012/07/13 17:49:53 eric Exp $     */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <arpa/nameser.h>
-
-#include <netinet/in.h>
-
-#include <netdb.h>
-
-
-#define unpack_rr               __unpack_rr
-#define unpack_header           __unpack_header
-#define packed_init             __packed_init
-#define unpack_query            __unpack_query
-#define sockaddr_from_str       __sockaddr_from_str
-#define print_addr              __print_addr
-
-extern int long_err;
-extern int gai_errno;
-extern int rrset_errno;
-
-const char *classtostr(uint16_t);
-const char *typetostr(uint16_t);
-const char *rcodetostr(uint16_t);
-
-uint16_t strtotype(const char*);
-uint16_t strtoclass(const char*);
-
-void    print_rrsetinfo(struct rrsetinfo *);
-void    print_addrinfo(struct addrinfo *);
-void    print_errors(void);
-void    print_hostent(struct hostent *);
-void    print_netent(struct netent *);
-
-int     sockaddr_from_str(struct sockaddr *, int, const char *);
-int     addr_from_str(char *, int *, int *, const char *);
-char*   gethostarg(char *);
-
-#define QR_MASK         (0x1 << 15)
-#define OPCODE_MASK     (0xf << 11)
-#define AA_MASK         (0x1 << 10)
-#define TC_MASK         (0x1 <<  9)
-#define RD_MASK         (0x1 <<  8)
-#define RA_MASK         (0x1 <<  7)
-#define Z_MASK          (0x7 <<  4)
-#define RCODE_MASK      (0xf)
-
-#define OPCODE(v)       ((v) & OPCODE_MASK)
-#define RCODE(v)        ((v) & RCODE_MASK)
-
-
-struct packed {
-        char            *data;
-        size_t           len;
-        size_t           offset;
-        const char      *err;
-};
-
-struct header {
-        uint16_t        id;
-        uint16_t        flags;
-        uint16_t        qdcount;
-        uint16_t        ancount;
-        uint16_t        nscount;
-        uint16_t        arcount;
-};
-
-struct query {
-        char            q_dname[MAXDNAME];
-        uint16_t        q_type;
-        uint16_t        q_class;
-};
-
-struct rr {
-        char            rr_dname[MAXDNAME];
-        uint16_t        rr_type;
-        uint16_t        rr_class;
-        uint32_t        rr_ttl;
-        union {
-                struct {
-                        char    cname[MAXDNAME];
-                } cname;
-                struct {
-                        uint16_t        preference;
-                        char            exchange[MAXDNAME];
-                } mx;
-                struct {
-                        char    nsname[MAXDNAME];
-                } ns;
-                struct {
-                        char    ptrname[MAXDNAME];
-                } ptr;
-                struct {
-                        char            mname[MAXDNAME];
-                        char            rname[MAXDNAME];
-                        uint32_t        serial;
-                        uint32_t        refresh;
-                        uint32_t        retry;
-                        uint32_t        expire;
-                        uint32_t        minimum;
-                } soa;
-                struct {
-                        struct in_addr  addr;
-                } in_a;
-                struct {
-                        struct in6_addr addr6;
-                } in_aaaa;
-                struct {
-                        uint16_t         rdlen;
-                        const void      *rdata;
-                } other;
-        } rr;
-};
-
-void    packed_init(struct packed*, char*, size_t);
-int     pack_header(struct packed*, const struct header*);
-int     pack_query(struct packed*, uint16_t, uint16_t, const char*);
-int     unpack_header(struct packed*, struct header*);
-int     unpack_query(struct packed*, struct query*);
-int     unpack_rr(struct packed*, struct rr*);
diff --git a/src/regress/lib/libc/asr/bin/getaddrinfo.c b/src/regress/lib/libc/asr/bin/getaddrinfo.c
deleted file mode 100644
index 7b8674aea9..0000000000
--- a/src/regress/lib/libc/asr/bin/getaddrinfo.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*      $OpenBSD: getaddrinfo.c,v 1.2 2013/03/28 09:36:03 eric Exp $    */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "common.h"
-
-static void
-usage(void)
-{
-        extern const char * __progname;
-
-        fprintf(stderr, "usage: %s [-CHSPe] [-f family] [-p proto] "
-                "[-s servname]\n        [-t socktype] <host...>\n", __progname);
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        struct addrinfo         *ai, *res, hints;
-        char                    *servname = NULL, *host;
-        int                      i, ch;
-
-        memset(&hints, 0, sizeof hints);
-
-        while((ch = getopt(argc, argv, "CFHPSef:p:s:t:")) !=  -1) {
-                switch(ch) {
-                case 'C':
-                        hints.ai_flags |= AI_CANONNAME;
-                        break;
-                case 'F':
-                        hints.ai_flags |= AI_FQDN;
-                        break;
-                case 'H':
-                        hints.ai_flags |= AI_NUMERICHOST;
-                        break;
-                case 'P':
-                        hints.ai_flags |= AI_PASSIVE;
-                        break;
-                case 'S':
-                        hints.ai_flags |= AI_NUMERICSERV;
-                        break;
-                case 'e':
-                        long_err += 1;
-                        break;
-                case 'f':
-                        if (!strcmp(optarg, "inet"))
-                                hints.ai_family = AF_INET;
-                        else if (!strcmp(optarg, "inet6"))
-                                hints.ai_family = AF_INET6;
-                        else
-                                usage();
-                        break;
-                case 'p':
-                        if (!strcmp(optarg, "udp"))
-                                hints.ai_protocol = IPPROTO_UDP;
-                        else if (!strcmp(optarg, "tcp"))
-                                hints.ai_protocol = IPPROTO_TCP;
-                        else if (!strcmp(optarg, "icmp"))
-                                hints.ai_protocol = IPPROTO_ICMP;
-                        else if (!strcmp(optarg, "icmpv6"))
-                                hints.ai_protocol = IPPROTO_ICMPV6;
-                        else
-                                usage();
-                        break;
-                case 's':
-                        servname = optarg;
-                        break;
-                case 't':
-                        if (!strcmp(optarg, "stream"))
-                                hints.ai_socktype = SOCK_STREAM;
-                        else if (!strcmp(optarg, "dgram"))
-                                hints.ai_socktype = SOCK_DGRAM;
-                        else if (!strcmp(optarg, "raw"))
-                                hints.ai_socktype = SOCK_RAW;
-                        else
-                                usage();
-                        break;
-                default:
-                        usage();
-                        /* NOTREACHED */
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        for(i = 0; i < argc; i++) {
-
-                if (i)
-                        printf("\n");
-                printf("===> \"%s\"\n", argv[i]);
-                host = gethostarg(argv[i]);
-
-                errno = 0;
-                h_errno = 0;
-                gai_errno = 0;
-                rrset_errno = 0;
-
-                gai_errno = getaddrinfo(host, servname, &hints, &ai);
-
-                print_errors();
-                if (gai_errno == 0) {
-                        for (res = ai; res; res = res->ai_next)
-                                print_addrinfo(res);
-                        freeaddrinfo(ai);
-                }
-        }
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/asr/bin/getaddrinfo/Makefile b/src/regress/lib/libc/asr/bin/getaddrinfo/Makefile
deleted file mode 100644
index ec2f104ec7..0000000000
--- a/src/regress/lib/libc/asr/bin/getaddrinfo/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $
-
-.PATH:  ${.CURDIR}/..
-
-PROG=   getaddrinfo
-SRCS+=  getaddrinfo.c
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/asr/bin/gethostnamadr.c b/src/regress/lib/libc/asr/bin/gethostnamadr.c
deleted file mode 100644
index b1b3e331a7..0000000000
--- a/src/regress/lib/libc/asr/bin/gethostnamadr.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*      $OpenBSD: gethostnamadr.c,v 1.2 2012/07/29 19:51:36 eric Exp $  */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "common.h"
-
-static void
-usage(void)
-{
-        extern const char * __progname;
-
-        fprintf(stderr, "usage: %s [-46e] <host...>\n", __progname);
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        int                      i, ch, aflag, family = AF_INET;
-        struct hostent          *h;
-        char                    *host;
-        char                     addr[16];
-        int                      addrlen;
-
-        aflag = 0;
-        while((ch = getopt(argc, argv, "46ae")) !=  -1) {
-                switch(ch) {
-                case '4':
-                        family = AF_INET;
-                        break;
-                case '6':
-                        family = AF_INET6;
-                        break;
-                case 'a':
-                        aflag = 1;
-                        break;
-                case 'e':
-                        long_err += 1;
-                        break;
-                default:
-                        usage();
-                        /* NOTREACHED */
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        for(i = 0; i < argc; i++) {
-
-                if (i)
-                        printf("\n");
-                printf("===> \"%s\"\n", argv[i]);
-                host = gethostarg(argv[i]);
-
-                if (aflag && addr_from_str(addr, &family, &addrlen, host) == -1)
-                        errx(1, "bad address");
-
-                errno = 0;
-                h_errno = 0;
-                gai_errno = 0;
-                rrset_errno = 0;
-
-                if (aflag == 0)
-                        h = gethostbyname2(host, family);
-                else
-                        h = gethostbyaddr(addr, addrlen, family);
-                if (h)
-                        print_hostent(h);
-                print_errors();
-        }
-
-        return (0);
-}
-
-int
-addr_from_str(char *addr, int *family, int *len, const char *src)
-{
-        if (inet_pton(AF_INET6, src, addr) == 1) {
-                *family = AF_INET6;
-                *len = 16;
-                return (0);
-        }
-        if (inet_pton(AF_INET, src, addr) == 1) {
-                *family = AF_INET;
-                *len = 4;
-                return (0);
-        }
-        return (-1);
-}
diff --git a/src/regress/lib/libc/asr/bin/gethostnamadr/Makefile b/src/regress/lib/libc/asr/bin/gethostnamadr/Makefile
deleted file mode 100644
index 84906ffbbd..0000000000
--- a/src/regress/lib/libc/asr/bin/gethostnamadr/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $
-
-.PATH:  ${.CURDIR}/..
-
-PROG=   gethostnamadr
-SRCS+=  gethostnamadr.c
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/asr/bin/getnameinfo.c b/src/regress/lib/libc/asr/bin/getnameinfo.c
deleted file mode 100644
index 8702937a47..0000000000
--- a/src/regress/lib/libc/asr/bin/getnameinfo.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*      $OpenBSD: getnameinfo.c,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $        */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "common.h"
-
-static void
-usage(void)
-{
-        extern const char * __progname;
-
-        fprintf(stderr, "usage: %s [-DFHNSe] [-p portno] <addr...>\n", __progname);
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        char                     serv[1024];
-        char                     host[1024];
-        const char               *e;
-        int                      i, ch, flags = 0, port = 0;
-        struct sockaddr_storage  ss;
-        struct sockaddr         *sa;
-
-        sa = (struct sockaddr*)&ss;
-
-        while((ch = getopt(argc, argv, "DFHNSaep:")) !=  -1) {
-                switch(ch) {
-                case 'D':
-                        flags |= NI_DGRAM;
-                        break;
-                case 'F':
-                        flags |= NI_NOFQDN;
-                        break;
-                case 'H':
-                        flags |= NI_NUMERICHOST;
-                        break;
-                case 'N':
-                        flags |= NI_NAMEREQD;
-                        break;
-                case 'S':
-                        flags |= NI_NUMERICSERV;
-                        break;
-                case 'e':
-                        long_err += 1;
-                        break;
-                case 'p':
-                        port = strtonum(optarg, 0, 65535, &e);
-                        if (e)
-                                usage();
-                        break;
-                default:
-                        usage();
-                        /* NOTREACHED */
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        for(i = 0; i < argc; i++) {
-
-                if (i)
-                        printf("\n");
-                printf("===> \"%s\"\n", argv[i]);
-
-                if (sockaddr_from_str(sa, AF_UNSPEC, argv[i]) == -1) {
-                        printf("   => invalid address\n");
-                        continue;
-                }
-
-                if (sa->sa_family == PF_INET)
-                        ((struct sockaddr_in *)sa)->sin_port = htons(port);
-                else if (sa->sa_family == PF_INET6)
-                        ((struct sockaddr_in6 *)sa)->sin6_port = htons(port);
-
-                errno = 0;
-                h_errno = 0;
-                gai_errno = 0;
-                rrset_errno = 0;
-
-                gai_errno = getnameinfo(sa, sa->sa_len, host, sizeof host, serv,
-                    sizeof serv, flags);
-
-                if (gai_errno == 0)
-                        printf("   %s:%s\n", host, serv);
-                print_errors();
-
-        }
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/asr/bin/getnameinfo/Makefile b/src/regress/lib/libc/asr/bin/getnameinfo/Makefile
deleted file mode 100644
index 4927ee9486..0000000000
--- a/src/regress/lib/libc/asr/bin/getnameinfo/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $
-
-.PATH:  ${.CURDIR}/..
-
-PROG=   getnameinfo
-SRCS+=  getnameinfo.c
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/asr/bin/getnetnamadr.c b/src/regress/lib/libc/asr/bin/getnetnamadr.c
deleted file mode 100644
index 4b7414264b..0000000000
--- a/src/regress/lib/libc/asr/bin/getnetnamadr.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*      $OpenBSD: getnetnamadr.c,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $       */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "common.h"
-
-static void
-usage(void)
-{
-        extern const char * __progname;
-
-        fprintf(stderr, "usage: %s [-aen] [host...]\n", __progname);
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        int                      i, ch, nflag = 0;
-        struct netent           *n;
-        char                    *host;
-
-        while((ch = getopt(argc, argv, "en")) !=  -1) {
-                switch(ch) {
-                case 'e':
-                        long_err += 1;
-                        break;
-                case 'n':
-                        nflag = 1;
-                        break;
-                default:
-                        usage();
-                        /* NOTREACHED */
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        for(i = 0; i < argc; i++) {
-
-                if (i)
-                        printf("\n");
-                printf("===> \"%s\"\n", argv[i]);
-                host = gethostarg(argv[i]);
-
-                errno = 0;
-                h_errno = 0;
-                gai_errno = 0;
-                rrset_errno = 0;
-
-                if (nflag)
-                        n = getnetbyname(host);
-                else
-                        n = getnetbyaddr(inet_network(host), AF_INET);
-                if (n)
-                        print_netent(n);
-                print_errors();
-        }
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/asr/bin/getnetnamadr/Makefile b/src/regress/lib/libc/asr/bin/getnetnamadr/Makefile
deleted file mode 100644
index 521bf8eb7e..0000000000
--- a/src/regress/lib/libc/asr/bin/getnetnamadr/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $
-
-.PATH:  ${.CURDIR}/..
-
-PROG=   getnetnamadr
-SRCS+=  getnetnamadr.c
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/asr/bin/getrrsetbyname.c b/src/regress/lib/libc/asr/bin/getrrsetbyname.c
deleted file mode 100644
index 4a5aa57209..0000000000
--- a/src/regress/lib/libc/asr/bin/getrrsetbyname.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*      $OpenBSD: getrrsetbyname.c,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $     */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "common.h"
-
-static void
-usage(void)
-{
-        extern const char * __progname;
-
-        fprintf(stderr, "usage: %s [-e] [-t type] [host...]\n",
-            __progname);
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        int                     ch, i;
-        uint16_t                type = T_A;
-        char                    *host;
-        struct rrsetinfo        *rrset;
-
-        while((ch = getopt(argc, argv, "et:")) !=  -1) {
-                switch(ch) {
-                case 'e':
-                        long_err += 1;
-                        break;
-                case 't':
-                        if ((type = strtotype(optarg)) == 0)
-                                usage();
-                        break;
-                default:
-                        usage();
-                        /* NOTREACHED */
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        for (i = 0; i < argc; i++) {
-
-                if (i)
-                        printf("\n");
-                printf("===> \"%s\"\n", argv[i]);
-                host = gethostarg(argv[i]);
-                
-                errno = 0;
-                h_errno = 0;
-                gai_errno = 0;
-                rrset_errno = 0;
-                
-                rrset_errno = getrrsetbyname(host, C_IN, type, 0, &rrset);
-
-                if (rrset_errno == 0)
-                        print_rrsetinfo(rrset);
-                print_errors();
-        }
-        
-        return (0);
-}
diff --git a/src/regress/lib/libc/asr/bin/getrrsetbyname/Makefile b/src/regress/lib/libc/asr/bin/getrrsetbyname/Makefile
deleted file mode 100644
index 131403bea1..0000000000
--- a/src/regress/lib/libc/asr/bin/getrrsetbyname/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $
-
-.PATH:  ${.CURDIR}/..
-
-PROG=   getrrsetbyname
-SRCS+=  getrrsetbyname.c
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/asr/bin/res_mkquery.c b/src/regress/lib/libc/asr/bin/res_mkquery.c
deleted file mode 100644
index a52023c5c0..0000000000
--- a/src/regress/lib/libc/asr/bin/res_mkquery.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*      $OpenBSD: res_mkquery.c,v 1.1.1.1 2012/07/13 17:49:53 eric Exp $        */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <inttypes.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "common.h"
-
-/* in asr.c but we don't want them exposed right now */
-static void dump_packet(const void *, size_t);
-
-static char *print_query(struct query *, char *, size_t);
-static char *print_rr(struct rr *, char *, size_t);
-static char *print_host(const struct sockaddr *, char *, size_t);
-static char* print_dname(const char *, char *, size_t);
-
-
-static void
-usage(void)
-{
-        extern const char * __progname;
-
-        fprintf(stderr, "usage: %s [-deq] [-t type] [host...]\n",
-            __progname);
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        int                      ch, i, r;
-        uint16_t                 type = T_A;
-        char                     buf[1024], *host;
-
-        while((ch = getopt(argc, argv, "et:")) !=  -1) {
-                switch(ch) {
-                case 'e':
-                        long_err += 1;
-                        break;
-                case 't':
-                        if ((type = strtotype(optarg)) == 0)
-                                usage();
-                        break;
-                default:
-                        usage();
-                        /* NOTREACHED */
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        for (i = 0; i < argc; i++) {
-
-                if (i)
-                        printf("\n");
-
-                printf("===> \"%s\"\n", argv[i]);
-                host = gethostarg(argv[i]);
-
-                errno = 0;
-                h_errno = 0;
-                gai_errno = 0;
-                rrset_errno = 0;
-
-                r = res_mkquery(QUERY, host, C_IN, type, NULL, 0, NULL, buf, sizeof(buf));
-                if (r != -1) {
-                        dump_packet(buf, r);
-                        printf(";; MSG SIZE %i\n", r);
-                }
-                print_errors();
-        }
-
-        return (0);
-}
-
-#define OPCODE_SHIFT    11
-#define Z_SHIFT         4
-
-static char*
-print_header(struct header *h, char *buf, size_t max)
-{
-        snprintf(buf, max,
-        "id:0x.... %s op:%i %s %s %s %s z:%i r:%s qd:%i an:%i ns:%i ar:%i",
-            (h->flags & QR_MASK) ? "QR":"  ",
-            (int)(OPCODE(h->flags) >> OPCODE_SHIFT),
-            (h->flags & AA_MASK) ? "AA":"  ",
-            (h->flags & TC_MASK) ? "TC":"  ",
-            (h->flags & RD_MASK) ? "RD":"  ",
-            (h->flags & RA_MASK) ? "RA":"  ",  
-            ((h->flags & Z_MASK) >> Z_SHIFT),
-            rcodetostr(RCODE(h->flags)),
-            h->qdcount, h->ancount, h->nscount, h->arcount);
-
-        return buf;
-}
-
-static void
-dump_packet(const void *data, size_t len)
-{
-        char            buf[1024];
-        struct packed   p;
-        struct header   h;
-        struct query    q;
-        struct rr       rr;
-        int             i, an, ns, ar, n;
-
-        packed_init(&p, (char *)data, len);
-
-        if (unpack_header(&p, &h) == -1) {
-                printf(";; BAD PACKET: %s\n", p.err);
-                return;
-        }
-
-        printf(";; HEADER %s\n", print_header(&h, buf, sizeof buf));
-
-        if (h.qdcount)
-                printf(";; QUERY SECTION:\n");
-        for (i = 0; i < h.qdcount; i++) {
-                if (unpack_query(&p, &q) == -1)
-                        goto error;
-                printf("%s\n", print_query(&q, buf, sizeof buf));
-        }
-
-        an = 0;
-        ns = an + h.ancount;
-        ar = ns + h.nscount;
-        n = ar + h.arcount;
-
-        for (i = 0; i < n; i++) {
-                if (i == an)
-                        printf("\n;; ANSWER SECTION:\n");
-                if (i == ns)
-                        printf("\n;; AUTHORITY SECTION:\n");
-                if (i == ar)
-                        printf("\n;; ADDITIONAL SECTION:\n");
-
-                if (unpack_rr(&p, &rr) == -1)
-                        goto error;
-                printf("%s\n", print_rr(&rr, buf, sizeof buf));
-        }
-
-        if (p.offset != len)
-                printf(";; REMAINING GARBAGE %zu\n", len - p.offset);
-
-    error:
-        if (p.err)
-                printf(";; ERROR AT OFFSET %zu/%zu: %s\n", p.offset, p.len,
-                    p.err);
-}
-
-static const char *
-inet6_ntoa(struct in6_addr a)
-{
-        static char buf[256];
-        struct sockaddr_in6     si;
-
-        si.sin6_len = sizeof(si);
-        si.sin6_family = PF_INET6;
-        si.sin6_addr = a;
-
-        return print_host((struct sockaddr*)&si, buf, sizeof buf);
-}
-
-static char*
-print_rr(struct rr *rr, char *buf, size_t max)
-{
-        char    *res;
-        char     tmp[256];
-        char     tmp2[256];
-        int      r;
-
-        res = buf;
-
-        r = snprintf(buf, max, "%s %u %s %s ",
-            print_dname(rr->rr_dname, tmp, sizeof tmp),
-            rr->rr_ttl,
-            classtostr(rr->rr_class),
-            typetostr(rr->rr_type));
-        if (r == -1) {
-                buf[0] = '\0';
-                return buf;
-        }
-
-        if ((size_t)r >= max)
-                return buf;
-
-        max -= r;
-        buf += r;
-
-        switch(rr->rr_type) {
-        case T_CNAME:
-                print_dname(rr->rr.cname.cname, buf, max);
-                break;
-        case T_MX:
-                snprintf(buf, max, "%"PRIu32" %s",
-                    rr->rr.mx.preference,
-                    print_dname(rr->rr.mx.exchange, tmp, sizeof tmp));
-                break;
-        case T_NS:
-                print_dname(rr->rr.ns.nsname, buf, max);
-                break;
-        case T_PTR:
-                print_dname(rr->rr.ptr.ptrname, buf, max);
-                break;
-        case T_SOA:
-                snprintf(buf, max,
-                    "%s %s %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32,
-                    print_dname(rr->rr.soa.rname, tmp, sizeof tmp),
-                    print_dname(rr->rr.soa.mname, tmp2, sizeof tmp2),
-                    rr->rr.soa.serial,
-                    rr->rr.soa.refresh,
-                    rr->rr.soa.retry,
-                    rr->rr.soa.expire,
-                    rr->rr.soa.minimum);
-                break;
-        case T_A:
-                if (rr->rr_class != C_IN)
-                        goto other;
-                snprintf(buf, max, "%s", inet_ntoa(rr->rr.in_a.addr));
-                break;
-        case T_AAAA:
-                if (rr->rr_class != C_IN)
-                        goto other;
-                snprintf(buf, max, "%s", inet6_ntoa(rr->rr.in_aaaa.addr6));
-                break;
-        default:
-        other:
-                snprintf(buf, max, "(rdlen=%"PRIu16 ")", rr->rr.other.rdlen);
-                break;
-        }
-
-        return (res);
-}
-
-static char*
-print_query(struct query *q, char *buf, size_t max)
-{
-        char b[256];
-
-        snprintf(buf, max, "%s  %s %s",
-            print_dname(q->q_dname, b, sizeof b),
-            classtostr(q->q_class), typetostr(q->q_type));
-
-        return (buf);
-}
-
-
-static char *
-print_host(const struct sockaddr *sa, char *buf, size_t len)
-{
-        switch (sa->sa_family) {
-        case AF_INET:
-                inet_ntop(AF_INET, &((struct sockaddr_in*)sa)->sin_addr, buf, len);
-                break;
-        case AF_INET6:
-                inet_ntop(AF_INET6, &((struct sockaddr_in6*)sa)->sin6_addr, buf, len);
-                break;
-        default:
-                buf[0] = '\0';
-        }
-        return (buf);
-}
-
-static char*
-print_dname(const char *_dname, char *buf, size_t max)
-{
-        const unsigned char *dname = _dname;
-        char    *res;
-        size_t   left, n, count;
-
-        if (_dname[0] == 0) {
-                strlcpy(buf, ".", max);
-                return buf;
-        }
-
-        res = buf;
-        left = max - 1;
-        for (n = 0; dname[0] && left; n += dname[0]) {
-                count = (dname[0] < (left - 1)) ? dname[0] : (left - 1);
-                memmove(buf, dname + 1, count);
-                dname += dname[0] + 1;
-                left -= count;
-                buf += count;
-                if (left) {
-                        left -= 1;
-                        *buf++ = '.';
-                }
-        }
-        buf[0] = 0;
-
-        return (res);
-}
diff --git a/src/regress/lib/libc/asr/bin/res_mkquery/Makefile b/src/regress/lib/libc/asr/bin/res_mkquery/Makefile
deleted file mode 100644
index 4ae259e45d..0000000000
--- a/src/regress/lib/libc/asr/bin/res_mkquery/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2017/03/09 08:26:42 eric Exp $
-
-.PATH:  ${.CURDIR}/..
-
-PROG=   res_mkquery
-SRCS+=  res_mkquery.c
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/asr/bin/res_query.c b/src/regress/lib/libc/asr/bin/res_query.c
deleted file mode 100644
index 3565eeebed..0000000000
--- a/src/regress/lib/libc/asr/bin/res_query.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*      $OpenBSD: res_query.c,v 1.2 2017/03/09 07:56:38 eric Exp $      */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <inttypes.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "common.h"
-
-/* in asr.c but we don't want them exposed right now */
-static void dump_packet(const void *, size_t);
-
-static char *print_query(struct query *, char *, size_t);
-static char *print_rr(struct rr *, char *, size_t);
-static char *print_host(const struct sockaddr *, char *, size_t);
-static char* print_dname(const char *, char *, size_t);
-
-
-static int
-msec(struct timeval start, struct timeval end)
-{
-        return (int)((end.tv_sec - start.tv_sec) * 1000
-            + (end.tv_usec - start.tv_usec) / 1000);
-}
-
-static void
-usage(void)
-{
-        extern const char * __progname;
-
-        fprintf(stderr, "usage: %s [-deq] [-t type] [host...]\n",
-            __progname);
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        struct timeval           start, end;
-        time_t                   when;
-        int                      ch, i, qflag, dflag, r;
-        uint16_t                 type = T_A;
-        char                     buf[1024], *host;
-
-        dflag = 0;
-        qflag = 0;
-
-        while((ch = getopt(argc, argv, "deqt:")) !=  -1) {
-                switch(ch) {
-                case 'd':
-                        dflag = 1;
-                        break;
-                case 'e':
-                        long_err += 1;
-                        break;
-                case 'q':
-                        qflag = 1;
-                        break;
-                case 't':
-                        if ((type = strtotype(optarg)) == 0)
-                                usage();
-                        break;
-                default:
-                        usage();
-                        /* NOTREACHED */
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        for (i = 0; i < argc; i++) {
-
-                if (i)
-                        printf("\n");
-
-                printf("===> \"%s\"\n", argv[i]);
-                host = gethostarg(argv[i]);
-
-                errno = 0;
-                h_errno = 0;
-                gai_errno = 0;
-                rrset_errno = 0;
-
-                if (gettimeofday(&start, NULL) != 0)
-                        err(1, "gettimeofday");
-
-                if (qflag)
-                        r = res_query(host, C_IN, type, buf, sizeof(buf));
-                else
-                        r = res_search(host, C_IN, type, buf, sizeof(buf));
-
-                if (gettimeofday(&end, NULL) != 0)
-                        err(1, "gettimeofday");
-
-                if (r != -1) {
-                        dump_packet(buf, r);
-                        printf("\n");
-                        if (dflag) {
-                                printf(";; Query time: %d msec\n",
-                                    msec(start, end));
-                                when = time(NULL);
-                                printf(";; WHEN: %s", ctime(&when));
-                        }
-                        printf(";; MSG SIZE  rcvd: %i\n", r);
-                }
-                print_errors();
-        }
-
-        return (0);
-}
-
-#define OPCODE_SHIFT    11
-#define Z_SHIFT         4
-
-static char*
-print_header(struct header *h, char *buf, size_t max)
-{
-        snprintf(buf, max,
-        "id:0x.... %s op:%i %s %s %s %s z:%i r:%s qd:%i an:%i ns:%i ar:%i",
-            (h->flags & QR_MASK) ? "QR":"  ",
-            (int)(OPCODE(h->flags) >> OPCODE_SHIFT),
-            (h->flags & AA_MASK) ? "AA":"  ",
-            (h->flags & TC_MASK) ? "TC":"  ",
-            (h->flags & RD_MASK) ? "RD":"  ",
-            (h->flags & RA_MASK) ? "RA":"  ",  
-            ((h->flags & Z_MASK) >> Z_SHIFT),
-            rcodetostr(RCODE(h->flags)),
-            h->qdcount, h->ancount, h->nscount, h->arcount);
-
-        return buf;
-}
-
-static void
-dump_packet(const void *data, size_t len)
-{
-        char            buf[1024];
-        struct packed   p;
-        struct header   h;
-        struct query    q;
-        struct rr       rr;
-        int             i, an, ns, ar, n;
-
-        packed_init(&p, (char *)data, len);
-
-        if (unpack_header(&p, &h) == -1) {
-                printf(";; BAD PACKET: %s\n", p.err);
-                return;
-        }
-
-        printf(";; HEADER %s\n", print_header(&h, buf, sizeof buf));
-
-        if (h.qdcount)
-                printf(";; QUERY SECTION:\n");
-        for (i = 0; i < h.qdcount; i++) {
-                if (unpack_query(&p, &q) == -1)
-                        goto error;
-                printf("%s\n", print_query(&q, buf, sizeof buf));
-        }
-
-        an = 0;
-        ns = an + h.ancount;
-        ar = ns + h.nscount;
-        n = ar + h.arcount;
-
-        for (i = 0; i < n; i++) {
-                if (i == an)
-                        printf("\n;; ANSWER SECTION:\n");
-                if (i == ns)
-                        printf("\n;; AUTHORITY SECTION:\n");
-                if (i == ar)
-                        printf("\n;; ADDITIONAL SECTION:\n");
-
-                if (unpack_rr(&p, &rr) == -1)
-                        goto error;
-                printf("%s\n", print_rr(&rr, buf, sizeof buf));
-        }
-
-        if (p.offset != len)
-                printf(";; REMAINING GARBAGE %zu\n", len - p.offset);
-
-    error:
-        if (p.err)
-                printf(";; ERROR AT OFFSET %zu/%zu: %s\n", p.offset, p.len,
-                    p.err);
-}
-
-static const char *
-inet6_ntoa(struct in6_addr a)
-{
-        static char buf[256];
-        struct sockaddr_in6     si;
-
-        si.sin6_len = sizeof(si);
-        si.sin6_family = PF_INET6;
-        si.sin6_addr = a;
-
-        return print_host((struct sockaddr*)&si, buf, sizeof buf);
-}
-
-static char*
-print_rr(struct rr *rr, char *buf, size_t max)
-{
-        char    *res;
-        char     tmp[256];
-        char     tmp2[256];
-        int      r;
-
-        res = buf;
-
-        r = snprintf(buf, max, "%s %u %s %s ",
-            print_dname(rr->rr_dname, tmp, sizeof tmp),
-            rr->rr_ttl,
-            classtostr(rr->rr_class),
-            typetostr(rr->rr_type));
-        if (r == -1) {
-                buf[0] = '\0';
-                return buf;
-        }
-
-        if ((size_t)r >= max)
-                return buf;
-
-        max -= r;
-        buf += r;
-
-        switch(rr->rr_type) {
-        case T_CNAME:
-                print_dname(rr->rr.cname.cname, buf, max);
-                break;
-        case T_MX:
-                snprintf(buf, max, "%"PRIu32" %s",
-                    rr->rr.mx.preference,
-                    print_dname(rr->rr.mx.exchange, tmp, sizeof tmp));
-                break;
-        case T_NS:
-                print_dname(rr->rr.ns.nsname, buf, max);
-                break;
-        case T_PTR:
-                print_dname(rr->rr.ptr.ptrname, buf, max);
-                break;
-        case T_SOA:
-                snprintf(buf, max,
-                    "%s %s %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32,
-                    print_dname(rr->rr.soa.rname, tmp, sizeof tmp),
-                    print_dname(rr->rr.soa.mname, tmp2, sizeof tmp2),
-                    rr->rr.soa.serial,
-                    rr->rr.soa.refresh,
-                    rr->rr.soa.retry,
-                    rr->rr.soa.expire,
-                    rr->rr.soa.minimum);
-                break;
-        case T_A:
-                if (rr->rr_class != C_IN)
-                        goto other;
-                snprintf(buf, max, "%s", inet_ntoa(rr->rr.in_a.addr));
-                break;
-        case T_AAAA:
-                if (rr->rr_class != C_IN)
-                        goto other;
-                snprintf(buf, max, "%s", inet6_ntoa(rr->rr.in_aaaa.addr6));
-                break;
-        default:
-        other:
-                snprintf(buf, max, "(rdlen=%"PRIu16 ")", rr->rr.other.rdlen);
-                break;
-        }
-
-        return (res);
-}
-
-static char*
-print_query(struct query *q, char *buf, size_t max)
-{
-        char b[256];
-
-        snprintf(buf, max, "%s  %s %s",
-            print_dname(q->q_dname, b, sizeof b),
-            classtostr(q->q_class), typetostr(q->q_type));
-
-        return (buf);
-}
-
-
-static char *
-print_host(const struct sockaddr *sa, char *buf, size_t len)
-{
-        switch (sa->sa_family) {
-        case AF_INET:
-                inet_ntop(AF_INET, &((struct sockaddr_in*)sa)->sin_addr, buf, len);
-                break;
-        case AF_INET6:
-                inet_ntop(AF_INET6, &((struct sockaddr_in6*)sa)->sin6_addr, buf, len);
-                break;
-        default:
-                buf[0] = '\0';
-        }
-        return (buf);
-}
-
-static char*
-print_dname(const char *_dname, char *buf, size_t max)
-{
-        const unsigned char *dname = _dname;
-        char    *res;
-        size_t   left, n, count;
-
-        if (_dname[0] == 0) {
-                strlcpy(buf, ".", max);
-                return buf;
-        }
-
-        res = buf;
-        left = max - 1;
-        for (n = 0; dname[0] && left; n += dname[0]) {
-                count = (dname[0] < (left - 1)) ? dname[0] : (left - 1);
-                memmove(buf, dname + 1, count);
-                dname += dname[0] + 1;
-                left -= count;
-                buf += count;
-                if (left) {
-                        left -= 1;
-                        *buf++ = '.';
-                }
-        }
-        buf[0] = 0;
-
-        return (res);
-}
diff --git a/src/regress/lib/libc/asr/bin/res_query/Makefile b/src/regress/lib/libc/asr/bin/res_query/Makefile
deleted file mode 100644
index 6f4d83392b..0000000000
--- a/src/regress/lib/libc/asr/bin/res_query/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2017/03/09 08:26:42 eric Exp $
-
-.PATH:  ${.CURDIR}/..
-
-PROG=   res_query
-SRCS+=  res_query.c
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/asr/bin/threads.c b/src/regress/lib/libc/asr/bin/threads.c
deleted file mode 100644
index f296f1d6f7..0000000000
--- a/src/regress/lib/libc/asr/bin/threads.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*      $OpenBSD: threads.c,v 1.1.1.1 2012/07/13 17:49:53 eric Exp $    */
-/*
- * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <assert.h>
-#include <err.h>
-#include <getopt.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include <netdb.h>
-
-#define MAX_THREADS     50
-
-int       ac;
-char    **av;
-int       loop;
-int       nthreads;
-
-int long_err;
-int gai_errno;
-int rrset_errno;
-
-void async_resolver_done(void *);
-
-void stats(void)
-{
-        struct rusage   ru;
-
-        getrusage(RUSAGE_SELF, &ru);
-        printf("%li\n", ru.ru_maxrss);
-}
-
-void*
-task(void *arg)
-{
-        int              id, i, j, c;
-        struct addrinfo *ai, *n;
-
-        id = *((int*) arg);
-
-        n = NULL; c =0;
-
-        for(j = 0; j < loop; j++)
-                for(i = 0; i < ac; i++) {
-                        if (getaddrinfo(av[i], NULL, NULL, &ai) == 0) {
-/*
-                                for (c = 0, n = ai; n; c++, n = n->ai_next);
-                                printf("%i:%s: ok: %i\n", id, av[i], c);
-*/
-                                freeaddrinfo(ai);
-                        } else {
-/*
-                                printf("%i:%s: fail\n", id, av[i]);
-*/
-                        }
-                }
-        return (NULL);
-}
-
-void
-usage(void)
-{
-        extern const char *__progname;
-        fprintf(stderr, "usage: %s [-L loop] [-l loop] [-t threads] <host> ...\n",
-                __progname);
-}
-
-int
-main(int argc, char **argv)
-{
-        pthread_t       th[MAX_THREADS];
-        int             th_args[MAX_THREADS], r, i, ch;
-        int             n, LOOP;
-
-        nthreads = 1;
-        loop = 1;
-        LOOP = 1;
-
-        while ((ch = getopt(argc, argv, "L:l:t:")) != -1) {
-                switch (ch) {
-                case 'L':
-                        LOOP = atoi(optarg);
-                        break;
-                case 'l':
-                        loop = atoi(optarg);
-                        break;
-                case 't':
-                        nthreads = atoi(optarg);
-                        if (nthreads > MAX_THREADS)
-                                nthreads = MAX_THREADS;
-                        break;
-                default:
-                        usage();
-                        /* NOTREACHED */
-                }
-        }
-
-        argc -= optind;
-        argv += optind;
-
-        ac = argc;
-        av = argv;
-
-        printf("%i %i %i\n", LOOP, nthreads, loop);
-        for (n = 0; n < LOOP; n ++) {
-                for (i = 0; i < nthreads; i++) {
-                        th_args[i] = i;
-                        r = pthread_create(&th[i], NULL, task, (void *) &th_args[i]);
-                        if (r == -1)
-                                errx(1, "pthread_create");
-                }
-                for (i = 0; i < nthreads; i++)
-                        pthread_join(th[i], NULL);
-
-                if (nthreads == 0)
-                        task(&n);
-
-                stats();
-        }
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/asr/bin/threads/Makefile b/src/regress/lib/libc/asr/bin/threads/Makefile
deleted file mode 100644
index 3252511cd1..0000000000
--- a/src/regress/lib/libc/asr/bin/threads/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1.1.1 2012/07/13 17:49:54 eric Exp $
-
-.PATH:  ${.CURDIR}/..
-
-PROG=   threads
-SRCS+=  threads.c
-
-LDADD=  -lpthread
-
-.include <bsd.prog.mk>
diff --git a/src/regress/lib/libc/asr/regress.sh b/src/regress/lib/libc/asr/regress.sh
deleted file mode 100644
index a0950cefde..0000000000
--- a/src/regress/lib/libc/asr/regress.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#       $OpenBSD: regress.sh,v 1.7 2017/03/10 17:23:48 eric Exp $
-
-. regress.subr
-
-test_res_mkquery()
-{
-        for i in $@; do
-                regress res_mkquery $i
-        done
-}
-
-test_res_query()
-{
-        for i in $@; do
-                regress res_query $i
-                regress res_query -q $i
-        done
-}
-
-test_getrrsetbyname()
-{
-        for i in $@; do
-                regress getrrsetbyname $i
-                regress getrrsetbyname -t MX $i
-                regress getrrsetbyname -t AAAA $i
-        done
-}
-
-test_gethostbyname()
-{
-        for i in $@; do
-                regress gethostnamadr $i
-                regress gethostnamadr -4 $i
-                regress gethostnamadr -6 $i
-        done
-}
-
-test_gethostbyaddr()
-{
-        for i in $@; do
-                regress gethostnamadr -a $i
-        done
-}
-
-test_getaddrinfo()
-{
-        for i in $@; do
-                regress getaddrinfo $i
-                regress getaddrinfo -C $i
-                regress getaddrinfo -F $i
-                regress getaddrinfo -CF $i
-                regress getaddrinfo -P $i
-                regress getaddrinfo -PF $i
-                regress getaddrinfo -PC $i
-                regress getaddrinfo -H $i
-                regress getaddrinfo -p tcp $i
-                regress getaddrinfo -p udp $i
-                regress getaddrinfo -s www $i
-                regress getaddrinfo -s bad $i
-                regress getaddrinfo -S -s 8081 $i
-                regress getaddrinfo -S -s bad $i
-                regress getaddrinfo -P -s syslog $i
-                regress getaddrinfo -P -s syslog -p tcp $i
-                regress getaddrinfo -P -s syslog -p udp $i
-        done
-}
-
-test_getaddrinfo2()
-{
-        for i in $@; do
-                regress getaddrinfo -f inet6 -t raw -p icmpv6 $i
-        done
-}
-
-test_getnameinfo()
-{
-        for i in $@; do
-                regress getnameinfo $i
-                regress getnameinfo -D $i
-                regress getnameinfo -F $i
-                regress getnameinfo -H $i
-                regress getnameinfo -N $i
-                regress getnameinfo -S $i
-                regress getnameinfo -p 80 $i
-                regress getnameinfo -p 514 $i
-                regress getnameinfo -p 514 -D $i
-                regress getnameinfo -p 5566 $i
-        done
-}
-
-WEIRD="EMPTY . .. ..."
-BASIC="localhost $(hostname -s) $(hostname)"
-EXTRA="undeadly.org www.openbsd.org cvs.openbsd.org www.google.com www.bing.com"
-
-ADDRS="0.0.0.0 :: 127.0.0.1 ::1 212.227.193.194"
-
-for e in file bind local; do
-        regress_setenv $e
-
-        test_res_mkquery $WEIRD $BASIC
-        test_res_query $WEIRD $BASIC $EXTRA
-        test_getrrsetbyname $WEIRD $BASIC $EXTRA
-        test_gethostbyname $WEIRD $BASIC $EXTRA
-        test_gethostbyaddr $ADDRS
-        test_getaddrinfo NULL $WEIRD $BASIC $EXTRA
-        test_getaddrinfo2 undeadly.org www.kame.net
-        test_getnameinfo $ADDRS
-        test_gethostbyname $ADDRS
-done
-
-regress_digest
diff --git a/src/regress/lib/libc/asr/regress.subr b/src/regress/lib/libc/asr/regress.subr
deleted file mode 100644
index 6ce645bc33..0000000000
--- a/src/regress/lib/libc/asr/regress.subr
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-#       $OpenBSD: regress.subr,v 1.4 2017/03/14 20:22:06 eric Exp $
-
-set -e
-
-fail()
-{
-        echo "*** ERROR: $@"
-        exit 1
-}
-
-regress()
-{
-        local cmd="$1"
-        local bin0="/bin/${cmd}${A}"
-        local bin1="/bin/${cmd}${B}"
-        local out="${OUTDIR}/test-${COUNT}.out"
-        local out0="${OUTDIR}/test-${COUNT}${A}.out"
-        local out1="${OUTDIR}/test-${COUNT}${B}.out"
-        local err0="${OUTDIR}/test-${COUNT}${A}.err"
-        local err1="${OUTDIR}/test-${COUNT}${B}.err"
-        local outdiff="${OUTDIR}/test-${COUNT}${A}${B}.diff"
-        shift
-
-        test -x "${ROOTDIR}${bin0}" || fail "${ROOTDIR}${bin0}" not executable
-        test -x "${ROOTDIR}${bin1}" || fail "${ROOTDIR}${bin1}" not executable
-
-        echo -n "${cmd} $@ ."
-
-        set +e
-        chroot -u bin "${ROOTDIR}" ${bin0} $@ > ${out0}
-        echo -n .
-        chroot -u bin "${ROOTDIR}" ${bin1} $@ > ${out1}
-        echo -n "."
-
-        diff -u ${out0} ${out1} > ${outdiff}
-        set -e
-        if test -s ${outdiff}; then
-                FAIL=$((FAIL+1))
-                echo fail
-                echo "### FAIL [#${COUNT} env=${REGRESSENV}] ${cmd} $@" >> $ERR
-                cat ${outdiff} >> $ERR
-                echo >> $ERR
-        else
-                rm ${outdiff}
-                rm ${out1}
-                mv ${out0} ${out}
-                OK=$((OK+1))
-                echo ok
-                echo "### OK [#${COUNT} env=$REGRESSENV] ${cmd} $@" >> $OUT
-                cat ${out} >> $OUT
-                echo >> $OUT
-        fi
-
-        COUNT=$((COUNT+1))
-}
-
-regress_setenv()
-{
-        local _name="$1"
-
-        echo "==> using env $_name"
-
-        mkdir -p "${ROOTDIR}/etc/"
-        cp /etc/hosts "${ROOTDIR}/etc/"
-        cp /etc/resolv.conf "${ROOTDIR}/etc/"
-        cp /etc/protocols "${ROOTDIR}/etc/"
-        cp /etc/networks "${ROOTDIR}/etc/"
-        cp /etc/services "${ROOTDIR}/etc/"
-
-        case $_name in
-        empty)
-                rm -f "${ROOTDIR}/etc/*"
-                ;;
-        local)
-                ;;
-        file)
-                grep -v lookup /etc/resolv.conf > "${ROOTDIR}/etc/resolv.conf"
-                echo "lookup file" >> "${ROOTDIR}/etc/resolv.conf"
-                ;;
-        bind)
-                grep -v lookup /etc/resolv.conf > "${ROOTDIR}/etc/resolv.conf"
-                echo "lookup bind" >> "${ROOTDIR}/etc/resolv.conf"
-                ;;
-        *)
-                fail unknown env $_name
-                ;;
-        esac
-        REGRESSENV=$_name
-}
-
-regress_digest()
-{
-        echo "===> done"
-        test -f $ERR && (echo; cat $ERR; echo "===> errfile=$ERR")
-        echo "===> logfile=$OUT"
-        echo "===> run=$COUNT ok=$OK fail=$FAIL error=$ERROR"
-
-}
-
-# needed for chroot
-test "$(id -u)" -ne 0 && fail need root privileges to run this script
-
-# we really really want to avoid erasing /etc later
-test "${RUNDIR}" || fail RUNDIR is not set
-
-ROOTDIR=$(readlink -fn ${RUNDIR})
-test "${ROOTDIR}" == "/" && fail RUNDIR is root dir: ${RUNDIR}
-
-COUNT=0
-OK=0
-FAIL=0
-ERROR=0
-A=${A:=.a}
-B=${B:=.b}
-
-OUTDIR=$(mktemp -d -p $ROOTDIR)
-chmod a+rx ${OUTDIR}
-echo "===> ${OUTDIR}"
-
-OUT=$OUTDIR/regress.log
-ERR=$OUTDIR/regress.err
diff --git a/src/regress/lib/libc/atexit/Makefile b/src/regress/lib/libc/atexit/Makefile
deleted file mode 100644
index eb8c55e91e..0000000000
--- a/src/regress/lib/libc/atexit/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#       $OpenBSD: Makefile,v 1.7 2017/07/27 15:08:37 bluhm Exp $
-
-PROG =          atexit_test
-CPPFLAGS =      -I${.CURDIR}/../../../../lib/libc
-CLEANFILES =    invalid.out valid.out
-LDADD =         -static
-
-run-regress-${PROG}: ${PROG}
-        ./${PROG} -valid 2>${.OBJDIR}/valid.out
-        cmp -s ${.OBJDIR}/valid.out ${.CURDIR}/valid.ok
-        ./${PROG} -invalid-atexit 2>${.OBJDIR}/invalid.out
-        cmp -s ${.OBJDIR}/invalid.out ${.CURDIR}/invalid.ok
-        ./${PROG} -invalid-cleanup 2>${.OBJDIR}/invalid.out
-        cmp -s ${.OBJDIR}/invalid.out ${.CURDIR}/invalid.ok
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/atexit/atexit_test.c b/src/regress/lib/libc/atexit/atexit_test.c
deleted file mode 100644
index b060a9b341..0000000000
--- a/src/regress/lib/libc/atexit/atexit_test.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*      $OpenBSD: atexit_test.c,v 1.9 2017/07/27 15:08:37 bluhm Exp $ */
-
-/*
- * Copyright (c) 2002 Daniel Hartmeier
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - Redistributions in binary form must reproduce the above
- *      copyright notice, this list of conditions and the following
- *      disclaimer in the documentation and/or other materials provided
- *      with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include "include/namespace.h"
-#include "hidden/stdlib.h"
-#include "stdlib/atexit.h"
-
-void    handle_first(void);
-void    handle_middle(void);
-void    handle_last(void);
-void    handle_invalid(void *);
-void    handle_cleanup(void);
-void    handle_signal(int);
-
-static int counter;
-
-int
-main(int argc, char *argv[])
-{
-        int i;
-
-        if (argc != 2 || (strcmp(argv[1], "-valid") &&
-            strcmp(argv[1], "-invalid-atexit") &&
-            strcmp(argv[1], "-invalid-cleanup"))) {
-                fprintf(stderr, "%s -valid/-invalid-atexit/-invalid-cleanup\n",
-                    argv[0]);
-                return (1);
-        }
-        fprintf(stderr, "main()\n");
-        if (atexit(handle_last)) {
-                perror("atexit(handle_last) failed");
-                return (1);
-        }
-        for (i = 0; i < 65535; ++i) {
-                if (atexit(handle_middle)) {
-                        perror("atexit(handle_middle) failed");
-                        return (1);
-                }
-        }
-        if (atexit(handle_first)) {
-                perror("atexit(handle_first) failed");
-                return (1);
-        }
-        /* this is supposed to segfault */
-        if (!strcmp(argv[1], "-invalid-atexit")) {
-                signal(SIGSEGV, handle_signal);
-                __atexit->fns[0].fn_ptr = handle_invalid;
-        } else if (!strcmp(argv[1], "-invalid-cleanup")) {
-                struct atexit *p = __atexit;
-
-                signal(SIGSEGV, handle_signal);
-                while (p != NULL && p->next != NULL)
-                        p = p->next;
-                if (p == NULL)
-                        fprintf(stderr, "p == NULL, no page found\n");
-                p->fns[0].fn_ptr = handle_invalid;
-        }
-        __atexit_register_cleanup(handle_cleanup);
-        counter = 0;
-        fprintf(stderr, "main() returns\n");
-        return (0);
-}
-
-void
-handle_first(void)
-{
-        fprintf(stderr, "handle_first() counter == %i\n", counter);
-}
-
-void
-handle_middle(void)
-{
-        counter++;
-}
-
-void
-handle_last(void)
-{
-        fprintf(stderr, "handle_last() counter == %i\n", counter);
-}
-
-void
-handle_cleanup(void)
-{
-        fprintf(stderr, "handle_cleanup()\n");
-}
-
-void
-handle_invalid(void *arg)
-{
-        fprintf(stderr, "handle_invalid() THIS SHOULD HAVE SEGFAULTED INSTEAD!\n");
-}
-
-void
-handle_signal(int sigraised)
-{
-        switch (sigraised) {
-        case SIGSEGV:
-                dprintf(STDERR_FILENO, "SIGSEGV\n");
-                exit(0);
-        default:
-                dprintf(STDERR_FILENO, "unexpected signal caught\n");
-                exit(1);
-        }
-}
diff --git a/src/regress/lib/libc/atexit/invalid.ok b/src/regress/lib/libc/atexit/invalid.ok
deleted file mode 100644
index 98cbf8c1de..0000000000
--- a/src/regress/lib/libc/atexit/invalid.ok
+++ /dev/null
@@ -1,4 +0,0 @@
-main()
-SIGSEGV
-handle_first() counter == 0
-handle_last() counter == 65535
diff --git a/src/regress/lib/libc/atexit/valid.ok b/src/regress/lib/libc/atexit/valid.ok
deleted file mode 100644
index 6509e827a7..0000000000
--- a/src/regress/lib/libc/atexit/valid.ok
+++ /dev/null
@@ -1,5 +0,0 @@
-main()
-main() returns
-handle_first() counter == 0
-handle_last() counter == 65535
-handle_cleanup()
diff --git a/src/regress/lib/libc/basename/Makefile b/src/regress/lib/libc/basename/Makefile
deleted file mode 100644
index 958b06fd11..0000000000
--- a/src/regress/lib/libc/basename/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-PROG=basename_test
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/basename/basename_test.c b/src/regress/lib/libc/basename/basename_test.c
deleted file mode 100644
index 34e138c726..0000000000
--- a/src/regress/lib/libc/basename/basename_test.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2007 Bret S. Lambert <blambert@gsipt.net>
- *
- * Public domain.
- */
-
-#include <sys/param.h>
-
-#include <libgen.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-
-int
-main(void)
-{
-        char path[2 * MAXPATHLEN];
-        const char *dir = "junk/";
-        const char *fname = "file.name.ext";
-        char *str;
-        int i;
-
-        /* Test normal functioning */
-        strlcpy(path, "/", sizeof(path));
-        strlcat(path, dir, sizeof(path)); 
-        strlcat(path, fname, sizeof(path));
-        str = basename(path);
-        if (strcmp(str, fname) != 0)
-                goto fail;
-
-        /*
-         * There are four states that require special handling:
-         *
-         * 1) path is NULL
-         * 2) path is the empty string
-         * 3) path is composed entirely of slashes
-         * 4) the resulting name is larger than MAXPATHLEN
-         *
-         * The first two cases require that a pointer
-         * to the string "." be returned.
-         *
-         * The third case requires that a pointer
-         * to the string "/" be returned.
-         *
-         * The final case requires that NULL be returned
-         * and errno * be set to ENAMETOOLONG.
-         */
-        /* Case 1 */
-        str = basename(NULL);
-        if (strcmp(str, ".") != 0)
-                goto fail;
-
-        /* Case 2 */
-        strlcpy(path, "", sizeof(path));
-        str = basename(path);
-        if (strcmp(str, ".") != 0)
-                goto fail;
-
-        /* Case 3 */
-        for (i = 0; i < MAXPATHLEN - 1; i++)
-                strlcat(path, "/", sizeof(path));       /* path cleared above */
-        str = basename(path);
-        if (strcmp(str, "/") != 0)
-                goto fail;
-
-        /* Case 4 */
-        strlcpy(path, "/", sizeof(path));
-        strlcat(path, dir, sizeof(path));
-        for (i = 0; i <= MAXPATHLEN; i += sizeof(fname))
-                strlcat(path, fname, sizeof(path));
-        str = basename(path);
-        if (str != NULL || errno != ENAMETOOLONG)
-                goto fail;
-
-        return (0);
-fail:
-        return (1);
-}
diff --git a/src/regress/lib/libc/cephes/Makefile b/src/regress/lib/libc/cephes/Makefile
deleted file mode 100644
index 75cc85f4a8..0000000000
--- a/src/regress/lib/libc/cephes/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2011/07/02 18:11:01 martynas Exp $
-
-PROG = ieetst
-SRCS = drand.c econst.c eexp.c elog.c epow.c etanh.c etodec.c ieee.c \
-       ieetst.c mtherr.c
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/cephes/drand.c b/src/regress/lib/libc/cephes/drand.c
deleted file mode 100644
index 7f7000b4e8..0000000000
--- a/src/regress/lib/libc/cephes/drand.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*      $OpenBSD: drand.c,v 1.1 2011/07/02 18:11:01 martynas Exp $      */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                                      drand.c
- *
- *      Pseudorandom number generator
- *
- *
- *
- * SYNOPSIS:
- *
- * double y, drand();
- *
- * drand( &y );
- *
- *
- *
- * DESCRIPTION:
- *
- * Yields a random number 1.0 <= y < 2.0.
- *
- * The three-generator congruential algorithm by Brian
- * Wichmann and David Hill (BYTE magazine, March, 1987,
- * pp 127-8) is used. The period, given by them, is
- * 6953607871644.
- *
- * Versions invoked by the different arithmetic compile
- * time options DEC, IBMPC, and MIEEE, produce
- * approximately the same sequences, differing only in the
- * least significant bits of the numbers. The UNK option
- * implements the algorithm as recommended in the BYTE
- * article.  It may be used on all computers. However,
- * the low order bits of a double precision number may
- * not be adequately random, and may vary due to arithmetic
- * implementation details on different computers.
- *
- * The other compile options generate an additional random
- * integer that overwrites the low order bits of the double
- * precision number.  This reduces the period by a factor of
- * two but tends to overcome the problems mentioned.
- *
- */
-
-#include "mconf.h"
-
-
-/*  Three-generator random number algorithm
- * of Brian Wichmann and David Hill
- * BYTE magazine, March, 1987 pp 127-8
- *
- * The period, given by them, is (p-1)(q-1)(r-1)/4 = 6.95e12.
- */
-
-static int sx = 1;
-static int sy = 10000;
-static int sz = 3000;
-
-static union {
- double d;
- unsigned short s[4];
-} unkans;
-
-/* This function implements the three
- * congruential generators.
- */
- 
-static int ranwh()
-{
-int r, s;
-
-/*  sx = sx * 171 mod 30269 */
-r = sx/177;
-s = sx - 177 * r;
-sx = 171 * s - 2 * r;
-if( sx < 0 )
-        sx += 30269;
-
-
-/* sy = sy * 172 mod 30307 */
-r = sy/176;
-s = sy - 176 * r;
-sy = 172 * s - 35 * r;
-if( sy < 0 )
-        sy += 30307;
-
-/* sz = 170 * sz mod 30323 */
-r = sz/178;
-s = sz - 178 * r;
-sz = 170 * s - 63 * r;
-if( sz < 0 )
-        sz += 30323;
-/* The results are in static sx, sy, sz. */
-return 0;
-}
-
-/*      drand.c
- *
- * Random double precision floating point number between 1 and 2.
- *
- * C callable:
- *      drand( &x );
- */
-
-int drand( a )
-double *a;
-{
-unsigned short r;
-#ifdef DEC
-unsigned short s, t;
-#endif
-
-/* This algorithm of Wichmann and Hill computes a floating point
- * result:
- */
-ranwh();
-unkans.d = sx/30269.0  +  sy/30307.0  +  sz/30323.0;
-r = unkans.d;
-unkans.d -= r;
-unkans.d += 1.0;
-
-/* if UNK option, do nothing further.
- * Otherwise, make a random 16 bit integer
- * to overwrite the least significant word
- * of unkans.
- */
-#ifdef UNK
-/* do nothing */
-#else
-ranwh();
-r = sx * sy + sz;
-#endif
-
-#ifdef DEC
-/* To make the numbers as similar as possible
- * in all arithmetics, the random integer has
- * to be inserted 3 bits higher up in a DEC number.
- * An alternative would be put it 3 bits lower down
- * in all the other number types.
- */
-s = unkans.s[2];
-t = s & 07;     /* save these bits to put in at the bottom */
-s &= 0177770;
-s |= (r >> 13) & 07;
-unkans.s[2] = s;
-t |= r << 3;
-unkans.s[3] = t;
-#endif
-
-#ifdef IBMPC
-unkans.s[0] = r;
-#endif
-
-#ifdef MIEEE
-unkans.s[3] = r;
-#endif
-
-*a = unkans.d;
-return 0;
-}
diff --git a/src/regress/lib/libc/cephes/econst.c b/src/regress/lib/libc/cephes/econst.c
deleted file mode 100644
index 4232059e4c..0000000000
--- a/src/regress/lib/libc/cephes/econst.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*      $OpenBSD: econst.c,v 1.1 2011/07/02 18:11:01 martynas Exp $     */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                                      econst.c        */
-/*  e type constants used by high precision check routines */
-
-#include "ehead.h"
-
-
-#if NE == 10
-/* 0.0 */
-unsigned short ezero[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,};
-
-/* 5.0E-1 */
-unsigned short ehalf[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x3ffe,};
-
-/* 1.0E0 */
-unsigned short eone[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x3fff,};
-
-/* 2.0E0 */
-unsigned short etwo[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x4000,};
-
-/* 3.2E1 */
-unsigned short e32[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x4004,};
-
-/* 6.93147180559945309417232121458176568075500134360255E-1 */
-unsigned short elog2[NE] =
- {0x40f3, 0xf6af, 0x03f2, 0xb398,
-  0xc9e3, 0x79ab, 0150717, 0013767, 0130562, 0x3ffe,};
-
-/* 1.41421356237309504880168872420969807856967187537695E0 */
-unsigned short esqrt2[NE] =
- {0x1d6f, 0xbe9f, 0x754a, 0x89b3,
-  0x597d, 0x6484, 0174736, 0171463, 0132404, 0x3fff,};
-
-/* 3.14159265358979323846264338327950288419716939937511E0 */
-unsigned short epi[NE] =
- {0x2902, 0x1cd1, 0x80dc, 0x628b,
-  0xc4c6, 0xc234, 0020550, 0155242, 0144417, 0040000,};
-  
-/* 5.7721566490153286060651209008240243104215933593992E-1 */
-unsigned short eeul[NE] = {
-0xd1be,0xc7a4,0076660,0063743,0111704,0x3ffe,};
-
-#else
-
-/* 0.0 */
-unsigned short ezero[NE] = {
-0, 0000000,0000000,0000000,0000000,0000000,};
-/* 5.0E-1 */
-unsigned short ehalf[NE] = {
-0, 0000000,0000000,0000000,0100000,0x3ffe,};
-/* 1.0E0 */
-unsigned short eone[NE] = {
-0, 0000000,0000000,0000000,0100000,0x3fff,};
-/* 2.0E0 */
-unsigned short etwo[NE] = {
-0, 0000000,0000000,0000000,0100000,0040000,};
-/* 3.2E1 */
-unsigned short e32[NE] = {
-0, 0000000,0000000,0000000,0100000,0040004,};
-/* 6.93147180559945309417232121458176568075500134360255E-1 */
-unsigned short elog2[NE] = {
-0xc9e4,0x79ab,0150717,0013767,0130562,0x3ffe,};
-/* 1.41421356237309504880168872420969807856967187537695E0 */
-unsigned short esqrt2[NE] = {
-0x597e,0x6484,0174736,0171463,0132404,0x3fff,};
-/* 2/sqrt(PI) =
- * 1.12837916709551257389615890312154517168810125865800E0 */
-unsigned short eoneopi[NE] = {
-0x71d5,0x688d,0012333,0135202,0110156,0x3fff,};
-/* 3.14159265358979323846264338327950288419716939937511E0 */
-unsigned short epi[NE] = {
-0xc4c6,0xc234,0020550,0155242,0144417,0040000,};
-/* 5.7721566490153286060651209008240243104215933593992E-1 */
-unsigned short eeul[NE] = {
-0xd1be,0xc7a4,0076660,0063743,0111704,0x3ffe,};
-#endif
-extern unsigned short ezero[];
-extern unsigned short ehalf[];
-extern unsigned short eone[];
-extern unsigned short etwo[];
-extern unsigned short e32[];
-extern unsigned short elog2[];
-extern unsigned short esqrt2[];
-extern unsigned short eoneopi[];
-extern unsigned short epi[];
-extern unsigned short eeul[];
-
diff --git a/src/regress/lib/libc/cephes/eexp.c b/src/regress/lib/libc/cephes/eexp.c
deleted file mode 100644
index 74f0d6adb3..0000000000
--- a/src/regress/lib/libc/cephes/eexp.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*      $OpenBSD: eexp.c,v 1.1 2011/07/02 18:11:01 martynas Exp $       */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                                      xexp.c          */
-/* exponential function check routine */
-/* by Stephen L. Moshier. */
-
-
-#include "ehead.h"
-
-void eexp( x, y )
-unsigned short *x, *y;
-{
-unsigned short num[NE], den[NE], x2[NE];
-long i;
-unsigned short sign, expchk;
-
-/* range reduction theory: x = i + f, 0<=f<1;
- * e**x = e**i * e**f 
- * e**i = 2**(i/log 2).
- * Let i/log2 = i1 + f1, 0<=f1<1.
- * Then e**i = 2**i1 * 2**f1, so
- * e**x = 2**i1 * e**(log 2 * f1) * e**f.
- */
-if( ecmp(x, ezero) == 0 )
-        {
-        emov( eone, y );
-        return;
-        }
-emov(x, x2);
-expchk = x2[NE-1];
-sign = expchk & 0x8000;
-x2[NE-1] &= 0x7fff;
-
-/* Test for excessively large argument */
-expchk &= 0x7fff;
-if( expchk > (EXONE + 15) )
-        {
-        eclear( y );
-        if( sign == 0 )
-                einfin( y );
-        return;
-        }
-
-eifrac( x2, &i, num );          /* x = i + f            */
-
-if( i != 0 )
- {
- ltoe( &i, den );               /* floating point i     */
- ediv( elog2, den, den );       /* i/log 2              */
- eifrac( den, &i, den );        /* i/log 2  =  i1 + f1  */
- emul( elog2, den, den );       /* log 2 * f1           */
- eadd( den, num, x2 );          /* log 2 * f1  + f      */
- }
-
-/*x2[NE-1] -= 1;*/
-eldexp( x2, -1L, x2 ); /* divide by 2 */
-etanh( x2, x2 );        /* tanh( x/2 )                  */
-eadd( x2, eone, num );  /* 1 + tanh                     */
-eneg( x2 );
-eadd( x2, eone, den );  /* 1 - tanh                     */
-ediv( den, num, y );    /* (1 + tanh)/(1 - tanh)        */
-
-/*y[NE-1] += i;*/
-if( sign )
-        {
-        ediv( y, eone, y );
-        i = -i;
-        }
-eldexp( y, i, y );      /* multiply by 2**i */
-}
diff --git a/src/regress/lib/libc/cephes/ehead.h b/src/regress/lib/libc/cephes/ehead.h
deleted file mode 100644
index 009bcf89cc..0000000000
--- a/src/regress/lib/libc/cephes/ehead.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*      $OpenBSD: ehead.h,v 1.1 2011/07/02 18:11:01 martynas Exp $      */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Include file for extended precision arithmetic programs.
- */
-
-/* Number of 16 bit words in external x type format */
-#define NE 10
-
-/* Number of 16 bit words in internal format */
-#define NI (NE+3)
-
-/* Array offset to exponent */
-#define E 1
-
-/* Array offset to high guard word */
-#define M 2
-
-/* Number of bits of precision */
-#define NBITS ((NI-4)*16)
-
-/* Maximum number of decimal digits in ASCII conversion
- * = NBITS*log10(2)
- */
-#define NDEC (NBITS*8/27)
-
-/* The exponent of 1.0 */
-#define EXONE (0x3fff)
-
-void eadd(), esub(), emul(), ediv();
-int ecmp(), enormlz(), eshift();
-void eshup1(), eshup8(), eshup6(), eshdn1(), eshdn8(), eshdn6();
-void eabs(), eneg(), emov(), eclear(), einfin(), efloor();
-void eldexp(), efrexp(), eifrac(), ltoe();
-void esqrt(), elog(), eexp(), etanh(), epow();
-void asctoe(), asctoe24(), asctoe53(), asctoe64();
-void etoasc(), e24toasc(), e53toasc(), e64toasc();
-void etoe64(), etoe53(), etoe24(), e64toe(), e53toe(), e24toe();
-int mtherr();
-extern unsigned short ezero[], ehalf[], eone[], etwo[];
-extern unsigned short elog2[], esqrt2[];
-
-
-/* by Stephen L. Moshier. */
diff --git a/src/regress/lib/libc/cephes/elog.c b/src/regress/lib/libc/cephes/elog.c
deleted file mode 100644
index 079cc754f4..0000000000
--- a/src/regress/lib/libc/cephes/elog.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*      $OpenBSD: elog.c,v 1.1 2011/07/02 18:11:01 martynas Exp $       */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                              xlog.c  */
-/* natural logarithm */
-/* by Stephen L. Moshier. */
-
-#include "mconf.h"
-#include "ehead.h"
-
-
-
-void elog( x, y )
-unsigned short *x, *y;
-{
-unsigned short xx[NE], z[NE], a[NE], b[NE], t[NE], qj[NE];
-long ex;
-int fex;
-
-
-if( x[NE-1] & (unsigned short )0x8000 )
-        {
-        eclear(y);
-        mtherr( "elog", DOMAIN );
-        return;
-        }
-if( ecmp( x, ezero ) == 0 )
-        {
-        einfin( y );
-        eneg(y);
-        mtherr( "elog", SING );
-        return;
-        }
-if( ecmp( x, eone ) == 0 )
-        {
-        eclear( y );
-        return;
-        }
-
-/* range reduction: log x = log( 2**ex * m ) = ex * log2 + log m */
-efrexp( x, &fex, xx );
-/*
-emov(x, xx );
-ex = xx[NX-1] & 0x7fff;
-ex -= 0x3ffe;
-xx[NX-1] = 0x3ffe;
-*/
-
-/* Adjust range to 1/sqrt(2), sqrt(2) */
-esqrt2[NE-1] -= 1;
-if( ecmp( xx, esqrt2 ) < 0 )
-        {
-        fex -= 1;
-        emul( xx, etwo, xx );
-        }
-esqrt2[NE-1] += 1;
-
-esub( eone, xx, a );
-if( a[NE-1] == 0 )
-        {
-        eclear( y );
-        goto logdon;
-        }
-eadd( eone, xx, b );
-ediv( b, a, y );        /* store (x-1)/(x+1) in y */
-
-emul( y, y, z );
-
-emov( eone, a );
-emov( eone, b );
-emov( eone, qj );
-do
-        {
-        eadd( etwo, qj, qj );   /* 2 * i + 1            */
-        emul( z, a, a );
-        ediv( qj, a, t );
-        eadd( t, b, b );
-        }
-while( ((b[NE-1] & 0x7fff) - (t[NE-1] & 0x7fff)) < NBITS );
-
-
-emul( b, y, y );
-emul( y, etwo, y );
-
-logdon:
-
-/* now add log of 2**ex */
-if( fex != 0 )
-        {
-        ex = fex;
-        ltoe( &ex, b );
-        emul( elog2, b, b );
-        eadd( b, y, y );
-        }
-}
diff --git a/src/regress/lib/libc/cephes/epow.c b/src/regress/lib/libc/cephes/epow.c
deleted file mode 100644
index 646268fce7..0000000000
--- a/src/regress/lib/libc/cephes/epow.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*      $OpenBSD: epow.c,v 1.1 2011/07/02 18:11:01 martynas Exp $       */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                              epow.c  */
-/*  power function: z = x**y */
-/*  by Stephen L. Moshier. */
-
-
-#include "ehead.h"
-
-extern int rndprc;
-void epowi();
-
-void epow( x, y, z )
-unsigned short *x, *y, *z;
-{
-unsigned short w[NE];
-int rndsav;
-long li;
-
-efloor( y, w );
-if( ecmp(y,w) == 0 )
-        {
-        eifrac( y, &li, w );
-        if( li < 0 )
-                li = -li;
-        if( (li < 0x7fffffff) && (li != 0x80000000) )
-                {
-                epowi( x, y, z );
-                return;
-                }
-        }
-/* z = exp( y * log(x) ) */
-rndsav = rndprc;
-rndprc = NBITS;
-elog( x, w );
-emul( y, w, w );
-eexp( w, z );
-rndprc = rndsav;
-emul( eone, z, z );
-}
-
-
-/* y is integer valued. */
-
-void epowi( x, y, z )
-unsigned short x[], y[], z[];
-{
-unsigned short w[NE];
-long li, lx;
-unsigned long lu;
-int rndsav;
-unsigned short signx;
-/* unsigned short signy; */
-
-rndsav = rndprc;
-eifrac( y, &li, w );
-if( li < 0 )
-        lx = -li;
-else
-        lx = li;
-
-if( (lx == 0x7fffffff) || (lx == 0x80000000) )
-        {
-        epow( x, y, z );
-        goto done;
-        }
-
-if( (x[NE-1] & (unsigned short )0x7fff) == 0 )
-        {
-        if( li == 0 )
-                {
-                emov( eone, z );
-                return;
-                }
-        else if( li < 0 )
-                {
-                einfin( z );
-                return;
-                }
-        else
-                {
-                eclear( z );
-                return;
-                }
-        }
-
-if( li == 0L )
-        {
-        emov( eone, z );
-        return;
-        }
-
-emov( x, w );
-signx = w[NE-1] & (unsigned short )0x8000;
-w[NE-1] &= (unsigned short )0x7fff;
-
-/* Overflow detection */
-/*
-lx = li * (w[NE-1] - 0x3fff);
-if( lx > 16385L )
-        {
-        einfin( z );
-        mtherr( "epowi", OVERFLOW );
-        goto done;
-        }
-if( lx < -16450L )
-        {
-        eclear( z );
-        return;
-        }
-*/
-rndprc = NBITS;
-
-if( li < 0 )
-        {
-        lu = (unsigned int )( -li );
-/*      signy = 0xffff;*/
-        ediv( w, eone, w );
-        }
-else
-        {
-        lu = (unsigned int )li;
-/*      signy = 0;*/
-        }
-
-/* First bit of the power */
-if( lu & 1 )
-        {
-        emov( w, z );
-        }       
-else
-        {
-        emov( eone, z );
-        signx = 0;
-        }
-
-
-lu >>= 1;
-while( lu != 0L )
-        {
-        emul( w, w, w );        /* arg to the 2-to-the-kth power */
-        if( lu & 1L )   /* if that bit is set, then include in product */
-                emul( w, z, z );
-        lu >>= 1;
-        }
-
-
-done:
-
-if( signx )
-        eneg( z ); /* odd power of negative number */
-
-/*
-if( signy )
-        {
-        if( ecmp( z, ezero ) != 0 )
-                {
-                ediv( z, eone, z );
-                }
-        else
-                {
-                einfin( z );
-                printf( "epowi OVERFLOW\n" );
-                }
-        }
-*/
-rndprc = rndsav;
-emul( eone, z, z );
-}
-
-
diff --git a/src/regress/lib/libc/cephes/etanh.c b/src/regress/lib/libc/cephes/etanh.c
deleted file mode 100644
index 4ac5ff1c21..0000000000
--- a/src/regress/lib/libc/cephes/etanh.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*      $OpenBSD: etanh.c,v 1.1 2011/07/02 18:11:01 martynas Exp $      */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                                      xtanh.c         */
-/* hyperbolic tangent check routine */
-/* this subroutine is used by the exponential function routine */
-/* by Stephen L. Moshier. */
-
-
-
-#include "ehead.h"
-
-
-void etanh( x, y )
-unsigned short *x, *y;
-{
-unsigned short e[NE], r[NE], j[NE], xx[NE], m2[NE];
-short i, n;
-long lj;
-
-emov( x, r );
-r[NE-1] &= (unsigned short )0x7fff;
-if( ecmp(r, eone) >= 0 )
-        {
-/* tanh(x) = (exp(x) - exp(-x)) / (exp(x) + exp(-x))
- * Note eexp() calls xtanh, but with an argument less than (1 + log 2)/2.
- */
-        eexp( r, e );
-        ediv( e, eone, r );
-        esub( r, e, xx );
-        eadd( r, e, j );
-        ediv( j, xx, y );
-        return;
-        }
-
-emov( etwo, m2 );
-eneg( m2 );
-
-n = NBITS/8;    /* Number of terms to do in the continued fraction */
-lj = 2 * n + 1;
-ltoe( &lj, j );
-
-emov( j, e );
-emul( x, x, xx );
-
-/* continued fraction */
-for( i=0; i<n; i++)
-        {
-        ediv( e, xx, r );
-        eadd( m2, j, j );
-        eadd( r, j, e );
-        }
-
-ediv( e, x, y );
-}
diff --git a/src/regress/lib/libc/cephes/etodec.c b/src/regress/lib/libc/cephes/etodec.c
deleted file mode 100644
index a15845efb6..0000000000
--- a/src/regress/lib/libc/cephes/etodec.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*      $OpenBSD: etodec.c,v 1.1 2011/07/02 18:11:01 martynas Exp $     */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ehead.h"
-void emovi(), emovo(), ecleaz(), eshdn8(), emdnorm();
-void todec();
-/*
-;       convert DEC double precision to e type
-;       double d;
-;       short e[NE];
-;       dectoe( &d, e );
-*/
-void dectoe( d, e )
-unsigned short *d;
-unsigned short *e;
-{
-unsigned short y[NI];
-register unsigned short r, *p;
-
-ecleaz(y);              /* start with a zero */
-p = y;                  /* point to our number */
-r = *d;                 /* get DEC exponent word */
-if( *d & (unsigned int )0x8000 )
-        *p = 0xffff;    /* fill in our sign */
-++p;                    /* bump pointer to our exponent word */
-r &= 0x7fff;            /* strip the sign bit */
-if( r == 0 )            /* answer = 0 if high order DEC word = 0 */
-        goto done;
-
-
-r >>= 7;        /* shift exponent word down 7 bits */
-r += EXONE - 0201;      /* subtract DEC exponent offset */
-                        /* add our e type exponent offset */
-*p++ = r;       /* to form our exponent */
-
-r = *d++;       /* now do the high order mantissa */
-r &= 0177;      /* strip off the DEC exponent and sign bits */
-r |= 0200;      /* the DEC understood high order mantissa bit */
-*p++ = r;       /* put result in our high guard word */
-
-*p++ = *d++;    /* fill in the rest of our mantissa */
-*p++ = *d++;
-*p = *d;
-
-eshdn8(y);      /* shift our mantissa down 8 bits */
-done:
-emovo( y, e );
-}
-
-
-
-/*
-;       convert e type to DEC double precision
-;       double d;
-;       short e[NE];
-;       etodec( e, &d );
-*/
-#if 0
-static unsigned short decbit[NI] = {0,0,0,0,0,0,0200,0};
-void etodec( x, d )
-unsigned short *x, *d;
-{
-unsigned short xi[NI];
-register unsigned short r;
-int i, j;
-
-emovi( x, xi );
-*d = 0;
-if( xi[0] != 0 )
-        *d = 0100000;
-r = xi[E];
-if( r < (EXONE - 128) )
-        goto zout;
-i = xi[M+4];
-if( (i & 0200) != 0 )
-        {
-        if( (i & 0377) == 0200 )
-                {
-                if( (i & 0400) != 0 )
-                        {
-                /* check all less significant bits */
-                        for( j=M+5; j<NI; j++ )
-                                {
-                                if( xi[j] != 0 )
-                                        goto yesrnd;
-                                }
-                        }
-                goto nornd;
-                }
-yesrnd:
-        eaddm( decbit, xi );
-        r -= enormlz(xi);
-        }
-
-nornd:
-
-r -= EXONE;
-r += 0201;
-if( r < 0 )
-        {
-zout:
-        *d++ = 0;
-        *d++ = 0;
-        *d++ = 0;
-        *d++ = 0;
-        return;
-        }
-if( r >= 0377 )
-        {
-        *d++ = 077777;
-        *d++ = -1;
-        *d++ = -1;
-        *d++ = -1;
-        return;
-        }
-r &= 0377;
-r <<= 7;
-eshup8( xi );
-xi[M] &= 0177;
-r |= xi[M];
-*d++ |= r;
-*d++ = xi[M+1];
-*d++ = xi[M+2];
-*d++ = xi[M+3];
-}
-#else
-
-extern int rndprc;
-
-void etodec( x, d )
-unsigned short *x, *d;
-{
-unsigned short xi[NI];
-long exp;
-int rndsav;
-
-emovi( x, xi );
-exp = (long )xi[E] - (EXONE - 0201); /* adjust exponent for offsets */
-/* round off to nearest or even */
-rndsav = rndprc;
-rndprc = 56;
-emdnorm( xi, 0, 0, exp, 64 );
-rndprc = rndsav;
-todec( xi, d );
-}
-
-void todec( x, y )
-unsigned short *x, *y;
-{
-unsigned short i;
-unsigned short *p;
-
-p = x;
-*y = 0;
-if( *p++ )
-        *y = 0100000;
-i = *p++;
-if( i == 0 )
-        {
-        *y++ = 0;
-        *y++ = 0;
-        *y++ = 0;
-        *y++ = 0;
-        return;
-        }
-if( i > 0377 )
-        {
-        *y++ |= 077777;
-        *y++ = 0xffff;
-        *y++ = 0xffff;
-        *y++ = 0xffff;
-        return;
-        }
-i &= 0377;
-i <<= 7;
-eshup8( x );
-x[M] &= 0177;
-i |= x[M];
-*y++ |= i;
-*y++ = x[M+1];
-*y++ = x[M+2];
-*y++ = x[M+3];
-}
-#endif
diff --git a/src/regress/lib/libc/cephes/ieee.c b/src/regress/lib/libc/cephes/ieee.c
deleted file mode 100644
index e2b8aa7b99..0000000000
--- a/src/regress/lib/libc/cephes/ieee.c
+++ /dev/null
@@ -1,4153 +0,0 @@
-/*      $OpenBSD: ieee.c,v 1.1 2011/07/02 18:11:01 martynas Exp $       */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                                      ieee.c
- *
- *    Extended precision IEEE binary floating point arithmetic routines
- *
- * Numbers are stored in C language as arrays of 16-bit unsigned
- * short integers.  The arguments of the routines are pointers to
- * the arrays.
- *
- *
- * External e type data structure, simulates Intel 8087 chip
- * temporary real format but possibly with a larger significand:
- *
- *      NE-1 significand words  (least significant word first,
- *                               most significant bit is normally set)
- *      exponent                (value = EXONE for 1.0,
- *                              top bit is the sign)
- *
- *
- * Internal data structure of a number (a "word" is 16 bits):
- *
- * ei[0]        sign word       (0 for positive, 0xffff for negative)
- * ei[1]        biased exponent (value = EXONE for the number 1.0)
- * ei[2]        high guard word (always zero after normalization)
- * ei[3]
- * to ei[NI-2]  significand     (NI-4 significand words,
- *                               most significant word first,
- *                               most significant bit is set)
- * ei[NI-1]     low guard word  (0x8000 bit is rounding place)
- *
- *
- *
- *              Routines for external format numbers
- *
- *      asctoe( string, e )     ASCII string to extended double e type
- *      asctoe64( string, &d )  ASCII string to long double
- *      asctoe53( string, &d )  ASCII string to double
- *      asctoe24( string, &f )  ASCII string to single
- *      asctoeg( string, e, prec ) ASCII string to specified precision
- *      e24toe( &f, e )         IEEE single precision to e type
- *      e53toe( &d, e )         IEEE double precision to e type
- *      e64toe( &d, e )         IEEE long double precision to e type
- *      eabs(e)                 absolute value
- *      eadd( a, b, c )         c = b + a
- *      eclear(e)               e = 0
- *      ecmp (a, b)             Returns 1 if a > b, 0 if a == b,
- *                              -1 if a < b, -2 if either a or b is a NaN.
- *      ediv( a, b, c )         c = b / a
- *      efloor( a, b )          truncate to integer, toward -infinity
- *      efrexp( a, exp, s )     extract exponent and significand
- *      eifrac( e, &l, frac )   e to long integer and e type fraction
- *      euifrac( e, &l, frac )  e to unsigned long integer and e type fraction
- *      einfin( e )             set e to infinity, leaving its sign alone
- *      eldexp( a, n, b )       multiply by 2**n
- *      emov( a, b )            b = a
- *      emul( a, b, c )         c = b * a
- *      eneg(e)                 e = -e
- *      eround( a, b )          b = nearest integer value to a
- *      esub( a, b, c )         c = b - a
- *      e24toasc( &f, str, n )  single to ASCII string, n digits after decimal
- *      e53toasc( &d, str, n )  double to ASCII string, n digits after decimal
- *      e64toasc( &d, str, n )  long double to ASCII string
- *      etoasc( e, str, n )     e to ASCII string, n digits after decimal
- *      etoe24( e, &f )         convert e type to IEEE single precision
- *      etoe53( e, &d )         convert e type to IEEE double precision
- *      etoe64( e, &d )         convert e type to IEEE long double precision
- *      ltoe( &l, e )           long (32 bit) integer to e type
- *      ultoe( &l, e )          unsigned long (32 bit) integer to e type
- *      eisneg( e )             1 if sign bit of e != 0, else 0
- *      eisinf( e )             1 if e has maximum exponent (non-IEEE)
- *                              or is infinite (IEEE)
- *      eisnan( e )             1 if e is a NaN
- *      esqrt( a, b )           b = square root of a
- *
- *
- *              Routines for internal format numbers
- *
- *      eaddm( ai, bi )         add significands, bi = bi + ai
- *      ecleaz(ei)              ei = 0
- *      ecleazs(ei)             set ei = 0 but leave its sign alone
- *      ecmpm( ai, bi )         compare significands, return 1, 0, or -1
- *      edivm( ai, bi )         divide  significands, bi = bi / ai
- *      emdnorm(ai,l,s,exp)     normalize and round off
- *      emovi( a, ai )          convert external a to internal ai
- *      emovo( ai, a )          convert internal ai to external a
- *      emovz( ai, bi )         bi = ai, low guard word of bi = 0
- *      emulm( ai, bi )         multiply significands, bi = bi * ai
- *      enormlz(ei)             left-justify the significand
- *      eshdn1( ai )            shift significand and guards down 1 bit
- *      eshdn8( ai )            shift down 8 bits
- *      eshdn6( ai )            shift down 16 bits
- *      eshift( ai, n )         shift ai n bits up (or down if n < 0)
- *      eshup1( ai )            shift significand and guards up 1 bit
- *      eshup8( ai )            shift up 8 bits
- *      eshup6( ai )            shift up 16 bits
- *      esubm( ai, bi )         subtract significands, bi = bi - ai
- *
- *
- * The result is always normalized and rounded to NI-4 word precision
- * after each arithmetic operation.
- *
- * Exception flags are NOT fully supported.
- *
- * Define INFINITY in mconf.h for support of infinity; otherwise a
- * saturation arithmetic is implemented.
- *
- * Define NANS for support of Not-a-Number items; otherwise the
- * arithmetic will never produce a NaN output, and might be confused
- * by a NaN input.
- * If NaN's are supported, the output of ecmp(a,b) is -2 if
- * either a or b is a NaN. This means asking if(ecmp(a,b) < 0)
- * may not be legitimate. Use if(ecmp(a,b) == -1) for less-than
- * if in doubt.
- * Signaling NaN's are NOT supported; they are treated the same
- * as quiet NaN's.
- *
- * Denormals are always supported here where appropriate (e.g., not
- * for conversion to DEC numbers).
- */
-
-/*
- * Revision history:
- *
- *  5 Jan 84    PDP-11 assembly language version
- *  2 Mar 86    fixed bug in asctoq()
- *  6 Dec 86    C language version
- * 30 Aug 88    100 digit version, improved rounding
- * 15 May 92    80-bit long double support
- *
- * Author:  S. L. Moshier.
- */
-
-#include <stdio.h>
-#include "mconf.h"
-#include "ehead.h"
-
-/* Change UNK into something else. */
-#ifdef UNK
-#undef UNK
-#if BIGENDIAN
-#define MIEEE 1
-#else
-#define IBMPC 1
-#endif
-#endif
-
-/* NaN's require infinity support. */
-#ifdef NANS
-#ifndef INFINITY
-#define INFINITY
-#endif
-#endif
-
-/* This handles 64-bit long ints. */
-#define LONGBITS (8 * sizeof(long))
-
-/* Control register for rounding precision.
- * This can be set to 80 (if NE=6), 64, 56, 53, or 24 bits.
- */
-int rndprc = NBITS;
-extern int rndprc;
-
-void eaddm(), esubm(), emdnorm(), asctoeg(), enan();
-static void toe24(), toe53(), toe64(), toe113();
-void eremain(), einit(), eiremain();
-int ecmpm(), edivm(), emulm(), eisneg(), eisinf();
-void emovi(), emovo(), emovz(), ecleaz(), eadd1();
-void etodec(), todec(), dectoe();
-int eisnan(), eiisnan();
-
-
-
-void einit()
-{
-}
-
-/*
-; Clear out entire external format number.
-;
-; unsigned short x[];
-; eclear( x );
-*/
-
-void eclear( x )
-register unsigned short *x;
-{
-register int i;
-
-for( i=0; i<NE; i++ )
-        *x++ = 0;
-}
-
-
-
-/* Move external format number from a to b.
- *
- * emov( a, b );
- */
-
-void emov( a, b )
-register unsigned short *a, *b;
-{
-register int i;
-
-for( i=0; i<NE; i++ )
-        *b++ = *a++;
-}
-
-
-/*
-;       Absolute value of external format number
-;
-;       short x[NE];
-;       eabs( x );
-*/
-
-void eabs(x)
-unsigned short x[];     /* x is the memory address of a short */
-{
-
-x[NE-1] &= 0x7fff; /* sign is top bit of last word of external format */
-}
-
-
-
-
-/*
-;       Negate external format number
-;
-;       unsigned short x[NE];
-;       eneg( x );
-*/
-
-void eneg(x)
-unsigned short x[];
-{
-
-#ifdef NANS
-if( eisnan(x) )
-        return;
-#endif
-x[NE-1] ^= 0x8000; /* Toggle the sign bit */
-}
-
-
-
-/* Return 1 if external format number is negative,
- * else return zero.
- */
-int eisneg(x)
-unsigned short x[];
-{
-
-#ifdef NANS
-if( eisnan(x) )
-        return( 0 );
-#endif
-if( x[NE-1] & 0x8000 )
-        return( 1 );
-else
-        return( 0 );
-}
-
-
-/* Return 1 if external format number has maximum possible exponent,
- * else return zero.
- */
-int eisinf(x)
-unsigned short x[];
-{
-
-if( (x[NE-1] & 0x7fff) == 0x7fff )
-        {
-#ifdef NANS
-        if( eisnan(x) )
-                return( 0 );
-#endif
-        return( 1 );
-        }
-else
-        return( 0 );
-}
-
-/* Check if e-type number is not a number.
- */
-int eisnan(x)
-unsigned short x[];
-{
-
-#ifdef NANS
-int i;
-/* NaN has maximum exponent */
-if( (x[NE-1] & 0x7fff) != 0x7fff )
-        return (0);
-/* ... and non-zero significand field. */
-for( i=0; i<NE-1; i++ )
-        {
-        if( *x++ != 0 )
-                return (1);
-        }
-#endif
-return (0);
-}
-
-/*
-; Fill entire number, including exponent and significand, with
-; largest possible number.  These programs implement a saturation
-; value that is an ordinary, legal number.  A special value
-; "infinity" may also be implemented; this would require tests
-; for that value and implementation of special rules for arithmetic
-; operations involving inifinity.
-*/
-
-void einfin(x)
-register unsigned short *x;
-{
-register int i;
-
-#ifdef INFINITY
-for( i=0; i<NE-1; i++ )
-        *x++ = 0;
-*x |= 32767;
-#else
-for( i=0; i<NE-1; i++ )
-        *x++ = 0xffff;
-*x |= 32766;
-if( rndprc < NBITS )
-        {
-        if (rndprc == 113)
-                {
-                *(x - 9) = 0;
-                *(x - 8) = 0;
-                }
-        if( rndprc == 64 )
-                {
-                *(x-5) = 0;
-                }
-        if( rndprc == 53 )
-                {
-                *(x-4) = 0xf800;
-                }
-        else
-                {
-                *(x-4) = 0;
-                *(x-3) = 0;
-                *(x-2) = 0xff00;
-                }
-        }
-#endif
-}
-
-
-
-/* Move in external format number,
- * converting it to internal format.
- */
-void emovi( a, b )
-unsigned short *a, *b;
-{
-register unsigned short *p, *q;
-int i;
-
-q = b;
-p = a + (NE-1); /* point to last word of external number */
-/* get the sign bit */
-if( *p & 0x8000 )
-        *q++ = 0xffff;
-else
-        *q++ = 0;
-/* get the exponent */
-*q = *p--;
-*q++ &= 0x7fff; /* delete the sign bit */
-#ifdef INFINITY
-if( (*(q-1) & 0x7fff) == 0x7fff )
-        {
-#ifdef NANS
-        if( eisnan(a) )
-                {
-                *q++ = 0;
-                for( i=3; i<NI; i++ )
-                        *q++ = *p--;
-                return;
-                }
-#endif
-        for( i=2; i<NI; i++ )
-                *q++ = 0;
-        return;
-        }
-#endif
-/* clear high guard word */
-*q++ = 0;
-/* move in the significand */
-for( i=0; i<NE-1; i++ )
-        *q++ = *p--;
-/* clear low guard word */
-*q = 0;
-}
-
-
-/* Move internal format number out,
- * converting it to external format.
- */
-void emovo( a, b )
-unsigned short *a, *b;
-{
-register unsigned short *p, *q;
-unsigned short i;
-
-p = a;
-q = b + (NE-1); /* point to output exponent */
-/* combine sign and exponent */
-i = *p++;
-if( i )
-        *q-- = *p++ | 0x8000;
-else
-        *q-- = *p++;
-#ifdef INFINITY
-if( *(p-1) == 0x7fff )
-        {
-#ifdef NANS
-        if( eiisnan(a) )
-                {
-                enan( b, NBITS );
-                return;
-                }
-#endif
-        einfin(b);
-        return;
-        }
-#endif
-/* skip over guard word */
-++p;
-/* move the significand */
-for( i=0; i<NE-1; i++ )
-        *q-- = *p++;
-}
-
-
-
-
-/* Clear out internal format number.
- */
-
-void ecleaz( xi )
-register unsigned short *xi;
-{
-register int i;
-
-for( i=0; i<NI; i++ )
-        *xi++ = 0;
-}
-
-/* same, but don't touch the sign. */
-
-void ecleazs( xi )
-register unsigned short *xi;
-{
-register int i;
-
-++xi;
-for(i=0; i<NI-1; i++)
-        *xi++ = 0;
-}
-
-
-
-
-/* Move internal format number from a to b.
- */
-void emovz( a, b )
-register unsigned short *a, *b;
-{
-register int i;
-
-for( i=0; i<NI-1; i++ )
-        *b++ = *a++;
-/* clear low guard word */
-*b = 0;
-}
-
-/* Return nonzero if internal format number is a NaN.
- */
-
-int eiisnan (x)
-unsigned short x[];
-{
-int i;
-
-if( (x[E] & 0x7fff) == 0x7fff )
-        {
-        for( i=M+1; i<NI; i++ )
-                {
-                if( x[i] != 0 )
-                        return(1);
-                }
-        }
-return(0);
-}
-
-#ifdef INFINITY
-/* Return nonzero if internal format number is infinite. */
-
-static int 
-eiisinf (x)
-     unsigned short x[];
-{
-
-#ifdef NANS
-  if (eiisnan (x))
-    return (0);
-#endif
-  if ((x[E] & 0x7fff) == 0x7fff)
-    return (1);
-  return (0);
-}
-#endif
-
-/*
-;       Compare significands of numbers in internal format.
-;       Guard words are included in the comparison.
-;
-;       unsigned short a[NI], b[NI];
-;       cmpm( a, b );
-;
-;       for the significands:
-;       returns +1 if a > b
-;                0 if a == b
-;               -1 if a < b
-*/
-int ecmpm( a, b )
-register unsigned short *a, *b;
-{
-int i;
-
-a += M; /* skip up to significand area */
-b += M;
-for( i=M; i<NI; i++ )
-        {
-        if( *a++ != *b++ )
-                goto difrnt;
-        }
-return(0);
-
-difrnt:
-if( *(--a) > *(--b) )
-        return(1);
-else
-        return(-1);
-}
-
-
-/*
-;       Shift significand down by 1 bit
-*/
-
-void eshdn1(x)
-register unsigned short *x;
-{
-register unsigned short bits;
-int i;
-
-x += M; /* point to significand area */
-
-bits = 0;
-for( i=M; i<NI; i++ )
-        {
-        if( *x & 1 )
-                bits |= 1;
-        *x >>= 1;
-        if( bits & 2 )
-                *x |= 0x8000;
-        bits <<= 1;
-        ++x;
-        }       
-}
-
-
-
-/*
-;       Shift significand up by 1 bit
-*/
-
-void eshup1(x)
-register unsigned short *x;
-{
-register unsigned short bits;
-int i;
-
-x += NI-1;
-bits = 0;
-
-for( i=M; i<NI; i++ )
-        {
-        if( *x & 0x8000 )
-                bits |= 1;
-        *x <<= 1;
-        if( bits & 2 )
-                *x |= 1;
-        bits <<= 1;
-        --x;
-        }
-}
-
-
-
-/*
-;       Shift significand down by 8 bits
-*/
-
-void eshdn8(x)
-register unsigned short *x;
-{
-register unsigned short newbyt, oldbyt;
-int i;
-
-x += M;
-oldbyt = 0;
-for( i=M; i<NI; i++ )
-        {
-        newbyt = *x << 8;
-        *x >>= 8;
-        *x |= oldbyt;
-        oldbyt = newbyt;
-        ++x;
-        }
-}
-
-/*
-;       Shift significand up by 8 bits
-*/
-
-void eshup8(x)
-register unsigned short *x;
-{
-int i;
-register unsigned short newbyt, oldbyt;
-
-x += NI-1;
-oldbyt = 0;
-
-for( i=M; i<NI; i++ )
-        {
-        newbyt = *x >> 8;
-        *x <<= 8;
-        *x |= oldbyt;
-        oldbyt = newbyt;
-        --x;
-        }
-}
-
-/*
-;       Shift significand up by 16 bits
-*/
-
-void eshup6(x)
-register unsigned short *x;
-{
-int i;
-register unsigned short *p;
-
-p = x + M;
-x += M + 1;
-
-for( i=M; i<NI-1; i++ )
-        *p++ = *x++;
-
-*p = 0;
-}
-
-/*
-;       Shift significand down by 16 bits
-*/
-
-void eshdn6(x)
-register unsigned short *x;
-{
-int i;
-register unsigned short *p;
-
-x += NI-1;
-p = x + 1;
-
-for( i=M; i<NI-1; i++ )
-        *(--p) = *(--x);
-
-*(--p) = 0;
-}
-
-/*
-;       Add significands
-;       x + y replaces y
-*/
-
-void eaddm( x, y )
-unsigned short *x, *y;
-{
-register unsigned long a;
-int i;
-unsigned int carry;
-
-x += NI-1;
-y += NI-1;
-carry = 0;
-for( i=M; i<NI; i++ )
-        {
-        a = (unsigned long )(*x) + (unsigned long )(*y) + carry;
-        if( a & 0x10000 )
-                carry = 1;
-        else
-                carry = 0;
-        *y = (unsigned short )a;
-        --x;
-        --y;
-        }
-}
-
-/*
-;       Subtract significands
-;       y - x replaces y
-*/
-
-void esubm( x, y )
-unsigned short *x, *y;
-{
-unsigned long a;
-int i;
-unsigned int carry;
-
-x += NI-1;
-y += NI-1;
-carry = 0;
-for( i=M; i<NI; i++ )
-        {
-        a = (unsigned long )(*y) - (unsigned long )(*x) - carry;
-        if( a & 0x10000 )
-                carry = 1;
-        else
-                carry = 0;
-        *y = (unsigned short )a;
-        --x;
-        --y;
-        }
-}
-
-
-/* Divide significands */
-
-static unsigned short equot[NI] = {0}; /* was static */
-
-#if 0
-int edivm( den, num )
-unsigned short den[], num[];
-{
-int i;
-register unsigned short *p, *q;
-unsigned short j;
-
-p = &equot[0];
-*p++ = num[0];
-*p++ = num[1];
-
-for( i=M; i<NI; i++ )
-        {
-        *p++ = 0;
-        }
-
-/* Use faster compare and subtraction if denominator
- * has only 15 bits of significance.
- */
-p = &den[M+2];
-if( *p++ == 0 )
-        {
-        for( i=M+3; i<NI; i++ )
-                {
-                if( *p++ != 0 )
-                        goto fulldiv;
-                }
-        if( (den[M+1] & 1) != 0 )
-                goto fulldiv;
-        eshdn1(num);
-        eshdn1(den);
-
-        p = &den[M+1];
-        q = &num[M+1];
-
-        for( i=0; i<NBITS+2; i++ )
-                {
-                if( *p <= *q )
-                        {
-                        *q -= *p;
-                        j = 1;
-                        }
-                else
-                        {
-                        j = 0;
-                        }
-                eshup1(equot);
-                equot[NI-2] |= j;
-                eshup1(num);
-                }
-        goto divdon;
-        }
-
-/* The number of quotient bits to calculate is
- * NBITS + 1 scaling guard bit + 1 roundoff bit.
- */
-fulldiv:
-
-p = &equot[NI-2];
-for( i=0; i<NBITS+2; i++ )
-        {
-        if( ecmpm(den,num) <= 0 )
-                {
-                esubm(den, num);
-                j = 1;  /* quotient bit = 1 */
-                }
-        else
-                j = 0;
-        eshup1(equot);
-        *p |= j;
-        eshup1(num);
-        }
-
-divdon:
-
-eshdn1( equot );
-eshdn1( equot );
-
-/* test for nonzero remainder after roundoff bit */
-p = &num[M];
-j = 0;
-for( i=M; i<NI; i++ )
-        {
-        j |= *p++;
-        }
-if( j )
-        j = 1;
-
-
-for( i=0; i<NI; i++ )
-        num[i] = equot[i];
-return( (int )j );
-}
-
-/* Multiply significands */
-int emulm( a, b )
-unsigned short a[], b[];
-{
-unsigned short *p, *q;
-int i, j, k;
-
-equot[0] = b[0];
-equot[1] = b[1];
-for( i=M; i<NI; i++ )
-        equot[i] = 0;
-
-p = &a[NI-2];
-k = NBITS;
-while( *p == 0 ) /* significand is not supposed to be all zero */
-        {
-        eshdn6(a);
-        k -= 16;
-        }
-if( (*p & 0xff) == 0 )
-        {
-        eshdn8(a);
-        k -= 8;
-        }
-
-q = &equot[NI-1];
-j = 0;
-for( i=0; i<k; i++ )
-        {
-        if( *p & 1 )
-                eaddm(b, equot);
-/* remember if there were any nonzero bits shifted out */
-        if( *q & 1 )
-                j |= 1;
-        eshdn1(a);
-        eshdn1(equot);
-        }
-
-for( i=0; i<NI; i++ )
-        b[i] = equot[i];
-
-/* return flag for lost nonzero bits */
-return(j);
-}
-
-#else
-
-/* Multiply significand of e-type number b
-by 16-bit quantity a, e-type result to c. */
-
-void m16m( a, b, c )
-unsigned short a;
-unsigned short b[], c[];
-{
-register unsigned short *pp;
-register unsigned long carry;
-unsigned short *ps;
-unsigned short p[NI];
-unsigned long aa, m;
-int i;
-
-aa = a;
-pp = &p[NI-2];
-*pp++ = 0;
-*pp = 0;
-ps = &b[NI-1];
-
-for( i=M+1; i<NI; i++ )
-        {
-        if( *ps == 0 )
-                {
-                --ps;
-                --pp;
-                *(pp-1) = 0;
-                }
-        else
-                {
-                m = (unsigned long) aa * *ps--;
-                carry = (m & 0xffff) + *pp;
-                *pp-- = (unsigned short )carry;
-                carry = (carry >> 16) + (m >> 16) + *pp;
-                *pp = (unsigned short )carry;
-                *(pp-1) = carry >> 16;
-                }
-        }
-for( i=M; i<NI; i++ )
-        c[i] = p[i];
-}
-
-
-/* Divide significands. Neither the numerator nor the denominator
-is permitted to have its high guard word nonzero.  */
-
-
-int edivm( den, num )
-unsigned short den[], num[];
-{
-int i;
-register unsigned short *p;
-unsigned long tnum;
-unsigned short j, tdenm, tquot;
-unsigned short tprod[NI+1];
-
-p = &equot[0];
-*p++ = num[0];
-*p++ = num[1];
-
-for( i=M; i<NI; i++ )
-        {
-        *p++ = 0;
-        }
-eshdn1( num );
-tdenm = den[M+1];
-for( i=M; i<NI; i++ )
-        {
-        /* Find trial quotient digit (the radix is 65536). */
-        tnum = (((unsigned long) num[M]) << 16) + num[M+1];
-
-        /* Do not execute the divide instruction if it will overflow. */
-        if( (tdenm * 0xffffL) < tnum )
-                tquot = 0xffff;
-        else
-                tquot = tnum / tdenm;
-
-                /* Prove that the divide worked. */
-/*
-        tcheck = (unsigned long )tquot * tdenm;
-        if( tnum - tcheck > tdenm )
-                tquot = 0xffff;
-*/
-        /* Multiply denominator by trial quotient digit. */
-        m16m( tquot, den, tprod );
-        /* The quotient digit may have been overestimated. */
-        if( ecmpm( tprod, num ) > 0 )
-                {
-                tquot -= 1;
-                esubm( den, tprod );
-                if( ecmpm( tprod, num ) > 0 )
-                        {
-                        tquot -= 1;
-                        esubm( den, tprod );
-                        }
-                }
-/*
-        if( ecmpm( tprod, num ) > 0 )
-                {
-                eshow( "tprod", tprod );
-                eshow( "num  ", num );
-                printf( "tnum = %08lx, tden = %04x, tquot = %04x\n",
-                         tnum, den[M+1], tquot );
-                }
-*/
-        esubm( tprod, num );
-/*
-        if( ecmpm( num, den ) >= 0 )
-                {
-                eshow( "num  ", num );
-                eshow( "den  ", den );
-                printf( "tnum = %08lx, tden = %04x, tquot = %04x\n",
-                         tnum, den[M+1], tquot );
-                }
-*/
-        equot[i] = tquot;
-        eshup6(num);
-        }
-/* test for nonzero remainder after roundoff bit */
-p = &num[M];
-j = 0;
-for( i=M; i<NI; i++ )
-        {
-        j |= *p++;
-        }
-if( j )
-        j = 1;
-
-for( i=0; i<NI; i++ )
-        num[i] = equot[i];
-
-return( (int )j );
-}
-
-
-
-/* Multiply significands */
-int emulm( a, b )
-unsigned short a[], b[];
-{
-unsigned short *p, *q;
-unsigned short pprod[NI];
-unsigned short j;
-int i;
-
-equot[0] = b[0];
-equot[1] = b[1];
-for( i=M; i<NI; i++ )
-        equot[i] = 0;
-
-j = 0;
-p = &a[NI-1];
-q = &equot[NI-1];
-for( i=M+1; i<NI; i++ )
-        {
-        if( *p == 0 )
-                {
-                --p;
-                }
-        else
-                {
-                m16m( *p--, b, pprod );
-                eaddm(pprod, equot);
-                }
-        j |= *q;
-        eshdn6(equot);
-        }
-
-for( i=0; i<NI; i++ )
-        b[i] = equot[i];
-
-/* return flag for lost nonzero bits */
-return( (int)j );
-}
-
-
-/*
-eshow(str, x)
-char *str;
-unsigned short *x;
-{
-int i;
-
-printf( "%s ", str );
-for( i=0; i<NI; i++ )
-        printf( "%04x ", *x++ );
-printf( "\n" );
-}
-*/
-#endif
-
-
-
-/*
- * Normalize and round off.
- *
- * The internal format number to be rounded is "s".
- * Input "lost" indicates whether the number is exact.
- * This is the so-called sticky bit.
- *
- * Input "subflg" indicates whether the number was obtained
- * by a subtraction operation.  In that case if lost is nonzero
- * then the number is slightly smaller than indicated.
- *
- * Input "exp" is the biased exponent, which may be negative.
- * the exponent field of "s" is ignored but is replaced by
- * "exp" as adjusted by normalization and rounding.
- *
- * Input "rcntrl" is the rounding control.
- */
-
-static int rlast = -1;
-static int rw = 0;
-static unsigned short rmsk = 0;
-static unsigned short rmbit = 0;
-static unsigned short rebit = 0;
-static int re = 0;
-static unsigned short rbit[NI] = {0,0,0,0,0,0,0,0};
-
-void emdnorm( s, lost, subflg, exp, rcntrl )
-unsigned short s[];
-int lost;
-int subflg;
-long exp;
-int rcntrl;
-{
-int i, j;
-unsigned short r;
-
-/* Normalize */
-j = enormlz( s );
-
-/* a blank significand could mean either zero or infinity. */
-#ifndef INFINITY
-if( j > NBITS )
-        {
-        ecleazs( s );
-        return;
-        }
-#endif
-exp -= j;
-#ifndef INFINITY
-if( exp >= 32767L )
-        goto overf;
-#else
-if( (j > NBITS) && (exp < 32767L) )
-        {
-        ecleazs( s );
-        return;
-        }
-#endif
-if( exp < 0L )
-        {
-        if( exp > (long )(-NBITS-1) )
-                {
-                j = (int )exp;
-                i = eshift( s, j );
-                if( i )
-                        lost = 1;
-                }
-        else
-                {
-                ecleazs( s );
-                return;
-                }
-        }
-/* Round off, unless told not to by rcntrl. */
-if( rcntrl == 0 )
-        goto mdfin;
-/* Set up rounding parameters if the control register changed. */
-if( rndprc != rlast )
-        {
-        ecleaz( rbit );
-        switch( rndprc )
-                {
-                default:
-                case NBITS:
-                        rw = NI-1; /* low guard word */
-                        rmsk = 0xffff;
-                        rmbit = 0x8000;
-                        rebit = 1;
-                        re = rw - 1;
-                        break;
-                case 113:
-                        rw = 10;
-                        rmsk = 0x7fff;
-                        rmbit = 0x4000;
-                        rebit = 0x8000;
-                        re = rw;
-                        break;
-                case 64:
-                        rw = 7;
-                        rmsk = 0xffff;
-                        rmbit = 0x8000;
-                        rebit = 1;
-                        re = rw-1;
-                        break;
-/* For DEC arithmetic */
-                case 56:
-                        rw = 6;
-                        rmsk = 0xff;
-                        rmbit = 0x80;
-                        rebit = 0x100;
-                        re = rw;
-                        break;
-                case 53:
-                        rw = 6;
-                        rmsk = 0x7ff;
-                        rmbit = 0x0400;
-                        rebit = 0x800;
-                        re = rw;
-                        break;
-                case 24:
-                        rw = 4;
-                        rmsk = 0xff;
-                        rmbit = 0x80;
-                        rebit = 0x100;
-                        re = rw;
-                        break;
-                }
-        rbit[re] = rebit;
-        rlast = rndprc;
-        }
-
-/* Shift down 1 temporarily if the data structure has an implied
- * most significant bit and the number is denormal.
- * For rndprc = 64 or NBITS, there is no implied bit.
- * But Intel long double denormals lose one bit of significance even so.
- */
-#ifdef IBMPC
-if( (exp <= 0) && (rndprc != NBITS) )
-#else
-if( (exp <= 0) && (rndprc != 64) && (rndprc != NBITS) )
-#endif
-        {
-        lost |= s[NI-1] & 1;
-        eshdn1(s);
-        }
-/* Clear out all bits below the rounding bit,
- * remembering in r if any were nonzero.
- */
-r = s[rw] & rmsk;
-if( rndprc < NBITS )
-        {
-        i = rw + 1;
-        while( i < NI )
-                {
-                if( s[i] )
-                        r |= 1;
-                s[i] = 0;
-                ++i;
-                }
-        }
-s[rw] &= ~rmsk;
-if( (r & rmbit) != 0 )
-        {
-        if( r == rmbit )
-                {
-                if( lost == 0 )
-                        { /* round to even */
-                        if( (s[re] & rebit) == 0 )
-                                goto mddone;
-                        }
-                else
-                        {
-                        if( subflg != 0 )
-                                goto mddone;
-                        }
-                }
-        eaddm( rbit, s );
-        }
-mddone:
-#ifdef IBMPC
-if( (exp <= 0) && (rndprc != NBITS) )
-#else
-if( (exp <= 0) && (rndprc != 64) && (rndprc != NBITS) )
-#endif
-        {
-        eshup1(s);
-        }
-if( s[2] != 0 )
-        { /* overflow on roundoff */
-        eshdn1(s);
-        exp += 1;
-        }
-mdfin:
-s[NI-1] = 0;
-if( exp >= 32767L )
-        {
-#ifndef INFINITY
-overf:
-#endif
-#ifdef INFINITY
-        s[1] = 32767;
-        for( i=2; i<NI-1; i++ )
-                s[i] = 0;
-#else
-        s[1] = 32766;
-        s[2] = 0;
-        for( i=M+1; i<NI-1; i++ )
-                s[i] = 0xffff;
-        s[NI-1] = 0;
-        if( (rndprc < 64) || (rndprc == 113) )
-                {
-                s[rw] &= ~rmsk;
-                if( rndprc == 24 )
-                        {
-                        s[5] = 0;
-                        s[6] = 0;
-                        }
-                }
-#endif
-        return;
-        }
-if( exp < 0 )
-        s[1] = 0;
-else
-        s[1] = (unsigned short )exp;
-}
-
-
-
-/*
-;       Subtract external format numbers.
-;
-;       unsigned short a[NE], b[NE], c[NE];
-;       esub( a, b, c );         c = b - a
-*/
-
-static int subflg = 0;
-
-void esub( a, b, c )
-unsigned short *a, *b, *c;
-{
-
-#ifdef NANS
-if( eisnan(a) )
-        {
-        emov (a, c);
-        return;
-        }
-if( eisnan(b) )
-        {
-        emov(b,c);
-        return;
-        }
-/* Infinity minus infinity is a NaN.
- * Test for subtracting infinities of the same sign.
- */
-if( eisinf(a) && eisinf(b) && ((eisneg (a) ^ eisneg (b)) == 0))
-        {
-        mtherr( "esub", DOMAIN );
-        enan( c, NBITS );
-        return;
-        }
-#endif
-subflg = 1;
-eadd1( a, b, c );
-}
-
-
-/*
-;       Add.
-;
-;       unsigned short a[NE], b[NE], c[NE];
-;       eadd( a, b, c );         c = b + a
-*/
-void eadd( a, b, c )
-unsigned short *a, *b, *c;
-{
-
-#ifdef NANS
-/* NaN plus anything is a NaN. */
-if( eisnan(a) )
-        {
-        emov(a,c);
-        return;
-        }
-if( eisnan(b) )
-        {
-        emov(b,c);
-        return;
-        }
-/* Infinity minus infinity is a NaN.
- * Test for adding infinities of opposite signs.
- */
-if( eisinf(a) && eisinf(b)
-        && ((eisneg(a) ^ eisneg(b)) != 0) )
-        {
-        mtherr( "eadd", DOMAIN );
-        enan( c, NBITS );
-        return;
-        }
-#endif
-subflg = 0;
-eadd1( a, b, c );
-}
-
-void eadd1( a, b, c )
-unsigned short *a, *b, *c;
-{
-unsigned short ai[NI], bi[NI], ci[NI];
-int i, lost, j, k;
-long lt, lta, ltb;
-
-#ifdef INFINITY
-if( eisinf(a) )
-        {
-        emov(a,c);
-        if( subflg )
-                eneg(c);
-        return;
-        }
-if( eisinf(b) )
-        {
-        emov(b,c);
-        return;
-        }
-#endif
-emovi( a, ai );
-emovi( b, bi );
-if( subflg )
-        ai[0] = ~ai[0];
-
-/* compare exponents */
-lta = ai[E];
-ltb = bi[E];
-lt = lta - ltb;
-if( lt > 0L )
-        {       /* put the larger number in bi */
-        emovz( bi, ci );
-        emovz( ai, bi );
-        emovz( ci, ai );
-        ltb = bi[E];
-        lt = -lt;
-        }
-lost = 0;
-if( lt != 0L )
-        {
-        if( lt < (long )(-NBITS-1) )
-                goto done;      /* answer same as larger addend */
-        k = (int )lt;
-        lost = eshift( ai, k ); /* shift the smaller number down */
-        }
-else
-        {
-/* exponents were the same, so must compare significands */
-        i = ecmpm( ai, bi );
-        if( i == 0 )
-                { /* the numbers are identical in magnitude */
-                /* if different signs, result is zero */
-                if( ai[0] != bi[0] )
-                        {
-                        eclear(c);
-                        return;
-                        }
-                /* if same sign, result is double */
-                /* double denomalized tiny number */
-                if( (bi[E] == 0) && ((bi[3] & 0x8000) == 0) )
-                        {
-                        eshup1( bi );
-                        goto done;
-                        }
-                /* add 1 to exponent unless both are zero! */
-                for( j=1; j<NI-1; j++ )
-                        {
-                        if( bi[j] != 0 )
-                                {
-                                ltb += 1;
-                                if( ltb >= 0x7fff )
-                                        {
-                                        eclear(c);
-                                        einfin(c);
-                                        if( ai[0] != 0 )
-                                                eneg(c);
-                                        return;
-                                        }
-                                break;
-                                }
-                        }
-                bi[E] = (unsigned short )ltb;
-                goto done;
-                }
-        if( i > 0 )
-                {       /* put the larger number in bi */
-                emovz( bi, ci );
-                emovz( ai, bi );
-                emovz( ci, ai );
-                }
-        }
-if( ai[0] == bi[0] )
-        {
-        eaddm( ai, bi );
-        subflg = 0;
-        }
-else
-        {
-        esubm( ai, bi );
-        subflg = 1;
-        }
-emdnorm( bi, lost, subflg, ltb, 64 );
-
-done:
-emovo( bi, c );
-}
-
-
-
-/*
-;       Divide.
-;
-;       unsigned short a[NE], b[NE], c[NE];
-;       ediv( a, b, c );        c = b / a
-*/
-void ediv( a, b, c )
-unsigned short *a, *b, *c;
-{
-unsigned short ai[NI], bi[NI];
-int i, sign;
-long lt, lta, ltb;
-
-/* IEEE says if result is not a NaN, the sign is "-" if and only if
-   operands have opposite signs -- but flush -0 to 0 later if not IEEE.  */
-sign = eisneg(a) ^ eisneg(b);
-
-#ifdef NANS
-/* Return any NaN input. */
-if( eisnan(a) )
-        {
-        emov(a,c);
-        return;
-        }
-if( eisnan(b) )
-        {
-        emov(b,c);
-        return;
-        }
-/* Zero over zero, or infinity over infinity, is a NaN. */
-if( ((ecmp(a,ezero) == 0) && (ecmp(b,ezero) == 0))
-        || (eisinf (a) && eisinf (b)) )
-        {
-        mtherr( "ediv", DOMAIN );
-        enan( c, NBITS );
-        return;
-        }
-#endif
-/* Infinity over anything else is infinity. */
-#ifdef INFINITY
-if( eisinf(b) )
-        {
-        einfin(c);
-        goto divsign;
-        }
-if( eisinf(a) )
-        {
-        eclear(c);
-        goto divsign;
-        }
-#endif
-emovi( a, ai );
-emovi( b, bi );
-lta = ai[E];
-ltb = bi[E];
-if( bi[E] == 0 )
-        { /* See if numerator is zero. */
-        for( i=1; i<NI-1; i++ )
-                {
-                if( bi[i] != 0 )
-                        {
-                        ltb -= enormlz( bi );
-                        goto dnzro1;
-                        }
-                }
-        eclear(c);
-        goto divsign;
-        }
-dnzro1:
-
-if( ai[E] == 0 )
-        {       /* possible divide by zero */
-        for( i=1; i<NI-1; i++ )
-                {
-                if( ai[i] != 0 )
-                        {
-                        lta -= enormlz( ai );
-                        goto dnzro2;
-                        }
-                }
-        einfin(c);
-        mtherr( "ediv", SING );
-        goto divsign;
-        }
-dnzro2:
-
-i = edivm( ai, bi );
-/* calculate exponent */
-lt = ltb - lta + EXONE;
-emdnorm( bi, i, 0, lt, 64 );
-emovo( bi, c );
-
-divsign:
-
-if( sign )
-        *(c+(NE-1)) |= 0x8000;
-else
-        *(c+(NE-1)) &= ~0x8000;
-}
-
-
-
-/*
-;       Multiply.
-;
-;       unsigned short a[NE], b[NE], c[NE];
-;       emul( a, b, c );        c = b * a
-*/
-void emul( a, b, c )
-unsigned short *a, *b, *c;
-{
-unsigned short ai[NI], bi[NI];
-int i, j, sign;
-long lt, lta, ltb;
-
-/* IEEE says if result is not a NaN, the sign is "-" if and only if
-   operands have opposite signs -- but flush -0 to 0 later if not IEEE.  */
-sign = eisneg(a) ^ eisneg(b);
-
-#ifdef NANS
-/* NaN times anything is the same NaN. */
-if( eisnan(a) )
-        {
-        emov(a,c);
-        return;
-        }
-if( eisnan(b) )
-        {
-        emov(b,c);
-        return;
-        }
-/* Zero times infinity is a NaN. */
-if( (eisinf(a) && (ecmp(b,ezero) == 0))
-        || (eisinf(b) && (ecmp(a,ezero) == 0)) )
-        {
-        mtherr( "emul", DOMAIN );
-        enan( c, NBITS );
-        return;
-        }
-#endif
-/* Infinity times anything else is infinity. */
-#ifdef INFINITY
-if( eisinf(a) || eisinf(b) )
-        {
-        einfin(c);
-        goto mulsign;
-        }
-#endif
-emovi( a, ai );
-emovi( b, bi );
-lta = ai[E];
-ltb = bi[E];
-if( ai[E] == 0 )
-        {
-        for( i=1; i<NI-1; i++ )
-                {
-                if( ai[i] != 0 )
-                        {
-                        lta -= enormlz( ai );
-                        goto mnzer1;
-                        }
-                }
-        eclear(c);
-        goto mulsign;
-        }
-mnzer1:
-
-if( bi[E] == 0 )
-        {
-        for( i=1; i<NI-1; i++ )
-                {
-                if( bi[i] != 0 )
-                        {
-                        ltb -= enormlz( bi );
-                        goto mnzer2;
-                        }
-                }
-        eclear(c);
-        goto mulsign;
-        }
-mnzer2:
-
-/* Multiply significands */
-j = emulm( ai, bi );
-/* calculate exponent */
-lt = lta + ltb - (EXONE - 1);
-emdnorm( bi, j, 0, lt, 64 );
-emovo( bi, c );
-/*  IEEE says sign is "-" if and only if operands have opposite signs.  */
-mulsign:
-if( sign )
-        *(c+(NE-1)) |= 0x8000;
-else
-        *(c+(NE-1)) &= ~0x8000;
-}
-
-
-
-
-/*
-; Convert IEEE double precision to e type
-;       double d;
-;       unsigned short x[N+2];
-;       e53toe( &d, x );
-*/
-void e53toe( pe, y )
-unsigned short *pe, *y;
-{
-#ifdef DEC
-
-dectoe( pe, y ); /* see etodec.c */
-
-#else
-
-register unsigned short r;
-register unsigned short *p, *e;
-unsigned short yy[NI];
-int denorm, k;
-
-e = pe;
-denorm = 0;     /* flag if denormalized number */
-ecleaz(yy);
-#ifdef IBMPC
-e += 3;
-#endif
-r = *e;
-yy[0] = 0;
-if( r & 0x8000 )
-        yy[0] = 0xffff;
-yy[M] = (r & 0x0f) | 0x10;
-r &= ~0x800f;   /* strip sign and 4 significand bits */
-#ifdef INFINITY
-if( r == 0x7ff0 )
-        {
-#ifdef NANS
-#ifdef IBMPC
-        if( ((pe[3] & 0xf) != 0) || (pe[2] != 0)
-                || (pe[1] != 0) || (pe[0] != 0) )
-                {
-                enan( y, NBITS );
-                return;
-                }
-#else
-        if( ((pe[0] & 0xf) != 0) || (pe[1] != 0)
-                 || (pe[2] != 0) || (pe[3] != 0) )
-                {
-                enan( y, NBITS );
-                return;
-                }
-#endif
-#endif  /* NANS */
-        eclear( y );
-        einfin( y );
-        if( yy[0] )
-                eneg(y);
-        return;
-        }
-#endif
-r >>= 4;
-/* If zero exponent, then the significand is denormalized.
- * So, take back the understood high significand bit. */ 
-if( r == 0 )
-        {
-        denorm = 1;
-        yy[M] &= ~0x10;
-        }
-r += EXONE - 01777;
-yy[E] = r;
-p = &yy[M+1];
-#ifdef IBMPC
-*p++ = *(--e);
-*p++ = *(--e);
-*p++ = *(--e);
-#endif
-#ifdef MIEEE
-++e;
-*p++ = *e++;
-*p++ = *e++;
-*p++ = *e++;
-#endif
-(void )eshift( yy, -5 );
-if( denorm )
-        { /* if zero exponent, then normalize the significand */
-        if( (k = enormlz(yy)) > NBITS )
-                ecleazs(yy);
-        else
-                yy[E] -= (unsigned short )(k-1);
-        }
-emovo( yy, y );
-#endif /* not DEC */
-}
-
-void e64toe( pe, y )
-unsigned short *pe, *y;
-{
-unsigned short yy[NI];
-unsigned short *p, *q, *e;
-int i;
-
-e = pe;
-p = yy;
-for( i=0; i<NE-5; i++ )
-        *p++ = 0;
-#ifdef IBMPC
-for( i=0; i<5; i++ )
-        *p++ = *e++;
-#endif
-#ifdef DEC
-for( i=0; i<5; i++ )
-        *p++ = *e++;
-#endif
-#ifdef MIEEE
-p = &yy[0] + (NE-1);
-*p-- = *e++;
-++e;
-for( i=0; i<4; i++ )
-        *p-- = *e++;
-#endif
-
-#ifdef IBMPC
-/* For Intel long double, shift denormal significand up 1
-   -- but only if the top significand bit is zero.  */
-if((yy[NE-1] & 0x7fff) == 0 && (yy[NE-2] & 0x8000) == 0)
-  {
-    unsigned short temp[NI+1];
-    emovi(yy, temp);
-    eshup1(temp);
-    emovo(temp,y);
-    return;
-  }
-#endif
-#ifdef INFINITY
-/* Point to the exponent field.  */
-p = &yy[NE-1];
-if ((*p & 0x7fff) == 0x7fff)
-        {
-#ifdef NANS
-#ifdef IBMPC
-        for( i=0; i<4; i++ )
-                {
-                if((i != 3 && pe[i] != 0)
-                   /* Check for Intel long double infinity pattern.  */
-                   || (i == 3 && pe[i] != 0x8000))
-                        {
-                        enan( y, NBITS );
-                        return;
-                        }
-                }
-#else
-        /* In Motorola extended precision format, the most significant
-           bit of an infinity mantissa could be either 1 or 0.  It is
-           the lower order bits that tell whether the value is a NaN.  */
-        if ((pe[2] & 0x7fff) != 0)
-                goto bigend_nan;
-
-        for( i=3; i<=5; i++ )
-                {
-                if( pe[i] != 0 )
-                        {
-bigend_nan:
-                        enan( y, NBITS );
-                        return;
-                        }
-                }
-#endif
-#endif /* NANS */
-        eclear( y );
-        einfin( y );
-        if( *p & 0x8000 )
-                eneg(y);
-        return;
-        }
-#endif
-p = yy;
-q = y;
-for( i=0; i<NE; i++ )
-        *q++ = *p++;
-}
-
-void e113toe(pe,y)
-unsigned short *pe, *y;
-{
-register unsigned short r;
-unsigned short *e, *p;
-unsigned short yy[NI];
-int denorm, i;
-
-e = pe;
-denorm = 0;
-ecleaz(yy);
-#ifdef IBMPC
-e += 7;
-#endif
-r = *e;
-yy[0] = 0;
-if( r & 0x8000 )
-        yy[0] = 0xffff;
-r &= 0x7fff;
-#ifdef INFINITY
-if( r == 0x7fff )
-        {
-#ifdef NANS
-#ifdef IBMPC
-        for( i=0; i<7; i++ )
-                {
-                if( pe[i] != 0 )
-                        {
-                        enan( y, NBITS );
-                        return;
-                        }
-                }
-#else
-        for( i=1; i<8; i++ )
-                {
-                if( pe[i] != 0 )
-                        {
-                        enan( y, NBITS );
-                        return;
-                        }
-                }
-#endif
-#endif /* NANS */
-        eclear( y );
-        einfin( y );
-        if( *e & 0x8000 )
-                eneg(y);
-        return;
-        }
-#endif  /* INFINITY */
-yy[E] = r;
-p = &yy[M + 1];
-#ifdef IBMPC
-for( i=0; i<7; i++ )
-        *p++ = *(--e);
-#endif
-#ifdef MIEEE
-++e;
-for( i=0; i<7; i++ )
-        *p++ = *e++;
-#endif
-/* If denormal, remove the implied bit; else shift down 1. */
-if( r == 0 )
-        {
-        yy[M] = 0;
-        }
-else
-        {
-        yy[M] = 1;
-        eshift( yy, -1 );
-        }
-emovo(yy,y);
-}
-
-
-/*
-; Convert IEEE single precision to e type
-;       float d;
-;       unsigned short x[N+2];
-;       dtox( &d, x );
-*/
-void e24toe( pe, y )
-unsigned short *pe, *y;
-{
-register unsigned short r;
-register unsigned short *p, *e;
-unsigned short yy[NI];
-int denorm, k;
-
-e = pe;
-denorm = 0;     /* flag if denormalized number */
-ecleaz(yy);
-#ifdef IBMPC
-e += 1;
-#endif
-#ifdef DEC
-e += 1;
-#endif
-r = *e;
-yy[0] = 0;
-if( r & 0x8000 )
-        yy[0] = 0xffff;
-yy[M] = (r & 0x7f) | 0200;
-r &= ~0x807f;   /* strip sign and 7 significand bits */
-#ifdef INFINITY
-if( r == 0x7f80 )
-        {
-#ifdef NANS
-#ifdef MIEEE
-        if( ((pe[0] & 0x7f) != 0) || (pe[1] != 0) )
-                {
-                enan( y, NBITS );
-                return;
-                }
-#else
-        if( ((pe[1] & 0x7f) != 0) || (pe[0] != 0) )
-                {
-                enan( y, NBITS );
-                return;
-                }
-#endif
-#endif  /* NANS */
-        eclear( y );
-        einfin( y );
-        if( yy[0] )
-                eneg(y);
-        return;
-        }
-#endif
-r >>= 7;
-/* If zero exponent, then the significand is denormalized.
- * So, take back the understood high significand bit. */ 
-if( r == 0 )
-        {
-        denorm = 1;
-        yy[M] &= ~0200;
-        }
-r += EXONE - 0177;
-yy[E] = r;
-p = &yy[M+1];
-#ifdef IBMPC
-*p++ = *(--e);
-#endif
-#ifdef DEC
-*p++ = *(--e);
-#endif
-#ifdef MIEEE
-++e;
-*p++ = *e++;
-#endif
-(void )eshift( yy, -8 );
-if( denorm )
-        { /* if zero exponent, then normalize the significand */
-        if( (k = enormlz(yy)) > NBITS )
-                ecleazs(yy);
-        else
-                yy[E] -= (unsigned short )(k-1);
-        }
-emovo( yy, y );
-}
-
-void etoe113(x,e)
-unsigned short *x, *e;
-{
-unsigned short xi[NI];
-long exp;
-int rndsav;
-
-#ifdef NANS
-if( eisnan(x) )
-        {
-        enan( e, 113 );
-        return;
-        }
-#endif
-emovi( x, xi );
-exp = (long )xi[E];
-#ifdef INFINITY
-if( eisinf(x) )
-        goto nonorm;
-#endif
-/* round off to nearest or even */
-rndsav = rndprc;
-rndprc = 113;
-emdnorm( xi, 0, 0, exp, 64 );
-rndprc = rndsav;
-nonorm:
-toe113 (xi, e);
-}
-
-/* move out internal format to ieee long double */
-static void toe113(a,b)
-unsigned short *a, *b;
-{
-register unsigned short *p, *q;
-unsigned short i;
-
-#ifdef NANS
-if( eiisnan(a) )
-        {
-        enan( b, 113 );
-        return;
-        }
-#endif
-p = a;
-#ifdef MIEEE
-q = b;
-#else
-q = b + 7;                      /* point to output exponent */
-#endif
-
-/* If not denormal, delete the implied bit. */
-if( a[E] != 0 )
-        {
-        eshup1 (a);
-        }
-/* combine sign and exponent */
-i = *p++;
-#ifdef MIEEE
-if( i )
-        *q++ = *p++ | 0x8000;
-else
-        *q++ = *p++;
-#else
-if( i )
-        *q-- = *p++ | 0x8000;
-else
-        *q-- = *p++;
-#endif
-/* skip over guard word */
-++p;
-/* move the significand */
-#ifdef MIEEE
-for (i = 0; i < 7; i++)
-        *q++ = *p++;
-#else
-for (i = 0; i < 7; i++)
-        *q-- = *p++;
-#endif
-}
-
-
-void etoe64( x, e )
-unsigned short *x, *e;
-{
-unsigned short xi[NI];
-long exp;
-int rndsav;
-
-#ifdef NANS
-if( eisnan(x) )
-        {
-        enan( e, 64 );
-        return;
-        }
-#endif
-emovi( x, xi );
-exp = (long )xi[E]; /* adjust exponent for offset */
-#ifdef INFINITY
-if( eisinf(x) )
-        goto nonorm;
-#endif
-/* round off to nearest or even */
-rndsav = rndprc;
-rndprc = 64;
-emdnorm( xi, 0, 0, exp, 64 );
-rndprc = rndsav;
-nonorm:
-toe64( xi, e );
-}
-
-/* move out internal format to ieee long double */
-static void toe64( a, b )
-unsigned short *a, *b;
-{
-register unsigned short *p, *q;
-unsigned short i;
-
-#ifdef NANS
-if( eiisnan(a) )
-        {
-        enan( b, 64 );
-        return;
-        }
-#endif
-#ifdef IBMPC
-/* Shift Intel denormal significand down 1.  */
-if( a[E] == 0 )
-  eshdn1(a);
-#endif
-p = a;
-#ifdef MIEEE
-q = b;
-#else
-q = b + 4; /* point to output exponent */
-#if 1
-/* NOTE: if data type is 96 bits wide, clear the last word here. */
-*(q+1)= 0;
-#endif
-#endif
-
-/* combine sign and exponent */
-i = *p++;
-#ifdef MIEEE
-if( i )
-        *q++ = *p++ | 0x8000;
-else
-        *q++ = *p++;
-*q++ = 0;
-#else
-if( i )
-        *q-- = *p++ | 0x8000;
-else
-        *q-- = *p++;
-#endif
-/* skip over guard word */
-++p;
-/* move the significand */
-#ifdef MIEEE
-for( i=0; i<4; i++ )
-        *q++ = *p++;
-#else
-#ifdef INFINITY
-if (eiisinf (a))
-        {
-        /* Intel long double infinity.  */
-        *q-- = 0x8000;
-        *q-- = 0;
-        *q-- = 0;
-        *q = 0;
-        return;
-        }
-#endif
-for( i=0; i<4; i++ )
-        *q-- = *p++;
-#endif
-}
-
-
-/*
-; e type to IEEE double precision
-;       double d;
-;       unsigned short x[NE];
-;       etoe53( x, &d );
-*/
-
-#ifdef DEC
-
-void etoe53( x, e )
-unsigned short *x, *e;
-{
-etodec( x, e ); /* see etodec.c */
-}
-
-static void toe53( x, y )
-unsigned short *x, *y;
-{
-todec( x, y );
-}
-
-#else
-
-void etoe53( x, e )
-unsigned short *x, *e;
-{
-unsigned short xi[NI];
-long exp;
-int rndsav;
-
-#ifdef NANS
-if( eisnan(x) )
-        {
-        enan( e, 53 );
-        return;
-        }
-#endif
-emovi( x, xi );
-exp = (long )xi[E] - (EXONE - 0x3ff); /* adjust exponent for offsets */
-#ifdef INFINITY
-if( eisinf(x) )
-        goto nonorm;
-#endif
-/* round off to nearest or even */
-rndsav = rndprc;
-rndprc = 53;
-emdnorm( xi, 0, 0, exp, 64 );
-rndprc = rndsav;
-nonorm:
-toe53( xi, e );
-}
-
-
-static void toe53( x, y )
-unsigned short *x, *y;
-{
-unsigned short i;
-unsigned short *p;
-
-
-#ifdef NANS
-if( eiisnan(x) )
-        {
-        enan( y, 53 );
-        return;
-        }
-#endif
-p = &x[0];
-#ifdef IBMPC
-y += 3;
-#endif
-*y = 0; /* output high order */
-if( *p++ )
-        *y = 0x8000;    /* output sign bit */
-
-i = *p++;
-if( i >= (unsigned int )2047 )
-        {       /* Saturate at largest number less than infinity. */
-#ifdef INFINITY
-        *y |= 0x7ff0;
-#ifdef IBMPC
-        *(--y) = 0;
-        *(--y) = 0;
-        *(--y) = 0;
-#endif
-#ifdef MIEEE
-        ++y;
-        *y++ = 0;
-        *y++ = 0;
-        *y++ = 0;
-#endif
-#else
-        *y |= (unsigned short )0x7fef;
-#ifdef IBMPC
-        *(--y) = 0xffff;
-        *(--y) = 0xffff;
-        *(--y) = 0xffff;
-#endif
-#ifdef MIEEE
-        ++y;
-        *y++ = 0xffff;
-        *y++ = 0xffff;
-        *y++ = 0xffff;
-#endif
-#endif
-        return;
-        }
-if( i == 0 )
-        {
-        (void )eshift( x, 4 );
-        }
-else
-        {
-        i <<= 4;
-        (void )eshift( x, 5 );
-        }
-i |= *p++ & (unsigned short )0x0f;      /* *p = xi[M] */
-*y |= (unsigned short )i; /* high order output already has sign bit set */
-#ifdef IBMPC
-*(--y) = *p++;
-*(--y) = *p++;
-*(--y) = *p;
-#endif
-#ifdef MIEEE
-++y;
-*y++ = *p++;
-*y++ = *p++;
-*y++ = *p++;
-#endif
-}
-
-#endif /* not DEC */
-
-
-
-/*
-; e type to IEEE single precision
-;       float d;
-;       unsigned short x[N+2];
-;       xtod( x, &d );
-*/
-void etoe24( x, e )
-unsigned short *x, *e;
-{
-long exp;
-unsigned short xi[NI];
-int rndsav;
-
-#ifdef NANS
-if( eisnan(x) )
-        {
-        enan( e, 24 );
-        return;
-        }
-#endif
-emovi( x, xi );
-exp = (long )xi[E] - (EXONE - 0177); /* adjust exponent for offsets */
-#ifdef INFINITY
-if( eisinf(x) )
-        goto nonorm;
-#endif
-/* round off to nearest or even */
-rndsav = rndprc;
-rndprc = 24;
-emdnorm( xi, 0, 0, exp, 64 );
-rndprc = rndsav;
-nonorm:
-toe24( xi, e );
-}
-
-static void toe24( x, y )
-unsigned short *x, *y;
-{
-unsigned short i;
-unsigned short *p;
-
-#ifdef NANS
-if( eiisnan(x) )
-        {
-        enan( y, 24 );
-        return;
-        }
-#endif
-p = &x[0];
-#ifdef IBMPC
-y += 1;
-#endif
-#ifdef DEC
-y += 1;
-#endif
-*y = 0; /* output high order */
-if( *p++ )
-        *y = 0x8000;    /* output sign bit */
-
-i = *p++;
-if( i >= 255 )
-        {       /* Saturate at largest number less than infinity. */
-#ifdef INFINITY
-        *y |= (unsigned short )0x7f80;
-#ifdef IBMPC
-        *(--y) = 0;
-#endif
-#ifdef DEC
-        *(--y) = 0;
-#endif
-#ifdef MIEEE
-        ++y;
-        *y = 0;
-#endif
-#else
-        *y |= (unsigned short )0x7f7f;
-#ifdef IBMPC
-        *(--y) = 0xffff;
-#endif
-#ifdef DEC
-        *(--y) = 0xffff;
-#endif
-#ifdef MIEEE
-        ++y;
-        *y = 0xffff;
-#endif
-#endif
-        return;
-        }
-if( i == 0 )
-        {
-        (void )eshift( x, 7 );
-        }
-else
-        {
-        i <<= 7;
-        (void )eshift( x, 8 );
-        }
-i |= *p++ & (unsigned short )0x7f;      /* *p = xi[M] */
-*y |= i;        /* high order output already has sign bit set */
-#ifdef IBMPC
-*(--y) = *p;
-#endif
-#ifdef DEC
-*(--y) = *p;
-#endif
-#ifdef MIEEE
-++y;
-*y = *p;
-#endif
-}
-
-
-/* Compare two e type numbers.
- *
- * unsigned short a[NE], b[NE];
- * ecmp( a, b );
- *
- *  returns +1 if a > b
- *           0 if a == b
- *          -1 if a < b
- *          -2 if either a or b is a NaN.
- */
-int ecmp( a, b )
-unsigned short *a, *b;
-{
-unsigned short ai[NI], bi[NI];
-register unsigned short *p, *q;
-register int i;
-int msign;
-
-#ifdef NANS
-if (eisnan (a)  || eisnan (b))
-        return( -2 );
-#endif
-emovi( a, ai );
-p = ai;
-emovi( b, bi );
-q = bi;
-
-if( *p != *q )
-        { /* the signs are different */
-/* -0 equals + 0 */
-        for( i=1; i<NI-1; i++ )
-                {
-                if( ai[i] != 0 )
-                        goto nzro;
-                if( bi[i] != 0 )
-                        goto nzro;
-                }
-        return(0);
-nzro:
-        if( *p == 0 )
-                return( 1 );
-        else
-                return( -1 );
-        }
-/* both are the same sign */
-if( *p == 0 )
-        msign = 1;
-else
-        msign = -1;
-i = NI-1;
-do
-        {
-        if( *p++ != *q++ )
-                {
-                goto diff;
-                }
-        }
-while( --i > 0 );
-
-return(0);      /* equality */
-
-
-
-diff:
-
-if( *(--p) > *(--q) )
-        return( msign );                /* p is bigger */
-else
-        return( -msign );       /* p is littler */
-}
-
-
-
-
-/* Find nearest integer to x = floor( x + 0.5 )
- *
- * unsigned short x[NE], y[NE]
- * eround( x, y );
- */
-void eround( x, y )
-unsigned short *x, *y;
-{
-
-eadd( ehalf, x, y );
-efloor( y, y );
-}
-
-
-
-
-/*
-; convert long (32-bit) integer to e type
-;
-;       long l;
-;       unsigned short x[NE];
-;       ltoe( &l, x );
-; note &l is the memory address of l
-*/
-void ltoe( lp, y )
-long *lp;       /* lp is the memory address of a long integer */
-unsigned short *y;      /* y is the address of a short */
-{
-unsigned short yi[NI];
-unsigned long ll;
-int k;
-
-ecleaz( yi );
-if( *lp < 0 )
-        {
-        ll =  (unsigned long )( -(*lp) ); /* make it positive */
-        yi[0] = 0xffff; /* put correct sign in the e type number */
-        }
-else
-        {
-        ll = (unsigned long )( *lp );
-        }
-/* move the long integer to yi significand area */
-if( sizeof(long) == 8 )
-        {
-        yi[M] = (unsigned short) (ll >> (LONGBITS - 16));
-        yi[M + 1] = (unsigned short) (ll >> (LONGBITS - 32));
-        yi[M + 2] = (unsigned short) (ll >> 16);
-        yi[M + 3] = (unsigned short) ll;
-        yi[E] = EXONE + 47; /* exponent if normalize shift count were 0 */
-        }
-else
-        {
-        yi[M] = (unsigned short )(ll >> 16); 
-        yi[M+1] = (unsigned short )ll;
-        yi[E] = EXONE + 15; /* exponent if normalize shift count were 0 */
-        }
-if( (k = enormlz( yi )) > NBITS ) /* normalize the significand */
-        ecleaz( yi );   /* it was zero */
-else
-        yi[E] -= (unsigned short )k; /* subtract shift count from exponent */
-emovo( yi, y ); /* output the answer */
-}
-
-/*
-; convert unsigned long (32-bit) integer to e type
-;
-;       unsigned long l;
-;       unsigned short x[NE];
-;       ltox( &l, x );
-; note &l is the memory address of l
-*/
-void ultoe( lp, y )
-unsigned long *lp; /* lp is the memory address of a long integer */
-unsigned short *y;      /* y is the address of a short */
-{
-unsigned short yi[NI];
-unsigned long ll;
-int k;
-
-ecleaz( yi );
-ll = *lp;
-
-/* move the long integer to ayi significand area */
-if( sizeof(long) == 8 )
-        {
-        yi[M] = (unsigned short) (ll >> (LONGBITS - 16));
-        yi[M + 1] = (unsigned short) (ll >> (LONGBITS - 32));
-        yi[M + 2] = (unsigned short) (ll >> 16);
-        yi[M + 3] = (unsigned short) ll;
-        yi[E] = EXONE + 47; /* exponent if normalize shift count were 0 */
-        }
-else
-        {
-        yi[M] = (unsigned short )(ll >> 16); 
-        yi[M+1] = (unsigned short )ll;
-        yi[E] = EXONE + 15; /* exponent if normalize shift count were 0 */
-        }
-if( (k = enormlz( yi )) > NBITS ) /* normalize the significand */
-        ecleaz( yi );   /* it was zero */
-else
-        yi[E] -= (unsigned short )k; /* subtract shift count from exponent */
-emovo( yi, y ); /* output the answer */
-}
-
-
-/*
-;       Find long integer and fractional parts
-
-;       long i;
-;       unsigned short x[NE], frac[NE];
-;       xifrac( x, &i, frac );
- 
-  The integer output has the sign of the input.  The fraction is
-  the positive fractional part of abs(x).
-*/
-void eifrac( x, i, frac )
-unsigned short *x;
-long *i;
-unsigned short *frac;
-{
-unsigned short xi[NI];
-int j, k;
-unsigned long ll;
-
-emovi( x, xi );
-k = (int )xi[E] - (EXONE - 1);
-if( k <= 0 )
-        {
-/* if exponent <= 0, integer = 0 and real output is fraction */
-        *i = 0L;
-        emovo( xi, frac );
-        return;
-        }
-if( k > (8 * sizeof(long) - 1) )
-        {
-/*
-;       long integer overflow: output large integer
-;       and correct fraction
-*/
-        j = 8 * sizeof(long) - 1;
-        if( xi[0] )
-                *i = (long) ((unsigned long) 1) << j;
-        else
-                *i = (long) (((unsigned long) (~(0L))) >> 1);
-        (void )eshift( xi, k );
-        }
-if( k > 16 )
-        {
-/*
-  Shift more than 16 bits: shift up k-16 mod 16
-  then shift by 16's.
-*/
-        j = k - ((k >> 4) << 4);
-        eshift (xi, j);
-        ll = xi[M];
-        k -= j;
-        do
-                {
-                eshup6 (xi);
-                ll = (ll << 16) | xi[M];
-                }
-        while ((k -= 16) > 0);
-        *i = ll;
-        if (xi[0])
-                *i = -(*i);
-        }
-else
-        {
-/* shift not more than 16 bits */
-        eshift( xi, k );
-        *i = (long )xi[M] & 0xffff;
-        if( xi[0] )
-                *i = -(*i);
-        }
-xi[0] = 0;
-xi[E] = EXONE - 1;
-xi[M] = 0;
-if( (k = enormlz( xi )) > NBITS )
-        ecleaz( xi );
-else
-        xi[E] -= (unsigned short )k;
-
-emovo( xi, frac );
-}
-
-
-/*
-;       Find unsigned long integer and fractional parts
-
-;       unsigned long i;
-;       unsigned short x[NE], frac[NE];
-;       xifrac( x, &i, frac );
-
-  A negative e type input yields integer output = 0
-  but correct fraction.
-*/
-void euifrac( x, i, frac )
-unsigned short *x;
-unsigned long *i;
-unsigned short *frac;
-{
-unsigned short xi[NI];
-int j, k;
-unsigned long ll;
-
-emovi( x, xi );
-k = (int )xi[E] - (EXONE - 1);
-if( k <= 0 )
-        {
-/* if exponent <= 0, integer = 0 and argument is fraction */
-        *i = 0L;
-        emovo( xi, frac );
-        return;
-        }
-if( k > (8 * sizeof(long)) )
-        {
-/*
-;       long integer overflow: output large integer
-;       and correct fraction
-*/
-        *i = ~(0L);
-        (void )eshift( xi, k );
-        }
-else if( k > 16 )
-        {
-/*
-  Shift more than 16 bits: shift up k-16 mod 16
-  then shift up by 16's.
-*/
-        j = k - ((k >> 4) << 4);
-        eshift (xi, j);
-        ll = xi[M];
-        k -= j;
-        do
-                {
-                eshup6 (xi);
-                ll = (ll << 16) | xi[M];
-                }
-        while ((k -= 16) > 0);
-        *i = ll;
-        }
-else
-        {
-/* shift not more than 16 bits */
-        eshift( xi, k );
-        *i = (long )xi[M] & 0xffff;
-        }
-
-if( xi[0] )  /* A negative value yields unsigned integer 0. */
-        *i = 0L;
-
-xi[0] = 0;
-xi[E] = EXONE - 1;
-xi[M] = 0;
-if( (k = enormlz( xi )) > NBITS )
-        ecleaz( xi );
-else
-        xi[E] -= (unsigned short )k;
-
-emovo( xi, frac );
-}
-
-
-
-/*
-;       Shift significand
-;
-;       Shifts significand area up or down by the number of bits
-;       given by the variable sc.
-*/
-int eshift( x, sc )
-unsigned short *x;
-int sc;
-{
-unsigned short lost;
-unsigned short *p;
-
-if( sc == 0 )
-        return( 0 );
-
-lost = 0;
-p = x + NI-1;
-
-if( sc < 0 )
-        {
-        sc = -sc;
-        while( sc >= 16 )
-                {
-                lost |= *p;     /* remember lost bits */
-                eshdn6(x);
-                sc -= 16;
-                }
-
-        while( sc >= 8 )
-                {
-                lost |= *p & 0xff;
-                eshdn8(x);
-                sc -= 8;
-                }
-
-        while( sc > 0 )
-                {
-                lost |= *p & 1;
-                eshdn1(x);
-                sc -= 1;
-                }
-        }
-else
-        {
-        while( sc >= 16 )
-                {
-                eshup6(x);
-                sc -= 16;
-                }
-
-        while( sc >= 8 )
-                {
-                eshup8(x);
-                sc -= 8;
-                }
-
-        while( sc > 0 )
-                {
-                eshup1(x);
-                sc -= 1;
-                }
-        }
-if( lost )
-        lost = 1;
-return( (int )lost );
-}
-
-
-
-/*
-;       normalize
-;
-; Shift normalizes the significand area pointed to by argument
-; shift count (up = positive) is returned.
-*/
-int enormlz(x)
-unsigned short x[];
-{
-register unsigned short *p;
-int sc;
-
-sc = 0;
-p = &x[M];
-if( *p != 0 )
-        goto normdn;
-++p;
-if( *p & 0x8000 )
-        return( 0 );    /* already normalized */
-while( *p == 0 )
-        {
-        eshup6(x);
-        sc += 16;
-/* With guard word, there are NBITS+16 bits available.
- * return true if all are zero.
- */
-        if( sc > NBITS )
-                return( sc );
-        }
-/* see if high byte is zero */
-while( (*p & 0xff00) == 0 )
-        {
-        eshup8(x);
-        sc += 8;
-        }
-/* now shift 1 bit at a time */
-while( (*p  & 0x8000) == 0)
-        {
-        eshup1(x);
-        sc += 1;
-        if( sc > (NBITS+16) )
-                {
-                mtherr( "enormlz", UNDERFLOW );
-                return( sc );
-                }
-        }
-return( sc );
-
-/* Normalize by shifting down out of the high guard word
-   of the significand */
-normdn:
-
-if( *p & 0xff00 )
-        {
-        eshdn8(x);
-        sc -= 8;
-        }
-while( *p != 0 )
-        {
-        eshdn1(x);
-        sc -= 1;
-
-        if( sc < -NBITS )
-                {
-                mtherr( "enormlz", OVERFLOW );
-                return( sc );
-                }
-        }
-return( sc );
-}
-
-
-
-
-/* Convert e type number to decimal format ASCII string.
- * The constants are for 64 bit precision.
- */
-
-#define NTEN 12
-#define MAXP 4096
-
-#if NE == 10
-static unsigned short etens[NTEN + 1][NE] =
-{
-  {0x6576, 0x4a92, 0x804a, 0x153f,
-   0xc94c, 0x979a, 0x8a20, 0x5202, 0xc460, 0x7525,},    /* 10**4096 */
-  {0x6a32, 0xce52, 0x329a, 0x28ce,
-   0xa74d, 0x5de4, 0xc53d, 0x3b5d, 0x9e8b, 0x5a92,},    /* 10**2048 */
-  {0x526c, 0x50ce, 0xf18b, 0x3d28,
-   0x650d, 0x0c17, 0x8175, 0x7586, 0xc976, 0x4d48,},
-  {0x9c66, 0x58f8, 0xbc50, 0x5c54,
-   0xcc65, 0x91c6, 0xa60e, 0xa0ae, 0xe319, 0x46a3,},
-  {0x851e, 0xeab7, 0x98fe, 0x901b,
-   0xddbb, 0xde8d, 0x9df9, 0xebfb, 0xaa7e, 0x4351,},
-  {0x0235, 0x0137, 0x36b1, 0x336c,
-   0xc66f, 0x8cdf, 0x80e9, 0x47c9, 0x93ba, 0x41a8,},
-  {0x50f8, 0x25fb, 0xc76b, 0x6b71,
-   0x3cbf, 0xa6d5, 0xffcf, 0x1f49, 0xc278, 0x40d3,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0xf020, 0xb59d, 0x2b70, 0xada8, 0x9dc5, 0x4069,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0400, 0xc9bf, 0x8e1b, 0x4034,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x2000, 0xbebc, 0x4019,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0x9c40, 0x400c,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0xc800, 0x4005,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x4002,},    /* 10**1 */
-};
-
-static unsigned short emtens[NTEN + 1][NE] =
-{
-  {0x2030, 0xcffc, 0xa1c3, 0x8123,
-   0x2de3, 0x9fde, 0xd2ce, 0x04c8, 0xa6dd, 0x0ad8,},    /* 10**-4096 */
-  {0x8264, 0xd2cb, 0xf2ea, 0x12d4,
-   0x4925, 0x2de4, 0x3436, 0x534f, 0xceae, 0x256b,},    /* 10**-2048 */
-  {0xf53f, 0xf698, 0x6bd3, 0x0158,
-   0x87a6, 0xc0bd, 0xda57, 0x82a5, 0xa2a6, 0x32b5,},
-  {0xe731, 0x04d4, 0xe3f2, 0xd332,
-   0x7132, 0xd21c, 0xdb23, 0xee32, 0x9049, 0x395a,},
-  {0xa23e, 0x5308, 0xfefb, 0x1155,
-   0xfa91, 0x1939, 0x637a, 0x4325, 0xc031, 0x3cac,},
-  {0xe26d, 0xdbde, 0xd05d, 0xb3f6,
-   0xac7c, 0xe4a0, 0x64bc, 0x467c, 0xddd0, 0x3e55,},
-  {0x2a20, 0x6224, 0x47b3, 0x98d7,
-   0x3f23, 0xe9a5, 0xa539, 0xea27, 0xa87f, 0x3f2a,},
-  {0x0b5b, 0x4af2, 0xa581, 0x18ed,
-   0x67de, 0x94ba, 0x4539, 0x1ead, 0xcfb1, 0x3f94,},
-  {0xbf71, 0xa9b3, 0x7989, 0xbe68,
-   0x4c2e, 0xe15b, 0xc44d, 0x94be, 0xe695, 0x3fc9,},
-  {0x3d4d, 0x7c3d, 0x36ba, 0x0d2b,
-   0xfdc2, 0xcefc, 0x8461, 0x7711, 0xabcc, 0x3fe4,},
-  {0xc155, 0xa4a8, 0x404e, 0x6113,
-   0xd3c3, 0x652b, 0xe219, 0x1758, 0xd1b7, 0x3ff1,},
-  {0xd70a, 0x70a3, 0x0a3d, 0xa3d7,
-   0x3d70, 0xd70a, 0x70a3, 0x0a3d, 0xa3d7, 0x3ff8,},
-  {0xcccd, 0xcccc, 0xcccc, 0xcccc,
-   0xcccc, 0xcccc, 0xcccc, 0xcccc, 0xcccc, 0x3ffb,},    /* 10**-1 */
-};
-#else
-static unsigned short etens[NTEN+1][NE] = {
-{0xc94c,0x979a,0x8a20,0x5202,0xc460,0x7525,},/* 10**4096 */
-{0xa74d,0x5de4,0xc53d,0x3b5d,0x9e8b,0x5a92,},/* 10**2048 */
-{0x650d,0x0c17,0x8175,0x7586,0xc976,0x4d48,},
-{0xcc65,0x91c6,0xa60e,0xa0ae,0xe319,0x46a3,},
-{0xddbc,0xde8d,0x9df9,0xebfb,0xaa7e,0x4351,},
-{0xc66f,0x8cdf,0x80e9,0x47c9,0x93ba,0x41a8,},
-{0x3cbf,0xa6d5,0xffcf,0x1f49,0xc278,0x40d3,},
-{0xf020,0xb59d,0x2b70,0xada8,0x9dc5,0x4069,},
-{0x0000,0x0000,0x0400,0xc9bf,0x8e1b,0x4034,},
-{0x0000,0x0000,0x0000,0x2000,0xbebc,0x4019,},
-{0x0000,0x0000,0x0000,0x0000,0x9c40,0x400c,},
-{0x0000,0x0000,0x0000,0x0000,0xc800,0x4005,},
-{0x0000,0x0000,0x0000,0x0000,0xa000,0x4002,}, /* 10**1 */
-};
-
-static unsigned short emtens[NTEN+1][NE] = {
-{0x2de4,0x9fde,0xd2ce,0x04c8,0xa6dd,0x0ad8,}, /* 10**-4096 */
-{0x4925,0x2de4,0x3436,0x534f,0xceae,0x256b,}, /* 10**-2048 */
-{0x87a6,0xc0bd,0xda57,0x82a5,0xa2a6,0x32b5,},
-{0x7133,0xd21c,0xdb23,0xee32,0x9049,0x395a,},
-{0xfa91,0x1939,0x637a,0x4325,0xc031,0x3cac,},
-{0xac7d,0xe4a0,0x64bc,0x467c,0xddd0,0x3e55,},
-{0x3f24,0xe9a5,0xa539,0xea27,0xa87f,0x3f2a,},
-{0x67de,0x94ba,0x4539,0x1ead,0xcfb1,0x3f94,},
-{0x4c2f,0xe15b,0xc44d,0x94be,0xe695,0x3fc9,},
-{0xfdc2,0xcefc,0x8461,0x7711,0xabcc,0x3fe4,},
-{0xd3c3,0x652b,0xe219,0x1758,0xd1b7,0x3ff1,},
-{0x3d71,0xd70a,0x70a3,0x0a3d,0xa3d7,0x3ff8,},
-{0xcccd,0xcccc,0xcccc,0xcccc,0xcccc,0x3ffb,}, /* 10**-1 */
-};
-#endif
-
-void e24toasc( x, string, ndigs )
-unsigned short x[];
-char *string;
-int ndigs;
-{
-unsigned short w[NI];
-
-e24toe( x, w );
-etoasc( w, string, ndigs );
-}
-
-
-void e53toasc( x, string, ndigs )
-unsigned short x[];
-char *string;
-int ndigs;
-{
-unsigned short w[NI];
-
-e53toe( x, w );
-etoasc( w, string, ndigs );
-}
-
-
-void e64toasc( x, string, ndigs )
-unsigned short x[];
-char *string;
-int ndigs;
-{
-unsigned short w[NI];
-
-e64toe( x, w );
-etoasc( w, string, ndigs );
-}
-
-void e113toasc (x, string, ndigs)
-unsigned short x[];
-char *string;
-int ndigs;
-{
-unsigned short w[NI];
-
-e113toe (x, w);
-etoasc (w, string, ndigs);
-}
-
-
-void etoasc( x, string, ndigs )
-unsigned short x[];
-char *string;
-int ndigs;
-{
-long digit;
-unsigned short y[NI], t[NI], u[NI], w[NI];
-unsigned short *p, *r, *ten;
-unsigned short sign;
-int i, j, k, expon, rndsav;
-char *s, *ss;
-unsigned short m;
-
-rndsav = rndprc;
-#ifdef NANS
-if( eisnan(x) )
-        {
-        sprintf( string, " NaN " );
-        goto bxit;
-        }
-#endif
-rndprc = NBITS;         /* set to full precision */
-emov( x, y ); /* retain external format */
-if( y[NE-1] & 0x8000 )
-        {
-        sign = 0xffff;
-        y[NE-1] &= 0x7fff;
-        }
-else
-        {
-        sign = 0;
-        }
-expon = 0;
-ten = &etens[NTEN][0];
-emov( eone, t );
-/* Test for zero exponent */
-if( y[NE-1] == 0 )
-        {
-        for( k=0; k<NE-1; k++ )
-                {
-                if( y[k] != 0 )
-                        goto tnzro; /* denormalized number */
-                }
-        goto isone; /* legal all zeros */
-        }
-tnzro:
-
-/* Test for infinity.
- */
-if( y[NE-1] == 0x7fff )
-        {
-        if( sign )
-                sprintf( string, " -Infinity " );
-        else
-                sprintf( string, " Infinity " );
-        goto bxit;
-        }
-
-/* Test for exponent nonzero but significand denormalized.
- * This is an error condition.
- */
-if( (y[NE-1] != 0) && ((y[NE-2] & 0x8000) == 0) )
-        {
-        mtherr( "etoasc", DOMAIN );
-        sprintf( string, "NaN" );
-        goto bxit;
-        }
-
-/* Compare to 1.0 */
-i = ecmp( eone, y );
-if( i == 0 )
-        goto isone;
-
-if( i < 0 )
-        { /* Number is greater than 1 */
-/* Convert significand to an integer and strip trailing decimal zeros. */
-        emov( y, u );
-        u[NE-1] = EXONE + NBITS - 1;
-
-        p = &etens[NTEN-4][0];
-        m = 16;
-do
-        {
-        ediv( p, u, t );
-        efloor( t, w );
-        for( j=0; j<NE-1; j++ )
-                {
-                if( t[j] != w[j] )
-                        goto noint;
-                }
-        emov( t, u );
-        expon += (int )m;
-noint:
-        p += NE;
-        m >>= 1;
-        }
-while( m != 0 );
-
-/* Rescale from integer significand */
-        u[NE-1] += y[NE-1] - (unsigned int )(EXONE + NBITS - 1);
-        emov( u, y );
-/* Find power of 10 */
-        emov( eone, t );
-        m = MAXP;
-        p = &etens[0][0];
-        while( ecmp( ten, u ) <= 0 )
-                {
-                if( ecmp( p, u ) <= 0 )
-                        {
-                        ediv( p, u, u );
-                        emul( p, t, t );
-                        expon += (int )m;
-                        }
-                m >>= 1;
-                if( m == 0 )
-                        break;
-                p += NE;
-                }
-        }
-else
-        { /* Number is less than 1.0 */
-/* Pad significand with trailing decimal zeros. */
-        if( y[NE-1] == 0 )
-                {
-                while( (y[NE-2] & 0x8000) == 0 )
-                        {
-                        emul( ten, y, y );
-                        expon -= 1;
-                        }
-                }
-        else
-                {
-                emovi( y, w );
-                for( i=0; i<NDEC+1; i++ )
-                        {
-                        if( (w[NI-1] & 0x7) != 0 )
-                                break;
-/* multiply by 10 */
-                        emovz( w, u );
-                        eshdn1( u );
-                        eshdn1( u );
-                        eaddm( w, u );
-                        u[1] += 3;
-                        while( u[2] != 0 )
-                                {
-                                eshdn1(u);
-                                u[1] += 1;
-                                }
-                        if( u[NI-1] != 0 )
-                                break;
-                        if( eone[NE-1] <= u[1] )
-                                break;
-                        emovz( u, w );
-                        expon -= 1;
-                        }
-                emovo( w, y );
-                }
-        k = -MAXP;
-        p = &emtens[0][0];
-        r = &etens[0][0];
-        emov( y, w );
-        emov( eone, t );
-        while( ecmp( eone, w ) > 0 )
-                {
-                if( ecmp( p, w ) >= 0 )
-                        {
-                        emul( r, w, w );
-                        emul( r, t, t );
-                        expon += k;
-                        }
-                k /= 2;
-                if( k == 0 )
-                        break;
-                p += NE;
-                r += NE;
-                }
-        ediv( t, eone, t );
-        }
-isone:
-/* Find the first (leading) digit. */
-emovi( t, w );
-emovz( w, t );
-emovi( y, w );
-emovz( w, y );
-eiremain( t, y );
-digit = equot[NI-1];
-while( (digit == 0) && (ecmp(y,ezero) != 0) )
-        {
-        eshup1( y );
-        emovz( y, u );
-        eshup1( u );
-        eshup1( u );
-        eaddm( u, y );
-        eiremain( t, y );
-        digit = equot[NI-1];
-        expon -= 1;
-        }
-s = string;
-if( sign )
-        *s++ = '-';
-else
-        *s++ = ' ';
-/* Examine number of digits requested by caller. */
-if( ndigs < 0 )
-        ndigs = 0;
-if( ndigs > NDEC )
-        ndigs = NDEC;
-if( digit == 10 )
-        {
-        *s++ = '1';
-        *s++ = '.';
-        if( ndigs > 0 )
-                {
-                *s++ = '0';
-                ndigs -= 1;
-                }
-        expon += 1;
-        }
-else
-        {
-        *s++ = (char )digit + '0';
-        *s++ = '.';
-        }
-/* Generate digits after the decimal point. */
-for( k=0; k<=ndigs; k++ )
-        {
-/* multiply current number by 10, without normalizing */
-        eshup1( y );
-        emovz( y, u );
-        eshup1( u );
-        eshup1( u );
-        eaddm( u, y );
-        eiremain( t, y );
-        *s++ = (char )equot[NI-1] + '0';
-        }
-digit = equot[NI-1];
---s;
-ss = s;
-/* round off the ASCII string */
-if( digit > 4 )
-        {
-/* Test for critical rounding case in ASCII output. */
-        if( digit == 5 )
-                {
-                emovo( y, t );
-                if( ecmp(t,ezero) != 0 )
-                        goto roun;      /* round to nearest */
-                if( (*(s-1) & 1) == 0 )
-                        goto doexp;     /* round to even */
-                }
-/* Round up and propagate carry-outs */
-roun:
-        --s;
-        k = *s & 0x7f;
-/* Carry out to most significant digit? */
-        if( k == '.' )
-                {
-                --s;
-                k = *s;
-                k += 1;
-                *s = (char )k;
-/* Most significant digit carries to 10? */
-                if( k > '9' )
-                        {
-                        expon += 1;
-                        *s = '1';
-                        }
-                goto doexp;
-                }
-/* Round up and carry out from less significant digits */
-        k += 1;
-        *s = (char )k;
-        if( k > '9' )
-                {
-                *s = '0';
-                goto roun;
-                }
-        }
-doexp:
-/*
-if( expon >= 0 )
-        sprintf( ss, "e+%d", expon );
-else
-        sprintf( ss, "e%d", expon );
-*/
-        sprintf( ss, "E%d", expon );
-bxit:
-rndprc = rndsav;
-}
-
-
-
-
-/*
-;                                                               ASCTOQ
-;               ASCTOQ.MAC              LATEST REV: 11 JAN 84
-;                                       SLM, 3 JAN 78
-;
-;       Convert ASCII string to quadruple precision floating point
-;
-;               Numeric input is free field decimal number
-;               with max of 15 digits with or without 
-;               decimal point entered as ASCII from teletype.
-;       Entering E after the number followed by a second
-;       number causes the second number to be interpreted
-;       as a power of 10 to be multiplied by the first number
-;       (i.e., "scientific" notation).
-;
-;       Usage:
-;               asctoq( string, q );
-*/
-
-/* ASCII to single */
-void asctoe24( s, y )
-char *s;
-unsigned short *y;
-{
-asctoeg( s, y, 24 );
-}
-
-
-/* ASCII to double */
-void asctoe53( s, y )
-char *s;
-unsigned short *y;
-{
-#ifdef DEC
-asctoeg( s, y, 56 );
-#else
-asctoeg( s, y, 53 );
-#endif
-}
-
-
-/* ASCII to long double */
-void asctoe64( s, y )
-char *s;
-unsigned short *y;
-{
-asctoeg( s, y, 64 );
-}
-
-/* ASCII to 128-bit long double */
-void asctoe113 (s, y)
-char *s;
-unsigned short *y;
-{
-asctoeg( s, y, 113 );
-}
-
-/* ASCII to super double */
-void asctoe( s, y )
-char *s;
-unsigned short *y;
-{
-asctoeg( s, y, NBITS );
-}
-
-/* Space to make a copy of the input string: */
-static char lstr[82] = {0};
-
-void asctoeg( ss, y, oprec )
-char *ss;
-unsigned short *y;
-int oprec;
-{
-unsigned short yy[NI], xt[NI], tt[NI];
-int esign, decflg, sgnflg, nexp, exp, prec, lost;
-int k, trail, c, rndsav;
-long lexp;
-unsigned short nsign, *p;
-char *sp, *s;
-
-/* Copy the input string. */
-s = ss;
-while( *s == ' ' ) /* skip leading spaces */
-        ++s;
-sp = lstr;
-for( k=0; k<79; k++ )
-        {
-        if( (*sp++ = *s++) == '\0' )
-                break;
-        }
-*sp = '\0';
-s = lstr;
-
-rndsav = rndprc;
-rndprc = NBITS; /* Set to full precision */
-lost = 0;
-nsign = 0;
-decflg = 0;
-sgnflg = 0;
-nexp = 0;
-exp = 0;
-prec = 0;
-ecleaz( yy );
-trail = 0;
-
-nxtcom:
-k = *s - '0';
-if( (k >= 0) && (k <= 9) )
-        {
-/* Ignore leading zeros */
-        if( (prec == 0) && (decflg == 0) && (k == 0) )
-                goto donchr;
-/* Identify and strip trailing zeros after the decimal point. */
-        if( (trail == 0) && (decflg != 0) )
-                {
-                sp = s;
-                while( (*sp >= '0') && (*sp <= '9') )
-                        ++sp;
-/* Check for syntax error */
-                c = *sp & 0x7f;
-                if( (c != 'e') && (c != 'E') && (c != '\0')
-                        && (c != '\n') && (c != '\r') && (c != ' ')
-                        && (c != ',') )
-                        goto error;
-                --sp;
-                while( *sp == '0' )
-                        *sp-- = 'z';
-                trail = 1;
-                if( *s == 'z' )
-                        goto donchr;
-                }
-/* If enough digits were given to more than fill up the yy register,
- * continuing until overflow into the high guard word yy[2]
- * guarantees that there will be a roundoff bit at the top
- * of the low guard word after normalization.
- */
-        if( yy[2] == 0 )
-                {
-                if( decflg )
-                        nexp += 1; /* count digits after decimal point */
-                eshup1( yy );   /* multiply current number by 10 */
-                emovz( yy, xt );
-                eshup1( xt );
-                eshup1( xt );
-                eaddm( xt, yy );
-                ecleaz( xt );
-                xt[NI-2] = (unsigned short )k;
-                eaddm( xt, yy );
-                }
-        else
-                {
-                /* Mark any lost non-zero digit.  */
-                lost |= k;
-                /* Count lost digits before the decimal point.  */
-                if (decflg == 0)
-                        nexp -= 1;
-                }
-        prec += 1;
-        goto donchr;
-        }
-
-switch( *s )
-        {
-        case 'z':
-                break;
-        case 'E':
-        case 'e':
-                goto expnt;
-        case '.':       /* decimal point */
-                if( decflg )
-                        goto error;
-                ++decflg;
-                break;
-        case '-':
-                nsign = 0xffff;
-                if( sgnflg )
-                        goto error;
-                ++sgnflg;
-                break;
-        case '+':
-                if( sgnflg )
-                        goto error;
-                ++sgnflg;
-                break;
-        case ',':
-        case ' ':
-        case '\0':
-        case '\n':
-        case '\r':
-                goto daldone;
-        case 'i':
-        case 'I':
-                goto infinite;
-        default:
-        error:
-#ifdef NANS
-                enan( yy, NI*16 );
-#else
-                mtherr( "asctoe", DOMAIN );
-                ecleaz(yy);
-#endif
-                goto aexit;
-        }
-donchr:
-++s;
-goto nxtcom;
-
-/* Exponent interpretation */
-expnt:
-
-esign = 1;
-exp = 0;
-++s;
-/* check for + or - */
-if( *s == '-' )
-        {
-        esign = -1;
-        ++s;
-        }
-if( *s == '+' )
-        ++s;
-while( (*s >= '0') && (*s <= '9') )
-        {
-        exp *= 10;
-        exp += *s++ - '0';
-        if (exp > 4977)
-                {
-                if (esign < 0)
-                        goto zero;
-                else
-                        goto infinite;
-                }
-        }
-if( esign < 0 )
-        exp = -exp;
-if( exp > 4932 )
-        {
-infinite:
-        ecleaz(yy);
-        yy[E] = 0x7fff;  /* infinity */
-        goto aexit;
-        }
-if( exp < -4977 )
-        {
-zero:
-        ecleaz(yy);
-        goto aexit;
-        }
-
-daldone:
-nexp = exp - nexp;
-/* Pad trailing zeros to minimize power of 10, per IEEE spec. */
-while( (nexp > 0) && (yy[2] == 0) )
-        {
-        emovz( yy, xt );
-        eshup1( xt );
-        eshup1( xt );
-        eaddm( yy, xt );
-        eshup1( xt );
-        if( xt[2] != 0 )
-                break;
-        nexp -= 1;
-        emovz( xt, yy );
-        }
-if( (k = enormlz(yy)) > NBITS )
-        {
-        ecleaz(yy);
-        goto aexit;
-        }
-lexp = (EXONE - 1 + NBITS) - k;
-emdnorm( yy, lost, 0, lexp, 64 );
-/* convert to external format */
-
-
-/* Multiply by 10**nexp.  If precision is 64 bits,
- * the maximum relative error incurred in forming 10**n
- * for 0 <= n <= 324 is 8.2e-20, at 10**180.
- * For 0 <= n <= 999, the peak relative error is 1.4e-19 at 10**947.
- * For 0 >= n >= -999, it is -1.55e-19 at 10**-435.
- */
-lexp = yy[E];
-if( nexp == 0 )
-        {
-        k = 0;
-        goto expdon;
-        }
-esign = 1;
-if( nexp < 0 )
-        {
-        nexp = -nexp;
-        esign = -1;
-        if( nexp > 4096 )
-                { /* Punt.  Can't handle this without 2 divides. */
-                emovi( etens[0], tt );
-                lexp -= tt[E];
-                k = edivm( tt, yy );
-                lexp += EXONE;
-                nexp -= 4096;
-                }
-        }
-p = &etens[NTEN][0];
-emov( eone, xt );
-exp = 1;
-do
-        {
-        if( exp & nexp )
-                emul( p, xt, xt );
-        p -= NE;
-        exp = exp + exp;
-        }
-while( exp <= MAXP );
-
-emovi( xt, tt );
-if( esign < 0 )
-        {
-        lexp -= tt[E];
-        k = edivm( tt, yy );
-        lexp += EXONE;
-        }
-else
-        {
-        lexp += tt[E];
-        k = emulm( tt, yy );
-        lexp -= EXONE - 1;
-        }
-
-expdon:
-
-/* Round and convert directly to the destination type */
-if( oprec == 53 )
-        lexp -= EXONE - 0x3ff;
-else if( oprec == 24 )
-        lexp -= EXONE - 0177;
-#ifdef DEC
-else if( oprec == 56 )
-        lexp -= EXONE - 0201;
-#endif
-rndprc = oprec;
-emdnorm( yy, k, 0, lexp, 64 );
-
-aexit:
-
-rndprc = rndsav;
-yy[0] = nsign;
-switch( oprec )
-        {
-#ifdef DEC
-        case 56:
-                todec( yy, y ); /* see etodec.c */
-                break;
-#endif
-        case 53:
-                toe53( yy, y );
-                break;
-        case 24:
-                toe24( yy, y );
-                break;
-        case 64:
-                toe64( yy, y );
-                break;
-        case 113:
-                toe113( yy, y );
-                break;
-        case NBITS:
-                emovo( yy, y );
-                break;
-        }
-}
-
-
- 
-/* y = largest integer not greater than x
- * (truncated toward minus infinity)
- *
- * unsigned short x[NE], y[NE]
- *
- * efloor( x, y );
- */
-static unsigned short bmask[] = {
-0xffff,
-0xfffe,
-0xfffc,
-0xfff8,
-0xfff0,
-0xffe0,
-0xffc0,
-0xff80,
-0xff00,
-0xfe00,
-0xfc00,
-0xf800,
-0xf000,
-0xe000,
-0xc000,
-0x8000,
-0x0000,
-};
-
-void efloor( x, y )
-unsigned short x[], y[];
-{
-register unsigned short *p;
-int e, expon, i;
-unsigned short f[NE];
-
-emov( x, f ); /* leave in external format */
-expon = (int )f[NE-1];
-e = (expon & 0x7fff) - (EXONE - 1);
-if( e <= 0 )
-        {
-        eclear(y);
-        goto isitneg;
-        }
-/* number of bits to clear out */
-e = NBITS - e;
-emov( f, y );
-if( e <= 0 )
-        return;
-
-p = &y[0];
-while( e >= 16 )
-        {
-        *p++ = 0;
-        e -= 16;
-        }
-/* clear the remaining bits */
-*p &= bmask[e];
-/* truncate negatives toward minus infinity */
-isitneg:
-
-if( (unsigned short )expon & (unsigned short )0x8000 )
-        {
-        for( i=0; i<NE-1; i++ )
-                {
-                if( f[i] != y[i] )
-                        {
-                        esub( eone, y, y );
-                        break;
-                        }
-                }
-        }
-}
-
-
-/* unsigned short x[], s[];
- * long *exp;
- *
- * efrexp( x, exp, s );
- *
- * Returns s and exp such that  s * 2**exp = x and .5 <= s < 1.
- * For example, 1.1 = 0.55 * 2**1
- * Handles denormalized numbers properly using long integer exp.
- */
-void efrexp( x, exp, s )
-unsigned short x[];
-long *exp;
-unsigned short s[];
-{
-unsigned short xi[NI];
-long li;
-
-emovi( x, xi );
-li = (long )((short )xi[1]);
-
-if( li == 0 )
-        {
-        li -= enormlz( xi );
-        }
-xi[1] = 0x3ffe;
-emovo( xi, s );
-*exp = li - 0x3ffe;
-}
-
-
-
-/* unsigned short x[], y[];
- * long pwr2;
- *
- * eldexp( x, pwr2, y );
- *
- * Returns y = x * 2**pwr2.
- */
-void eldexp( x, pwr2, y )
-unsigned short x[];
-long pwr2;
-unsigned short y[];
-{
-unsigned short xi[NI];
-long li;
-int i;
-
-emovi( x, xi );
-li = xi[1];
-li += pwr2;
-i = 0;
-emdnorm( xi, i, i, li, 64 );
-emovo( xi, y );
-}
-
-
-/* c = remainder after dividing b by a
- * Least significant integer quotient bits left in equot[].
- */
-void eremain( a, b, c )
-unsigned short a[], b[], c[];
-{
-unsigned short den[NI], num[NI];
-
-#ifdef NANS
-if( eisinf(b) || (ecmp(a,ezero) == 0) || eisnan(a) || eisnan(b))
-        {
-        enan( c, NBITS );
-        return;
-        }
-#endif
-if( ecmp(a,ezero) == 0 )
-        {
-        mtherr( "eremain", SING );
-        eclear( c );
-        return;
-        }
-emovi( a, den );
-emovi( b, num );
-eiremain( den, num );
-/* Sign of remainder = sign of quotient */
-if( a[0] == b[0] )
-        num[0] = 0;
-else
-        num[0] = 0xffff;
-emovo( num, c );
-}
-
-
-void eiremain( den, num )
-unsigned short den[], num[];
-{
-long ld, ln;
-unsigned short j;
-
-ld = den[E];
-ld -= enormlz( den );
-ln = num[E];
-ln -= enormlz( num );
-ecleaz( equot );
-while( ln >= ld )
-        {
-        if( ecmpm(den,num) <= 0 )
-                {
-                esubm(den, num);
-                j = 1;
-                }
-        else
-                {
-                j = 0;
-                }
-        eshup1(equot);
-        equot[NI-1] |= j;
-        eshup1(num);
-        ln -= 1;
-        }
-emdnorm( num, 0, 0, ln, 0 );
-}
-
-/* NaN bit patterns
- */
-#ifdef MIEEE
-unsigned short nan113[8] = {
-  0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff};
-unsigned short nan64[6] = {0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff};
-unsigned short nan53[4] = {0x7fff, 0xffff, 0xffff, 0xffff};
-unsigned short nan24[2] = {0x7fff, 0xffff};
-#endif
-
-#ifdef IBMPC
-unsigned short nan113[8] = {0, 0, 0, 0, 0, 0, 0xc000, 0xffff};
-unsigned short nan64[6] = {0, 0, 0, 0xc000, 0xffff, 0};
-unsigned short nan53[4] = {0, 0, 0, 0xfff8};
-unsigned short nan24[2] = {0, 0xffc0};
-#endif
-
-
-void enan (nan, size)
-unsigned short *nan;
-int size;
-{
-int i, n;
-unsigned short *p;
-
-switch( size )
-        {
-#ifndef DEC
-        case 113:
-        n = 8;
-        p = nan113;
-        break;
-
-        case 64:
-        n = 6;
-        p = nan64;
-        break;
-
-        case 53:
-        n = 4;
-        p = nan53;
-        break;
-
-        case 24:
-        n = 2;
-        p = nan24;
-        break;
-
-        case NBITS:
-        for( i=0; i<NE-2; i++ )
-                *nan++ = 0;
-        *nan++ = 0xc000;
-        *nan++ = 0x7fff;
-        return;
-
-        case NI*16:
-        *nan++ = 0;
-        *nan++ = 0x7fff;
-        *nan++ = 0;
-        *nan++ = 0xc000;
-        for( i=4; i<NI; i++ )
-                *nan++ = 0;
-        return;
-#endif
-        default:
-        mtherr( "enan", DOMAIN );
-        return;
-        }
-for (i=0; i < n; i++)
-        *nan++ = *p++;
-}
-
-
-
-/* Longhand square root. */
-
-static int esqinited = 0;
-static unsigned short sqrndbit[NI];
-
-void esqrt( x, y )
-short *x, *y;
-{
-unsigned short temp[NI], num[NI], sq[NI], xx[NI];
-int i, j, k, n, nlups;
-long m, exp;
-
-if( esqinited == 0 )
-        {
-        ecleaz( sqrndbit );
-        sqrndbit[NI-2] = 1;
-        esqinited = 1;
-        }
-/* Check for arg <= 0 */
-i = ecmp( x, ezero );
-if( i <= 0 )
-        {
-#ifdef NANS
-        if (i == -2)
-                {
-                enan (y, NBITS);
-                return;
-                }
-#endif
-        eclear(y);
-        if( i < 0 )
-                mtherr( "esqrt", DOMAIN );
-        return;
-        }
-
-#ifdef INFINITY
-if( eisinf(x) )
-        {
-        eclear(y);
-        einfin(y);
-        return;
-        }
-#endif
-/* Bring in the arg and renormalize if it is denormal. */
-emovi( x, xx );
-m = (long )xx[1]; /* local long word exponent */
-if( m == 0 )
-        m -= enormlz( xx );
-
-/* Divide exponent by 2 */
-m -= 0x3ffe;
-exp = (unsigned short )( (m / 2) + 0x3ffe );
-
-/* Adjust if exponent odd */
-if( (m & 1) != 0 )
-        {
-        if( m > 0 )
-                exp += 1;
-        eshdn1( xx );
-        }
-
-ecleaz( sq );
-ecleaz( num );
-n = 8; /* get 8 bits of result per inner loop */
-nlups = rndprc;
-j = 0;
-
-while( nlups > 0 )
-        {
-/* bring in next word of arg */
-        if( j < NE )
-                num[NI-1] = xx[j+3];
-/* Do additional bit on last outer loop, for roundoff. */
-        if( nlups <= 8 )
-                n = nlups + 1;
-        for( i=0; i<n; i++ )
-                {
-/* Next 2 bits of arg */
-                eshup1( num );
-                eshup1( num );
-/* Shift up answer */
-                eshup1( sq );
-/* Make trial divisor */
-                for( k=0; k<NI; k++ )
-                        temp[k] = sq[k];
-                eshup1( temp );
-                eaddm( sqrndbit, temp );
-/* Subtract and insert answer bit if it goes in */
-                if( ecmpm( temp, num ) <= 0 )
-                        {
-                        esubm( temp, num );
-                        sq[NI-2] |= 1;
-                        }
-                }
-        nlups -= n;
-        j += 1;
-        }
-
-/* Adjust for extra, roundoff loop done. */
-exp += (NBITS - 1) - rndprc;
-
-/* Sticky bit = 1 if the remainder is nonzero. */
-k = 0;
-for( i=3; i<NI; i++ )
-        k |= (int )num[i];
-
-/* Renormalize and round off. */
-emdnorm( sq, k, 0, exp, 64 );
-emovo( sq, y );
-}
diff --git a/src/regress/lib/libc/cephes/ieetst.c b/src/regress/lib/libc/cephes/ieetst.c
deleted file mode 100644
index 974fb65c13..0000000000
--- a/src/regress/lib/libc/cephes/ieetst.c
+++ /dev/null
@@ -1,881 +0,0 @@
-/*      $OpenBSD: ieetst.c,v 1.3 2017/07/27 15:08:37 bluhm Exp $        */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Floating point to ASCII input and output string test program.
- *
- * Numbers in the native machine data structure are converted
- * to e type, then to and from decimal ASCII strings.  Native
- * printf() and scanf() functions are also used to produce
- * and read strings.  The resulting e type binary values
- * are compared, with diagnostic printouts of any discrepancies.
- *
- * Steve Moshier, 16 Dec 88
- * last revision: 16 May 92
- */
-
-#include <float.h>
-#include <stdio.h>
-
-#include "mconf.h"
-#include "ehead.h"
-
-/* Include tests of 80-bit long double precision: */
-#if     LDBL_MANT_DIG == 64
-#define LDOUBLE 1
-#else   /* LDBL_MANT_DIG == 64 */
-#define LDOUBLE 0
-#endif  /* LDBL_MANT_DIG == 64 */
-/* Abort subtest after getting this many errors: */
-#define MAXERR 5
-/* Number of random arguments to try (set as large as you have
- * patience for): */
-#define NRAND 100
-/* Perform internal consistency test: */
-#define CHKINTERNAL 0
-
-static unsigned short fullp[NE], rounded[NE];
-float prec24, sprec24, ssprec24;
-double prec53, sprec53, ssprec53;
-#if LDOUBLE
-long double prec64, sprec64, ssprec64;
-#endif
-
-static unsigned short rprint[NE], rscan[NE];
-static unsigned short q1[NE], q2[NE], q5[NE];
-static unsigned short e1[NE], e2[NE], e3[NE];
-static double d1, d2;
-static int errprint = 0;
-static int errscan = 0;
-static int identerr = 0;
-static int errtot = 0;
-static int count = 0;
-static char str0[80], str1[80], str2[80], str3[80];
-static unsigned short eten[NE], maxm[NE];
-
-int m, n, k2, mprec, SPREC;
-
-char *Ten = "10.0";
-char tformat[10];
-char *format24 = "%.8e";
-#ifdef DEC
-char *format53 = "%.17e";
-#else
-char *format53 = "%.16e";
-#endif
-char *fformat24 = "%e";
-char *fformat53 = "%le";
-char *pct = "%";
-char *quo = "\042";
-#if LDOUBLE
-char *format64 = "%.20Le";
-char *fformat64 = "%Le";
-#endif
-char *format;
-char *fformat;
-char *toomany = "Too many errors; aborting this test.\n";
-
-static int mnrflag;
-static int etrflag;
-void chkit(), printerr(), mnrand(), etrand(), shownoncrit();
-void chkid(), pvec();
-
-int
-main()
-{
-int i, iprec, retval = 0;
-
-printf( "Steve Moshier's printf/scanf tester, version 0.2.\n\n" );
-#ifdef DEC
- /* DEC PDP-11/VAX single precision not yet implemented */
-for( iprec = 1; iprec<2; iprec++ )
-#else
-for( iprec = 0; iprec<3; iprec++ )
-/*for( iprec = 2; iprec<3; iprec++ )*/
-#endif
-        {
-        errscan = 0;
-        identerr = 0;
-        errprint = 0;
-        eclear( rprint );
-        eclear( rscan );
-
-switch( iprec )
-        {
-        case 0:
-                SPREC = 8; /* # digits after the decimal point */
-                mprec = 24; /* # bits in the significand */
-                m = 9; /* max # decimal digits for correct rounding */
-                n = 13; /* max power of ten for correct rounding */
-                k2 = -125; /* underflow beyond 2^-k2 */
-                format = format24; /* printf format string */
-                fformat = fformat24; /* scanf format string */
-                mnrflag = 1; /* sets interval for random numbers */
-                etrflag = 1;
-                printf( "Testing FLOAT precision.\n" );
-                break;
-
-        case 1:
-#ifdef DEC
-                SPREC = 17;
-                mprec = 56;
-                m = 17;
-                n = 27;
-                k2 = -125;
-                format = format53;
-                fformat = fformat53;
-                mnrflag = 2;
-                etrflag = 1;
-                printf( "Testing DEC DOUBLE precision.\n" );
-                break;
-#else
-                SPREC = 16;
-                mprec = 53;
-                m = 17;
-                n = 27;
-                k2 = -1021;
-                format = format53;
-                fformat = fformat53;
-                mnrflag = 2;
-                etrflag = 2;
-                printf( "Testing DOUBLE precision.\n" );
-                break;
-#endif
-        case 2:
-#if LDOUBLE
-                SPREC = 20;
-                mprec = 64;
-                m = 20;
-                n = 34;
-                k2 = -16382;
-                format = format64;
-                fformat = fformat64;
-                mnrflag = 3;
-                etrflag = 3;
-                printf( "Testing LONG DOUBLE precision.\n" );
-                break;
-#else
-                goto nodenorm;
-#endif
-        }
-
-        asctoe( Ten, eten );
-/* 10^m - 1 */
-        d2 = m;
-        e53toe( &d2, e1 );
-        epow( eten, e1, maxm );
-        esub( eone, maxm, maxm );
-
-/* test 1 */
-        printf( "1. Checking 10^n - 1 for n = %d to %d.\n", -m, m );
-        emov( eone, q5 );
-        for( count=0; count<=m; count++ )
-                {
-                esub( eone, q5, fullp );
-                chkit( 1 );
-                ediv( q5, eone, q2 );
-                esub( eone, q2, fullp );
-                chkit( 1 );
-                emul( eten, q5, q5 );
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto end1;
-                        }
-                }
-end1:
-        printerr();
-
-
-/* test 2 */
-        printf( "2. Checking powers of 10 from 10^-%d to 10^%d.\n", n, n );
-        emov( eone, q5 );
-        for( count=0; count<=n; count++ )
-                {
-                emov( q5, fullp );
-                chkit( 2 );
-                ediv( q5, eone, fullp );
-                chkit( 2 );
-                emul( eten, q5, q5 );
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto end2;
-                        }
-                }
-end2:
-        printerr();
-
-/* test 3 */
-        printf( "3. Checking (10^%d-1)*10^n from n = -%d to %d.\n", m, n, n );
-        emov( eone, q5 );
-        for( count= -n; count<=n; count++ )
-                {
-                emul( maxm, q5, fullp );
-                chkit( 3 );
-                emov( q5, fullp );
-                ediv( fullp, eone, fullp );
-                emul( maxm, fullp, fullp );
-                chkit( 3 );
-                emul( eten, q5, q5 );
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto end3;
-                        }
-                }
-end3:
-        printerr();
-
-
-
-/* test 4 */
-        printf( "4. Checking powers of 2 from 2^-24 to 2^+56.\n" );
-        d1 = -24.0;
-        e53toe( &d1, q1 );
-        epow( etwo, q1, q5 );
-
-        for( count = -24; count <= 56; count++ )
-                {
-                emov( q5, fullp );
-                chkit( 4 );
-                emul( etwo, q5, q5 );
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto end4;
-                        }
-                }
-end4:
-        printerr();
-
-
-/* test 5 */
-        printf( "5. Checking 2^n - 1 for n = 0 to %d.\n", mprec );
-        emov( eone, q5 );
-        for( count=0; count<=mprec; count++ )
-                {
-                esub( eone, q5, fullp );
-                chkit( 5 );
-                emul( etwo, q5, q5 );
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto end5;
-                        }
-                }
-end5:
-        printerr();
-
-/* test 6 */
-        printf( "6. Checking 2^n + 1 for n = 0 to %d.\n", mprec );
-        emov( eone, q5 );
-        for( count=0; count<=mprec; count++ )
-                {
-                eadd( eone, q5, fullp );
-                chkit( 6 );
-                emul( etwo, q5, q5 );
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto end6;
-                        }
-                }
-end6:
-        printerr();
-
-/* test 7 */
-        printf(
-         "7. Checking %d values M * 10^N with random integer M and N,\n",
-         NRAND );
-        printf("  1 <= M <= 10^%d - 1  and  -%d <= N <= +%d.\n", m, n, n );
-        for( i=0; i<NRAND; i++ )
-                {
-                mnrand( fullp );
-                chkit( 7 );
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto end7;
-                        }
-                }
-end7:
-        printerr();
-
-/* test 8 */
-        printf("8. Checking critical rounding cases.\n" );
-        for( i=0; i<20; i++ )
-                {
-                mnrand( fullp );
-                eabs( fullp );
-                if( ecmp( fullp, eone ) < 0 )
-                        ediv( fullp, eone, fullp );
-                efloor( fullp, fullp );
-                eadd( ehalf, fullp, fullp );
-                chkit( 8 );
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto end8;
-                        }
-                }
-end8:
-        printerr();
-
-
-
-/* test 9 */
-        printf("9. Testing on %d random non-denormal values.\n", NRAND );
-        for( i=0; i<NRAND; i++ )
-                {
-                etrand( fullp );
-                chkit( 9 );
-                }
-        printerr();
-        shownoncrit();
-
-/* test 10 */
-#if 0
-        printf(
-        "Do you want to check denormal numbers in this precision ? (y/n) " );
-        gets( str0 );
-        if( str0[0] != 'y' )
-                goto nodenorm;
-#endif
-
-        printf( "10. Checking denormal numbers.\n" );
-
-/* Form 2^-starting power */
-        d1 = k2;
-        e53toe( &d1, q1 );
-        epow( etwo, q1, e1 );
-
-/* Find 2^-mprec less than starting power */
-        d1 = -mprec + 4;
-        e53toe( &d1, q1 );
-        epow( etwo, q1, e3 );
-        emul( e1, e3, e3 );
-        emov( e3, e2 );
-        ediv( etwo, e2, e2 );
-
-        while( ecmp(e1,e2) != 0 )
-                {
-                eadd( e1, e2, fullp );
-                switch( mprec )
-                        {
-#if LDOUBLE
-                        case 64:
-                        etoe64( e1, &sprec64 );
-                        e64toe( &sprec64, q1 );
-                        etoe64( fullp, &prec64 );
-                        e64toe( &prec64, q2 );
-                        break;
-#endif
-#ifdef DEC
-                        case 56:
-#endif
-                        case 53:
-                        etoe53( e1, &sprec53 );
-                        e53toe( &sprec53, q1 );
-                        etoe53( fullp, &prec53 );
-                        e53toe( &prec53, q2 );
-                        break;
-
-                        case 24:
-                        etoe24( e1, &sprec24 );
-                        e24toe( &sprec24, q1 );
-                        etoe24( fullp, &prec24 );
-                        e24toe( &prec24, q2 );
-                        break;
-                        }
-                if( ecmp( q2, ezero ) == 0 )
-                        goto maxden;
-                chkit(10);
-                if( ecmp(q1,q2) == 0 )
-                        {
-                        ediv( etwo, e1, e1 );
-                        emov( e3, e2 );
-                        }
-                if( errtot >= MAXERR )
-                        {
-                        printf( "%s", toomany );
-                        goto maxden;
-                        }
-                ediv( etwo, e2, e2 );
-                }
-maxden:
-        printerr();
-nodenorm:
-        printf( "\n" );
-        retval |= errscan | identerr | errprint;
-        } /* loop on precision */
-printf( "End of test.\n" );
-return (retval);
-}
-
-#if CHKINTERNAL
-long double xprec64;
-double xprec53;
-float xprec24;
-
-/* Check binary -> printf -> scanf -> binary identity
- * of internal routines
- */
-void chkinternal( ref, tst, string )
-unsigned short ref[], tst[];
-char *string;
-{
-
-if( ecmp(ref,tst) != 0 )
-        {
-        printf( "internal identity compare error!\n" );
-        chkid( ref, tst, string );
-        }
-}
-#endif
-
-
-/* Check binary -> printf -> scanf -> binary identity
- */
-void chkid( print, scan, string )
-unsigned short print[], scan[];
-char *string;
-{
-/* Test printf-scanf identity */
-if( ecmp( print, scan ) != 0 )
-        {
-        pvec( print, NE );
-        printf( " ->printf-> %s ->scanf->\n", string );
-        pvec( scan, NE );
-        printf( " is not an identity.\n" );
-        ++identerr;
-        }
-}
-
-
-/* Check scanf result
- */
-void chkscan( ref, tst, string )
-unsigned short ref[], tst[];
-char *string;
-{
-/* Test scanf()  */
-if( ecmp( ref, tst ) != 0 )
-        {
-        printf( "scanf(%s) -> ", string );
-        pvec( tst, NE );
-        printf( "\n should be    " );
-        pvec( ref, NE );
-        printf( ".\n" );
-        ++errscan;
-        ++errtot;
-        }
-}
-
-
-/* Test printf() result
- */
-void chkprint( ref, tst, string ) 
-unsigned short ref[], tst[];
-char *string;
-{
-if( ecmp(ref, tst) != 0 )
-        {
-        printf( "printf( ");
-        pvec( ref, NE );
-        printf( ") -> %s\n", string );
-        printf( "      = " );
-        pvec( tst, NE );
-        printf( ".\n" );
-        ++errprint;
-        ++errtot;
-        }
-}
-
-
-/* Print array of n 16-bit shorts
- */
-void pvec( x, n )
-unsigned short x[];
-int n;
-{
-int i;
-
-for( i=0; i<n; i++ )
-        {
-        printf( "%04x ", x[i] );
-        }
-}
-
-/* Measure worst case printf rounding error
- */
-void cmpprint( ref, tst )
-unsigned short ref[], tst[];
-{
-unsigned short e[NE];
-
-if( ecmp( ref, ezero ) != 0 )
-        {
-        esub( ref, tst, e );
-        ediv( ref, e, e );
-        eabs( e );
-        if( ecmp( e, rprint ) > 0 )
-                emov( e, rprint );
-        }
-}
-
-/* Measure worst case scanf rounding error
- */
-void cmpscan( ref, tst )
-unsigned short ref[], tst[];
-{
-unsigned short er[NE];
-
-if( ecmp( ref, ezero ) != 0 )
-        {
-        esub( ref, tst, er );
-        ediv( ref, er, er );
-        eabs( er );
-        if( ecmp( er, rscan ) > 0 )
-                emov( er, rscan );
-        if( ecmp( er, ehalf ) > 0 )
-                {
-                etoasc( tst, str1, 21 );
-                printf( "Bad error: scanf(%s) = %s !\n", str0, str1 );
-                }
-        }
-}
-
-/* Check rounded-down decimal string output of printf
- */
-void cmptrunc( ref, tst )
-unsigned short ref[], tst[];
-{
-if( ecmp( ref, tst ) != 0 )
-        {
-        printf( "printf(%s%s%s, %s) -> %s\n", quo, tformat, quo, str1, str2 );
-        printf( "should be      %s .\n", str3 );
-        errprint += 1;
-        }
-}
-
-
-void shownoncrit()
-{
-
-etoasc( rprint, str0, 3 );
-printf( "Maximum relative printf error found = %s .\n", str0 );
-etoasc( rscan, str0, 3 );
-printf( "Maximum relative scanf error found = %s .\n", str0 );
-}
-
-
-
-/* Produce arguments and call comparison subroutines.
- */
-void chkit( testno )
-int testno;
-{
-unsigned short t[NE], u[NE], v[NE];
-int j;
-
-switch( mprec )
-        {
-#if LDOUBLE
-        case 64:
-                etoe64( fullp, &prec64 );
-                e64toe( &prec64, rounded );
-#if CHKINTERNAL
-                e64toasc( &prec64, str1, SPREC );
-                asctoe64( str1, &xprec64 );
-                e64toe( &xprec64, t );
-                chkinternal( rounded, t, str1 );
-#endif
-/* check printf and scanf */
-                sprintf( str2, format, prec64 );
-                sscanf( str2, fformat, &sprec64 );
-                e64toe( &sprec64, u );
-                chkid( rounded, u, str2 );
-                asctoe64( str2, &ssprec64 );
-                e64toe( &ssprec64, v );
-                chkscan( v, u, str2 );
-                chkprint( rounded, v, str2 );
-                if( testno < 8 )
-                        break;
-/* rounding error measurement */
-                etoasc( fullp, str0, 24 );
-                etoe64( fullp, &ssprec64 );
-                e64toe( &ssprec64, u );
-                sprintf( str2, format, ssprec64 );
-                asctoe( str2, t );
-                cmpprint( u, t );
-                sscanf( str0, fformat, &sprec64 );
-                e64toe( &sprec64, t );
-                cmpscan( fullp, t );
-                if( testno < 8 )
-                        break;
-/* strings rounded to less than maximum precision */
-                e64toasc( &ssprec64, str1, 24 );
-                for( j=SPREC-1; j>0; j-- )              
-                        {
-                        e64toasc( &ssprec64, str3, j );
-                        asctoe( str3, v );
-                        sprintf( tformat, "%s.%dLe", pct, j );
-                        sprintf( str2, tformat, ssprec64 );
-                        asctoe( str2, t );
-                        cmptrunc( v, t );
-                        }
-                break;
-#endif
-#ifdef DEC
-        case 56:
-#endif
-        case 53:
-                etoe53( fullp, &prec53 );
-                e53toe( &prec53, rounded );
-#if CHKINTERNAL
-                e53toasc( &prec53, str1, SPREC );
-                asctoe53( str1, &xprec53 );
-                e53toe( &xprec53, t );
-                chkinternal( rounded, t, str1 );
-#endif
-                sprintf( str2, format, prec53 );
-                sscanf( str2, fformat, &sprec53 );
-                e53toe( &sprec53, u );
-                chkid( rounded, u, str2 );
-                asctoe53( str2, &ssprec53 );
-                e53toe( &ssprec53, v );
-                chkscan( v, u, str2 );
-                chkprint( rounded, v, str2 );
-                if( testno < 8 )
-                        break;
-/* rounding error measurement */
-                etoasc( fullp, str0, 24 );
-                etoe53( fullp, &ssprec53 );
-                e53toe( &ssprec53, u );
-                sprintf( str2, format, ssprec53 );
-                asctoe( str2, t );
-                cmpprint( u, t );
-                sscanf( str0, fformat, &sprec53 );
-                e53toe( &sprec53, t );
-                cmpscan( fullp, t );
-                if( testno < 8 )
-                        break;
-                e53toasc( &ssprec53, str1, 24 );
-                for( j=SPREC-1; j>0; j-- )              
-                        {
-                        e53toasc( &ssprec53, str3, j );
-                        asctoe( str3, v );
-                        sprintf( tformat, "%s.%de", pct, j );
-                        sprintf( str2, tformat, ssprec53 );
-                        asctoe( str2, t );
-                        cmptrunc( v, t );
-                        }
-                break;
-
-        case 24:
-                etoe24( fullp, &prec24 );
-                e24toe( &prec24, rounded );
-#if CHKINTERNAL
-                e24toasc( &prec24, str1, SPREC );
-                asctoe24( str1, &xprec24 );
-                e24toe( &xprec24, t );
-                chkinternal( rounded, t, str1 );
-#endif
-                sprintf( str2, format, prec24 );
-                sscanf( str2, fformat, &sprec24 );
-                e24toe( &sprec24, u );
-                chkid( rounded, u, str2 );
-                asctoe24( str2, &ssprec24 );
-                e24toe( &ssprec24, v );
-                chkscan( v, u, str2 );
-                chkprint( rounded, v, str2 );
-                if( testno < 8 )
-                        break;
-/* rounding error measurement */
-                etoasc( fullp, str0, 24 );
-                etoe24( fullp, &ssprec24 );
-                e24toe( &ssprec24, u );
-                sprintf( str2, format, ssprec24 );
-                asctoe( str2, t );
-                cmpprint( u, t );
-                sscanf( str0, fformat, &sprec24 );
-                e24toe( &sprec24, t );
-                cmpscan( fullp, t );
-/*
-                if( testno < 8 )
-                        break;
-*/
-                e24toasc( &ssprec24, str1, 24 );
-                for( j=SPREC-1; j>0; j-- )              
-                        {
-                        e24toasc( &ssprec24, str3, j );
-                        asctoe( str3, v );
-                        sprintf( tformat, "%s.%de", pct, j );
-                        sprintf( str2, tformat, ssprec24 );
-                        asctoe( str2, t );
-                        cmptrunc( v, t );
-                        }
-                break;
-        }
-}
-
-
-void printerr()
-{
-if( (errscan == 0) && (identerr == 0) && (errprint == 0) )
-        printf( "No errors found.\n" );
-else
-        {
-        printf( "%d binary -> decimal errors found.\n", errprint );
-        printf( "%d decimal -> binary errors found.\n", errscan );
-        }
-errscan = 0;    /* reset for next test */
-identerr = 0;
-errprint = 0;
-errtot = 0;
-}
-
-
-/* Random number generator
- * in the range M * 10^N, where 1 <= M <= 10^17 - 1
- * and -27 <= N <= +27.  Test values of M are logarithmically distributed
- * random integers; test values of N are uniformly distributed random integers.
- */
-
-static char *fwidth = "1.036163291797320557783096e1"; /* log(sqrt(10^9-1)) */
-static char *dwidth = "1.957197329044938830915E1"; /* log(sqrt(10^17-1)) */
-static char *ldwidth = "2.302585092994045684017491e1"; /* log(sqrt(10^20-1)) */
-
-static char *a13 = "13.0";
-static char *a27 = "27.0";
-static char *a34 = "34.0";
-static char *a10m13 = "1.0e-13";
-static unsigned short LOW[ NE ], WIDTH[NE], e27[NE], e10m13[NE];
-
-
-void mnrand( erand )
-unsigned short erand[];
-{
-unsigned short ea[NE], em[NE], en[NE], ex[NE];
-double x, a;
-
-if( mnrflag )
-        {
-        if( mnrflag == 3 )
-                {
-                asctoe( ldwidth, WIDTH );
-                asctoe( a34, e27 );
-                }
-        if( mnrflag == 2 )
-                {
-                asctoe( dwidth, WIDTH );
-                asctoe( a27, e27 );
-                }
-        if( mnrflag == 1 )
-                {
-                asctoe( fwidth, WIDTH );
-                asctoe( a13, e27 );
-                }
-        asctoe( a10m13, e10m13 );
-        mnrflag = 0;
-        }
-drand( &x );
-e53toe( &x, ex ); /* x = WIDTH *  ( x - 1.0 )  +  LOW; */
-esub( eone, ex, ex );
-emul( WIDTH, ex, ex );
-eexp( ex, ex );   /* x = exp(x); */
-
-drand( &a );
-e53toe( &a, ea );
-emul( ea, ex, ea );  /* a = 1.0e-13 * x * a; */
-emul( e10m13, ea, ea );
-eabs( ea );
-eadd( ea, ex, ex );     /* add fuzz */
-emul( ex, ex, ex );     /* square it, to get range to 10^17 - 1 */
-efloor( ex, em ); /* this is M */
-
-/* Random power of 10 */
-drand( &a );
-e53toe( &a, ex );
-esub( eone, ex, ex ); /* y3 = 54.0 *  ( y3 - 1.0 ) + 0.5; */
-emul( e27, ex, ex );
-eadd( ex, ex, ex );
-eadd( ehalf, ex, ex );
-efloor( ex, ex ); /* y3 = floor( y3 ) - 27.0; */
-esub( e27, ex, en ); /* this is N */
-epow( eten, en, ex );
-emul( ex, em, erand );
-}
-
-/* -ln 2^16382 */
-char *ldemin = "-1.1355137111933024058873097E4";
-char *ldewid =  "2.2710274223866048117746193E4";
-/* -ln 2^1022 */
-char *demin  = "-7.0839641853226410622441123E2";
-char *dewid  =  "1.4167928370645282124488225E3";
-/* -ln 2^125 */
-char *femin  = "-8.6643397569993163677154015E1";
-char *fewid  =  "1.7328679513998632735430803E2";
-
-void etrand( erand )
-unsigned short erand[];
-{
-unsigned short ea[NE], ex[NE];
-double x, a;
-
-if( etrflag )
-        {
-        if( etrflag == 3 )
-                {
-                asctoe( ldemin, LOW );
-                asctoe( ldewid, WIDTH );
-                asctoe( a34, e27 );
-                }
-        if( etrflag == 2 )
-                {
-                asctoe( demin, LOW );
-                asctoe( dewid, WIDTH );
-                asctoe( a27, e27 );
-                }
-        if( etrflag == 1 )
-                {
-                asctoe( femin, LOW );
-                asctoe( fewid, WIDTH );
-                asctoe( a13, e27 );
-                }
-        asctoe( a10m13, e10m13 );
-        etrflag = 0;
-        }
-drand( &x );
-e53toe( &x, ex ); /* x = WIDTH *  ( x - 1.0 )  +  LOW; */
-esub( eone, ex, ex );
-emul( WIDTH, ex, ex );
-eadd( LOW, ex, ex );
-eexp( ex, ex );   /* x = exp(x); */
-
-/* add fuzz
- */
-drand( &a );
-e53toe( &a, ea );
-emul( ea, ex, ea );  /* a = 1.0e-13 * x * a; */
-emul( e10m13, ea, ea );
-if( ecmp( ex, ezero ) > 0 )
-        eneg( ea );
-eadd( ea, ex, erand );
-}
-
diff --git a/src/regress/lib/libc/cephes/mconf.h b/src/regress/lib/libc/cephes/mconf.h
deleted file mode 100644
index 410849c355..0000000000
--- a/src/regress/lib/libc/cephes/mconf.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*      $OpenBSD: mconf.h,v 1.3 2017/07/27 15:08:37 bluhm Exp $ */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                                      mconf.h
- *
- *      Common include file for math routines
- *
- *
- *
- * SYNOPSIS:
- *
- * #include "mconf.h"
- *
- *
- *
- * DESCRIPTION:
- *
- * This file contains definitions for error codes that are
- * passed to the common error handling routine mtherr()
- * (which see).
- *
- * The file also includes a conditional assembly definition
- * for the type of computer arithmetic (IEEE, DEC, Motorola
- * IEEE, or UNKnown).
- * 
- * For Digital Equipment PDP-11 and VAX computers, certain
- * IBM systems, and others that use numbers with a 56-bit
- * significand, the symbol DEC should be defined.  In this
- * mode, most floating point constants are given as arrays
- * of octal integers to eliminate decimal to binary conversion
- * errors that might be introduced by the compiler.
- *
- * For little-endian computers, such as IBM PC, that follow the
- * IEEE Standard for Binary Floating Point Arithmetic (ANSI/IEEE
- * Std 754-1985), the symbol IBMPC should be defined.  These
- * numbers have 53-bit significands.  In this mode, constants
- * are provided as arrays of hexadecimal 16 bit integers.
- *
- * Big-endian IEEE format is denoted MIEEE.  On some RISC
- * systems such as Sun SPARC, double precision constants
- * must be stored on 8-byte address boundaries.  Since integer
- * arrays may be aligned differently, the MIEEE configuration
- * may fail on such machines.
- *
- * To accommodate other types of computer arithmetic, all
- * constants are also provided in a normal decimal radix
- * which one can hope are correctly converted to a suitable
- * format by the available C language compiler.  To invoke
- * this mode, define the symbol UNK.
- *
- * An important difference among these modes is a predefined
- * set of machine arithmetic constants for each.  The numbers
- * MACHEP (the machine roundoff error), MAXNUM (largest number
- * represented), and several other parameters are preset by
- * the configuration symbol.  Check the file const.c to
- * ensure that these values are correct for your computer.
- *
- * Configurations NANS, INFINITIES, MINUSZERO, and DENORMAL
- * may fail on many systems.  Verify that they are supposed
- * to work on your computer.
- */
-
-#include <sys/types.h>
-#include <endian.h>
-
-/* Constant definitions for math error conditions
- */
-
-#define DOMAIN          1       /* argument domain error */
-#define SING            2       /* argument singularity */
-#define OVERFLOW        3       /* overflow range error */
-#define UNDERFLOW       4       /* underflow range error */
-#define TLOSS           5       /* total loss of precision */
-#define PLOSS           6       /* partial loss of precision */
-
-#define EDOM            33
-#define ERANGE          34
-
-/* Complex numeral.  */
-typedef struct
-        {
-        double r;
-        double i;
-        } cmplx;
-
-/* Long double complex numeral.  */
-typedef struct
-        {
-        double r;
-        double i;
-        } cmplxl;
-
-/* Type of computer arithmetic */
-
-/* PDP-11, Pro350, VAX:
- */
-#ifdef  __vax__
-#define DEC 1
-#endif  /* __vax__ */
-
-/* Intel IEEE, low order words come first:
- */
-/* #define IBMPC 1 */
-
-/* Motorola IEEE, high order words come first
- * (Sun 680x0 workstation):
- */
-/* #define MIEEE 1 */
-
-/* UNKnown arithmetic, invokes coefficients given in
- * normal decimal format.  Beware of range boundary
- * problems (MACHEP, MAXLOG, etc. in const.c) and
- * roundoff problems in pow.c:
- * (Sun SPARCstation)
- */
-#ifndef __vax__
-#define UNK 1
-#endif  /* !__vax__ */
-
-/* If you define UNK, then be sure to set BIGENDIAN properly. */
-#if     BYTE_ORDER == BIG_ENDIAN
-#define BIGENDIAN 1
-#endif  /* BYTE_ORDER == BIG_ENDIAN */
-
-/* Define this `volatile' if your compiler thinks
- * that floating point arithmetic obeys the associative
- * and distributive laws.  It will defeat some optimizations
- * (but probably not enough of them).
- *
- * #define VOLATILE volatile
- */
-#define VOLATILE
-
-/* For 12-byte long doubles on an i386, pad a 16-bit short 0
- * to the end of real constants initialized by integer arrays.
- *
- * #define XPD 0,
- *
- * Otherwise, the type is 10 bytes long and XPD should be
- * defined blank (e.g., Microsoft C).
- *
- * #define XPD
- */
-#define XPD 0,
-
-/* Define to support tiny denormal numbers, else undefine. */
-#ifndef __vax__
-#define DENORMAL 1
-#endif  /* !__vax__ */
-
-/* Define to ask for infinity support, else undefine. */
-#ifndef __vax__
-#define INFINITIES 1
-#endif  /* !__vax__ */
-
-/* Define to ask for support of numbers that are Not-a-Number,
-   else undefine.  This may automatically define INFINITIES in some files. */
-#ifndef __vax__
-#define NANS 1
-#endif  /* !__vax__ */
-
-/* Define to distinguish between -0.0 and +0.0.  */
-#define MINUSZERO 1
-
-/* Define 1 for ANSI C atan2() function
-   See atan.c and clog.c. */
-#define ANSIC 1
-
-int mtherr();
-
-/* Variable for error reporting.  See mtherr.c.  */
-extern int merror;
-
-int drand(double *);
diff --git a/src/regress/lib/libc/cephes/mtherr.c b/src/regress/lib/libc/cephes/mtherr.c
deleted file mode 100644
index 9a47a198bd..0000000000
--- a/src/regress/lib/libc/cephes/mtherr.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*      $OpenBSD: mtherr.c,v 1.1 2011/07/02 18:11:01 martynas Exp $     */
-
-/*
- * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*                                                      mtherr.c
- *
- *      Library common error handling routine
- *
- *
- *
- * SYNOPSIS:
- *
- * char *fctnam;
- * int code;
- * int mtherr();
- *
- * mtherr( fctnam, code );
- *
- *
- *
- * DESCRIPTION:
- *
- * This routine may be called to report one of the following
- * error conditions (in the include file mconf.h).
- *  
- *   Mnemonic        Value          Significance
- *
- *    DOMAIN            1       argument domain error
- *    SING              2       function singularity
- *    OVERFLOW          3       overflow range error
- *    UNDERFLOW         4       underflow range error
- *    TLOSS             5       total loss of precision
- *    PLOSS             6       partial loss of precision
- *    EDOM             33       Unix domain error code
- *    ERANGE           34       Unix range error code
- *
- * The default version of the file prints the function name,
- * passed to it by the pointer fctnam, followed by the
- * error condition.  The display is directed to the standard
- * output device.  The routine then returns to the calling
- * program.  Users may wish to modify the program to abort by
- * calling exit() under severe error conditions such as domain
- * errors.
- *
- * Since all error conditions pass control to this function,
- * the display may be easily changed, eliminated, or directed
- * to an error logging device.
- *
- * SEE ALSO:
- *
- * mconf.h
- *
- */
-
-#include <stdio.h>
-#include "mconf.h"
-
-int merror = 0;
-
-/* Notice: the order of appearance of the following
- * messages is bound to the error codes defined
- * in mconf.h.
- */
-static char *ermsg[7] = {
-"unknown",      /* error code 0 */
-"domain",       /* error code 1 */
-"singularity",  /* et seq.      */
-"overflow",
-"underflow",
-"total loss of precision",
-"partial loss of precision"
-};
-
-
-int mtherr( name, code )
-char *name;
-int code;
-{
-
-/* Display string passed by calling program,
- * which is supposed to be the name of the
- * function in which the error occurred:
- */
-printf( "\n%s ", name );
-
-/* Set global error message word */
-merror = code;
-
-/* Display error message defined
- * by the code argument.
- */
-if( (code <= 0) || (code >= 7) )
-        code = 0;
-printf( "%s error\n", ermsg[code] );
-
-/* Return to calling
- * program
- */
-return( 0 );
-}
diff --git a/src/regress/lib/libc/cxa-atexit/Makefile b/src/regress/lib/libc/cxa-atexit/Makefile
deleted file mode 100644
index a2821e01d3..0000000000
--- a/src/regress/lib/libc/cxa-atexit/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 2013/08/06 19:11:53 miod Exp $
-
-SUBDIR+= libgd1 libgd2 test1
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/cxa-atexit/libgd1/Makefile b/src/regress/lib/libc/cxa-atexit/libgd1/Makefile
deleted file mode 100644
index 958b726d28..0000000000
--- a/src/regress/lib/libc/cxa-atexit/libgd1/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2007/09/03 14:42:44 millert Exp $
-
-LIB=gd1
-SRCS= gd1.C
-NOPROFILE=yes
-
-regress: all
-
-.include <bsd.lib.mk>
diff --git a/src/regress/lib/libc/cxa-atexit/libgd1/gd1.C b/src/regress/lib/libc/cxa-atexit/libgd1/gd1.C
deleted file mode 100644
index b3ecd56d91..0000000000
--- a/src/regress/lib/libc/cxa-atexit/libgd1/gd1.C
+++ /dev/null
@@ -1,32 +0,0 @@
-/*      $OpenBSD: gd1.C,v 1.1 2007/09/03 14:42:44 millert Exp $ */
-
-/*
- * Copyright (c) 2007 Kurt Miller <kurt@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdio.h>
-
-extern int check1;
-
-struct global_destructor_test_obj1 {
-        inline ~global_destructor_test_obj1() {
-                check1 = 0;
-        }
-};
-
-extern "C" void gd_test1()
-{
-        static global_destructor_test_obj1 gdt;
-}
diff --git a/src/regress/lib/libc/cxa-atexit/libgd1/shlib_version b/src/regress/lib/libc/cxa-atexit/libgd1/shlib_version
deleted file mode 100644
index 97c9f92d6b..0000000000
--- a/src/regress/lib/libc/cxa-atexit/libgd1/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=0
-minor=0
diff --git a/src/regress/lib/libc/cxa-atexit/libgd2/Makefile b/src/regress/lib/libc/cxa-atexit/libgd2/Makefile
deleted file mode 100644
index 7ca21d8bd2..0000000000
--- a/src/regress/lib/libc/cxa-atexit/libgd2/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2007/09/03 14:42:44 millert Exp $
-
-LIB=gd2
-SRCS= gd2.C
-NOPROFILE=yes
-
-regress: all
-
-.include <bsd.lib.mk>
diff --git a/src/regress/lib/libc/cxa-atexit/libgd2/gd2.C b/src/regress/lib/libc/cxa-atexit/libgd2/gd2.C
deleted file mode 100644
index 69e7ffb220..0000000000
--- a/src/regress/lib/libc/cxa-atexit/libgd2/gd2.C
+++ /dev/null
@@ -1,32 +0,0 @@
-/*      $OpenBSD: gd2.C,v 1.1 2007/09/03 14:42:44 millert Exp $ */
-
-/*
- * Copyright (c) 2007 Kurt Miller <kurt@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdio.h>
-
-extern int check2;
-
-struct global_destructor_test_obj2 {
-        inline ~global_destructor_test_obj2() {
-                check2 = 0;
-        }
-};
-
-extern "C" void gd_test2()
-{
-        static global_destructor_test_obj2 gdt;
-}
diff --git a/src/regress/lib/libc/cxa-atexit/libgd2/shlib_version b/src/regress/lib/libc/cxa-atexit/libgd2/shlib_version
deleted file mode 100644
index 97c9f92d6b..0000000000
--- a/src/regress/lib/libc/cxa-atexit/libgd2/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=0
-minor=0
diff --git a/src/regress/lib/libc/cxa-atexit/test1/Makefile b/src/regress/lib/libc/cxa-atexit/test1/Makefile
deleted file mode 100644
index 162922b35a..0000000000
--- a/src/regress/lib/libc/cxa-atexit/test1/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2015/05/29 04:17:11 miod Exp $
-
-.include <bsd.obj.mk>
-
-GD1_DIR=${.CURDIR}/../libgd1
-GD1_OBJDIR!=    if [ -d $(GD1_DIR)/${__objdir} ]; then \
-                        echo "$(GD1_DIR)/${__objdir}"; \
-                else \
-                        echo "$(GD1_DIR)"; \
-                fi
-
-GD2_DIR=${.CURDIR}/../libgd2
-GD2_OBJDIR!=    if [ -d $(GD2_DIR)/${__objdir} ]; then \
-                        echo "$(GD2_DIR)/${__objdir}"; \
-                else \
-                        echo "$(GD2_DIR)"; \
-                fi
-
-PROG=           test1
-
-SRCS=           test1.C
-
-CXXFLAGS+=      -DLIBGD1="\"$(GD1_OBJDIR)/libgd1.so\""
-CXXFLAGS+=      -DLIBGD2="\"$(GD2_OBJDIR)/libgd2.so\""
-LDFLAGS+=       -Wl,-E
-
-NOMAN=
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/cxa-atexit/test1/test1.C b/src/regress/lib/libc/cxa-atexit/test1/test1.C
deleted file mode 100644
index 75fb967a90..0000000000
--- a/src/regress/lib/libc/cxa-atexit/test1/test1.C
+++ /dev/null
@@ -1,63 +0,0 @@
-/*      $OpenBSD: test1.C,v 1.1 2007/09/03 14:42:44 millert Exp $       */
-
-/*
- * Copyright (c) 2007 Kurt Miller <kurt@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <dlfcn.h>
-#include <err.h>
-#include <stdio.h>
-
-int check1, check2;
-
-int
-main()
-{
-        void *libgd1, *libgd2;
-        void (*gd_test)();
-        int i;
-
-        for (i=0; i < 50; i++) {
-                check1 = check2 = 1;
-
-                libgd1 = dlopen(LIBGD1, RTLD_LAZY);
-                if (libgd1 == NULL)
-                        errx(1, "dlopen(%s, RTLD_LAZY) FAILED\n", LIBGD1);
-
-                gd_test = (void (*)())dlsym(libgd1, "gd_test1");
-                if (gd_test == NULL)
-                        errx(1, "dlsym(libgd1, \"gd_test1\") FAILED\n");
-
-                (*gd_test)();
-
-                libgd2 = dlopen(LIBGD2, RTLD_LAZY);
-                if (libgd2 == NULL)
-                        errx(1, "dlopen(%s, RTLD_LAZY) FAILED\n", LIBGD2);
-
-                gd_test = (void (*)())dlsym(libgd2, "gd_test2");
-                if (gd_test == NULL)
-                        errx(1, "dlsym(libgd2, \"gd_test2\") FAILED\n");
-
-                (*gd_test)();
-
-                dlclose(libgd1);
-                dlclose(libgd2);
-
-                if (check1 || check2)
-                        errx(1, "global destructors not called\n");
-        }
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/db/Makefile b/src/regress/lib/libc/db/Makefile
deleted file mode 100644
index 7d2882594d..0000000000
--- a/src/regress/lib/libc/db/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#       $OpenBSD: Makefile,v 1.10 2002/09/02 20:01:43 avsm Exp $
-#       $NetBSD: Makefile,v 1.11 1995/12/12 01:54:15 cgd Exp $
-
-PROG=   dbtest
-
-# add -DSTATISTICS to CFLAGS to get usage statistics.  Note that
-# for this to work, libc must be compiled with -DSTATISTICS as well
-CFLAGS+= -g -D__DBINTERFACE_PRIVATE -DDEBUG
-CLEANFILES+= t1 t2 t3 log
-
-DBTARGETS=1 2 3 4 5 6 7 8 9 10 11 12 13 20
-
-.for DT in ${DBTARGETS}
-db-${DT}: ${PROG}
-        sh ${.CURDIR}/run.test ${DT}
-REGRESS_TARGETS+=db-${DT}
-.PHONY: db-${DT}
-.endfor
-
-REGRESS_SLOW_TARGETS+=db-3 db-12 db-20
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/db/README b/src/regress/lib/libc/db/README
deleted file mode 100644
index 23a1b77221..0000000000
--- a/src/regress/lib/libc/db/README
+++ /dev/null
@@ -1,69 +0,0 @@
-#       $OpenBSD: README,v 1.3 2001/01/29 02:05:40 niklas Exp $
-#       $NetBSD: README,v 1.5 1996/05/03 21:54:19 cgd Exp $
-#       @(#)README      8.8 (Berkeley) 7/31/94
-
-To run the tests, enter "make regress".
-
-Fairly large files (the command files) are built in this directory during
-the test runs, and even larger files (the database files) are created in
-"/var/tmp".  If the latter directory doesn't exist, set the environmental
-variable TMPDIR to a directory where the files can be built.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-The script file consists of lines with an initial character which is
-the command for that line, or an initial character indicating a key
-or data entry for a previous command.
-
-Legal command characters are as follows:
-
-c: compare a record
-        + must be followed by [kK][dD]; the data value in the database
-          associated with the specified key is compared to the specified
-          data value.
-e: echo a string
-        + writes out the rest of the line into the output file; if the
-          last character is not a carriage-return, a newline is appended.
-f: set the flags for the next command
-        + no value zero's the flags
-g: do a get command
-        + must be followed by [kK]
-        + writes out the retrieved data DBT.
-o [r]: dump [reverse]
-        + dump the database out, if 'r' is set, in reverse order.
-p: do a put command
-        + must be followed by [kK][dD]
-r: do a del command
-        + must be followed by [kK] unless R_CURSOR flag set.
-S: sync the database
-s: do a seq command
-        + must be followed by [kK] if R_CURSOR flag set.
-        + writes out the retrieved data DBT.
-
-Legal key/data characters are as follows:
-
-D [file]: data file
-        + set the current data value to the contents of the file
-d [data]:
-        + set the current key value to the contents of the line.
-K [file]: key file
-        + set the current key value to the contents of the file
-k [data]:
-        + set the current key value to the contents of the line.
-
-Blank lines, lines with leading white space, and lines with leading
-hash marks (#) are ignored.
-
-Options to dbtest are as follows:
-
-        -d: Set the DB_LOCK flag.
-        -f: Use the file argument as the database file.
-        -i: Use the rest of the argument to set elements in the info
-            structure.  If the type is btree, then "-i cachesize=10240"
-            will set BTREEINFO.cachesize to 10240.
-        -o: The rest of the argument is the output file instead of
-            using stdout.
-        -s: Don't delete the database file before opening it, i.e.
-            use the database file from a previous run.
-
-Dbtest requires two arguments, the type of access "hash", "recno"
-or "btree", and the script name or "-" to indicate stdin.
diff --git a/src/regress/lib/libc/db/dbtest.c b/src/regress/lib/libc/db/dbtest.c
deleted file mode 100644
index 6a79e4c187..0000000000
--- a/src/regress/lib/libc/db/dbtest.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*      $OpenBSD: dbtest.c,v 1.16 2017/07/27 15:08:37 bluhm Exp $       */
-/*      $NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $   */
-
-/*-
- * Copyright (c) 1992, 1993, 1994
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-
-#include <db.h>
-
-enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
-
-void     compare(DBT *, DBT *);
-DBTYPE   dbtype(char *);
-void     dump(DB *, int);
-void     __dead dberr(const char *, ...);
-void     get(DB *, DBT *);
-void     getdata(DB *, DBT *, DBT *);
-void     put(DB *, DBT *, DBT *);
-void     rem(DB *, DBT *);
-char    *sflags(int);
-void     synk(DB *);
-void    *rfile(char *, size_t *);
-void     seq(DB *, DBT *);
-u_int    setflags(char *);
-void    *setinfo(DBTYPE, char *);
-void     __dead usage(void);
-void    *xmalloc(char *, size_t);
-
-DBTYPE type;                            /* Database type. */
-void *infop;                            /* Iflags. */
-u_long lineno;                          /* Current line in test script. */
-u_int flags;                            /* Current DB flags. */
-int ofd = STDOUT_FILENO;                /* Standard output fd. */
-
-DB *XXdbp;                              /* Global for gdb. */
-int XXlineno;                           /* Fast breakpoint for gdb. */
-
-int
-main(int argc, char *argv[])
-{
-        extern int optind;
-        extern char *optarg;
-        enum S command, state;
-        DB *dbp;
-        DBT data, key, keydata;
-        size_t len;
-        int ch, oflags, sflag;
-        char *fname, *infoarg, *p, *t, buf[8 * 1024];
-
-        infoarg = NULL;
-        fname = NULL;
-        oflags = O_CREAT | O_RDWR;
-        sflag = 0;
-        while ((ch = getopt(argc, argv, "f:i:lo:s")) != -1)
-                switch (ch) {
-                case 'f':
-                        fname = optarg;
-                        break;
-                case 'i':
-                        infoarg = optarg;
-                        break;
-                case 'l':
-                        oflags |= DB_LOCK;
-                        break;
-                case 'o':
-                        if ((ofd = open(optarg,
-                            O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
-                                dberr("%s: %s", optarg, strerror(errno));
-                        break;
-                case 's':
-                        sflag = 1;
-                        break;
-                case '?':
-                default:
-                        usage();
-                }
-        argc -= optind;
-        argv += optind;
-
-        if (argc != 2)
-                usage();
-
-        /* Set the type. */
-        type = dbtype(*argv++);
-
-        /* Open the descriptor file. */
-        if (strcmp(*argv, "-") && freopen(*argv, "r", stdin) == NULL)
-            dberr("%s: %s", *argv, strerror(errno));
-
-        /* Set up the db structure as necessary. */
-        if (infoarg == NULL)
-                infop = NULL;
-        else
-                for (p = strtok(infoarg, ",\t "); p != NULL;
-                    p = strtok(0, ",\t "))
-                        if (*p != '\0')
-                                infop = setinfo(type, p);
-
-        /*
-         * Open the DB.  Delete any preexisting copy, you almost never
-         * want it around, and it often screws up tests.
-         */
-        if (fname == NULL) {
-                p = getenv("TMPDIR");
-                if (p == NULL)
-                        p = "/var/tmp";
-                (void)snprintf(buf, sizeof buf, "%s/__dbtest", p);
-                fname = buf;
-                (void)unlink(buf);
-        } else  if (!sflag)
-                (void)unlink(fname);
-
-        if ((dbp = dbopen(fname,
-            oflags, S_IRUSR | S_IWUSR, type, infop)) == NULL)
-                dberr("dbopen: %s", strerror(errno));
-        XXdbp = dbp;
-
-        state = COMMAND;
-        for (lineno = 1;
-            (p = fgets(buf, sizeof(buf), stdin)) != NULL; ++lineno) {
-                /* Delete the newline, displaying the key/data is easier. */
-                if (ofd == STDOUT_FILENO && (t = strchr(p, '\n')) != NULL)
-                        *t = '\0';
-                if ((len = strlen(buf)) == 0 || isspace((unsigned char)*p) || *p == '#')
-                        continue;
-
-                /* Convenient gdb break point. */
-                if (XXlineno == lineno)
-                        XXlineno = 1;
-                switch (*p) {
-                case 'c':                       /* compare */
-                        if (state != COMMAND)
-                                dberr("line %lu: not expecting command",
-                                    lineno);
-                        state = KEY;
-                        command = COMPARE;
-                        break;
-                case 'e':                       /* echo */
-                        if (state != COMMAND)
-                                dberr("line %lu: not expecting command",
-                                    lineno);
-                        /* Don't display the newline, if CR at EOL. */
-                        if (p[len - 2] == '\r')
-                                --len;
-                        if (write(ofd, p + 1, len - 1) != len - 1 ||
-                            write(ofd, "\n", 1) != 1)
-                                dberr("write: %s", strerror(errno));
-                        break;
-                case 'g':                       /* get */
-                        if (state != COMMAND)
-                                dberr("line %lu: not expecting command",
-                                    lineno);
-                        state = KEY;
-                        command = GET;
-                        break;
-                case 'p':                       /* put */
-                        if (state != COMMAND)
-                                dberr("line %lu: not expecting command",
-                                    lineno);
-                        state = KEY;
-                        command = PUT;
-                        break;
-                case 'r':                       /* remove */
-                        if (state != COMMAND)
-                                dberr("line %lu: not expecting command",
-                                    lineno);
-                        if (flags == R_CURSOR) {
-                                rem(dbp, &key);
-                                state = COMMAND;
-                        } else {
-                                state = KEY;
-                                command = REMOVE;
-                        }
-                        break;
-                case 'S':                       /* sync */
-                        if (state != COMMAND)
-                                dberr("line %lu: not expecting command",
-                                    lineno);
-                        synk(dbp);
-                        state = COMMAND;
-                        break;
-                case 's':                       /* seq */
-                        if (state != COMMAND)
-                                dberr("line %lu: not expecting command",
-                                    lineno);
-                        if (flags == R_CURSOR) {
-                                state = KEY;
-                                command = SEQ;
-                        } else
-                                seq(dbp, &key);
-                        break;
-                case 'f':
-                        flags = setflags(p + 1);
-                        break;
-                case 'D':                       /* data file */
-                        if (state != DATA)
-                                dberr("line %lu: not expecting data", lineno);
-                        data.data = rfile(p + 1, &data.size);
-                        goto ldata;
-                case 'd':                       /* data */
-                        if (state != DATA)
-                                dberr("line %lu: not expecting data", lineno);
-                        data.data = xmalloc(p + 1, len - 1);
-                        data.size = len - 1;
-ldata:                  switch (command) {
-                        case COMPARE:
-                                compare(&keydata, &data);
-                                break;
-                        case PUT:
-                                put(dbp, &key, &data);
-                                break;
-                        default:
-                                dberr("line %lu: command doesn't take data",
-                                    lineno);
-                        }
-                        if (type != DB_RECNO)
-                                free(key.data);
-                        free(data.data);
-                        state = COMMAND;
-                        break;
-                case 'K':                       /* key file */
-                        if (state != KEY)
-                                dberr("line %lu: not expecting a key", lineno);
-                        if (type == DB_RECNO)
-                                dberr("line %lu: 'K' not available for recno",
-                                    lineno);
-                        key.data = rfile(p + 1, &key.size);
-                        goto lkey;
-                case 'k':                       /* key */
-                        if (state != KEY)
-                                dberr("line %lu: not expecting a key", lineno);
-                        if (type == DB_RECNO) {
-                                static recno_t recno;
-                                recno = atoi(p + 1);
-                                key.data = &recno;
-                                key.size = sizeof(recno);
-                        } else {
-                                key.data = xmalloc(p + 1, len - 1);
-                                key.size = len - 1;
-                        }
-lkey:                   switch (command) {
-                        case COMPARE:
-                                getdata(dbp, &key, &keydata);
-                                state = DATA;
-                                break;
-                        case GET:
-                                get(dbp, &key);
-                                if (type != DB_RECNO)
-                                        free(key.data);
-                                state = COMMAND;
-                                break;
-                        case PUT:
-                                state = DATA;
-                                break;
-                        case REMOVE:
-                                rem(dbp, &key);
-                                if ((type != DB_RECNO) && (flags != R_CURSOR))
-                                        free(key.data);
-                                state = COMMAND;
-                                break;
-                        case SEQ:
-                                seq(dbp, &key);
-                                if ((type != DB_RECNO) && (flags != R_CURSOR))
-                                        free(key.data);
-                                state = COMMAND;
-                                break;
-                        default:
-                                dberr("line %lu: command doesn't take a key",
-                                    lineno);
-                        }
-                        break;
-                case 'o':
-                        dump(dbp, p[1] == 'r');
-                        break;
-                default:
-                        dberr("line %lu: %s: unknown command character",
-                            lineno, p);
-                }
-        }
-#ifdef STATISTICS
-        /*
-         * -l must be used (DB_LOCK must be set) for this to be
-         * used, otherwise a page will be locked and it will fail.
-         */
-        if (type == DB_BTREE && oflags & DB_LOCK)
-                __bt_stat(dbp);
-#endif
-        if (dbp->close(dbp))
-                dberr("db->close: %s", strerror(errno));
-        (void)close(ofd);
-        exit(0);
-}
-
-#define NOOVERWRITE     "put failed, would overwrite key\n"
-
-void
-compare(db1, db2)
-        DBT *db1, *db2;
-{
-        register size_t len;
-        register u_char *p1, *p2;
-
-        if (db1->size != db2->size)
-                printf("compare failed: key->data len %lu != data len %lu\n",
-                    db1->size, db2->size);
-
-        len = MIN(db1->size, db2->size);
-        for (p1 = db1->data, p2 = db2->data; len--;)
-                if (*p1++ != *p2++) {
-                        printf("compare failed at offset %ld\n",
-                            p1 - (u_char *)db1->data);
-                        break;
-                }
-}
-
-void
-get(dbp, kp)
-        DB *dbp;
-        DBT *kp;
-{
-        DBT data;
-
-        switch (dbp->get(dbp, kp, &data, flags)) {
-        case 0:
-                (void)write(ofd, data.data, data.size);
-                if (ofd == STDOUT_FILENO)
-                        (void)write(ofd, "\n", 1);
-                break;
-        case -1:
-                dberr("line %lu: get: %s", lineno, strerror(errno));
-                /* NOTREACHED */
-        case 1:
-#define NOSUCHKEY       "get failed, no such key\n"
-                if (ofd != STDOUT_FILENO)
-                        (void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
-                else
-                        (void)fprintf(stderr, "%lu: %.*s: %s", lineno,
-                            MIN((int)kp->size, 20), kp->data, NOSUCHKEY);
-#undef  NOSUCHKEY
-                break;
-        }
-}
-
-void
-getdata(dbp, kp, dp)
-        DB *dbp;
-        DBT *kp, *dp;
-{
-        switch (dbp->get(dbp, kp, dp, flags)) {
-        case 0:
-                return;
-        case -1:
-                dberr("line %lu: getdata: %s", lineno, strerror(errno));
-                /* NOTREACHED */
-        case 1:
-                dberr("line %lu: getdata failed, no such key", lineno);
-                /* NOTREACHED */
-        }
-}
-
-void
-put(dbp, kp, dp)
-        DB *dbp;
-        DBT *kp, *dp;
-{
-        switch (dbp->put(dbp, kp, dp, flags)) {
-        case 0:
-                break;
-        case -1:
-                dberr("line %lu: put: %s", lineno, strerror(errno));
-                /* NOTREACHED */
-        case 1:
-                (void)write(ofd, NOOVERWRITE, sizeof(NOOVERWRITE) - 1);
-                break;
-        }
-}
-
-void
-rem(dbp, kp)
-        DB *dbp;
-        DBT *kp;
-{
-        switch (dbp->del(dbp, kp, flags)) {
-        case 0:
-                break;
-        case -1:
-                dberr("line %lu: rem: %s", lineno, strerror(errno));
-                /* NOTREACHED */
-        case 1:
-#define NOSUCHKEY       "rem failed, no such key\n"
-                if (ofd != STDOUT_FILENO)
-                        (void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
-                else if (flags != R_CURSOR)
-                        (void)fprintf(stderr, "%lu: %.*s: %s", lineno,
-                            MIN((int)kp->size, 20), kp->data, NOSUCHKEY);
-                else
-                        (void)fprintf(stderr,
-                            "%lu: rem of cursor failed\n", lineno);
-#undef  NOSUCHKEY
-                break;
-        }
-}
-
-void
-synk(dbp)
-        DB *dbp;
-{
-        switch (dbp->sync(dbp, flags)) {
-        case 0:
-                break;
-        case -1:
-                dberr("line %lu: synk: %s", lineno, strerror(errno));
-                /* NOTREACHED */
-        }
-}
-
-void
-seq(dbp, kp)
-        DB *dbp;
-        DBT *kp;
-{
-        DBT data;
-
-        switch (dbp->seq(dbp, kp, &data, flags)) {
-        case 0:
-                (void)write(ofd, data.data, data.size);
-                if (ofd == STDOUT_FILENO)
-                        (void)write(ofd, "\n", 1);
-                break;
-        case -1:
-                dberr("line %lu: seq: %s", lineno, strerror(errno));
-                /* NOTREACHED */
-        case 1:
-#define NOSUCHKEY       "seq failed, no such key\n"
-                if (ofd != STDOUT_FILENO)
-                        (void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
-                else if (flags == R_CURSOR)
-                        (void)fprintf(stderr, "%lu: %.*s: %s", lineno,
-                            MIN((int)kp->size, 20), kp->data, NOSUCHKEY);
-                else
-                        (void)fprintf(stderr,
-                            "%lu: seq (%s) failed\n", lineno, sflags(flags));
-#undef  NOSUCHKEY
-                break;
-        }
-}
-
-void
-dump(dbp, rev)
-        DB *dbp;
-        int rev;
-{
-        DBT key, data;
-        int flags, nflags;
-
-        if (rev) {
-                flags = R_LAST;
-                nflags = R_PREV;
-        } else {
-                flags = R_FIRST;
-                nflags = R_NEXT;
-        }
-        for (;; flags = nflags)
-                switch (dbp->seq(dbp, &key, &data, flags)) {
-                case 0:
-                        (void)write(ofd, data.data, data.size);
-                        if (ofd == STDOUT_FILENO)
-                                (void)write(ofd, "\n", 1);
-                        break;
-                case 1:
-                        goto done;
-                case -1:
-                        dberr("line %lu: (dump) seq: %s",
-                            lineno, strerror(errno));
-                        /* NOTREACHED */
-                }
-done:   return;
-}
-        
-u_int
-setflags(s)
-        char *s;
-{
-        char *p;
-
-        for (; isspace((unsigned char)*s); ++s);
-        if (*s == '\n' || *s == '\0')
-                return (0);
-        if ((p = strchr(s, '\n')) != NULL)
-                *p = '\0';
-        if (!strcmp(s, "R_CURSOR"))             return (R_CURSOR);
-        if (!strcmp(s, "R_FIRST"))              return (R_FIRST);
-        if (!strcmp(s, "R_IAFTER"))             return (R_IAFTER);
-        if (!strcmp(s, "R_IBEFORE"))            return (R_IBEFORE);
-        if (!strcmp(s, "R_LAST"))               return (R_LAST);
-        if (!strcmp(s, "R_NEXT"))               return (R_NEXT);
-        if (!strcmp(s, "R_NOOVERWRITE"))        return (R_NOOVERWRITE);
-        if (!strcmp(s, "R_PREV"))               return (R_PREV);
-        if (!strcmp(s, "R_SETCURSOR"))          return (R_SETCURSOR);
-
-        dberr("line %lu: %s: unknown flag", lineno, s);
-        /* NOTREACHED */
-}
-
-char *
-sflags(flags)
-        int flags;
-{
-        switch (flags) {
-        case R_CURSOR:          return ("R_CURSOR");
-        case R_FIRST:           return ("R_FIRST");
-        case R_IAFTER:          return ("R_IAFTER");
-        case R_IBEFORE:         return ("R_IBEFORE");
-        case R_LAST:            return ("R_LAST");
-        case R_NEXT:            return ("R_NEXT");
-        case R_NOOVERWRITE:     return ("R_NOOVERWRITE");
-        case R_PREV:            return ("R_PREV");
-        case R_SETCURSOR:       return ("R_SETCURSOR");
-        }
-
-        return ("UNKNOWN!");
-}
-        
-DBTYPE
-dbtype(s)
-        char *s;
-{
-        if (!strcmp(s, "btree"))
-                return (DB_BTREE);
-        if (!strcmp(s, "hash"))
-                return (DB_HASH);
-        if (!strcmp(s, "recno"))
-                return (DB_RECNO);
-        dberr("%s: unknown type (use btree, hash or recno)", s);
-        /* NOTREACHED */
-}
-
-void *
-setinfo(type, s)
-        DBTYPE type;
-        char *s;
-{
-        static BTREEINFO ib;
-        static HASHINFO ih;
-        static RECNOINFO rh;
-        char *eq;
-
-        if ((eq = strchr(s, '=')) == NULL)
-                dberr("%s: illegal structure set statement", s);
-        *eq++ = '\0';
-        if (!isdigit((unsigned char)*eq))
-                dberr("%s: structure set statement must be a number", s);
-                
-        switch (type) {
-        case DB_BTREE:
-                if (!strcmp("flags", s)) {
-                        ib.flags = atoi(eq);
-                        return (&ib);
-                }
-                if (!strcmp("cachesize", s)) {
-                        ib.cachesize = atoi(eq);
-                        return (&ib);
-                }
-                if (!strcmp("maxkeypage", s)) {
-                        ib.maxkeypage = atoi(eq);
-                        return (&ib);
-                }
-                if (!strcmp("minkeypage", s)) {
-                        ib.minkeypage = atoi(eq);
-                        return (&ib);
-                }
-                if (!strcmp("lorder", s)) {
-                        ib.lorder = atoi(eq);
-                        return (&ib);
-                }
-                if (!strcmp("psize", s)) {
-                        ib.psize = atoi(eq);
-                        return (&ib);
-                }
-                break;
-        case DB_HASH:
-                if (!strcmp("bsize", s)) {
-                        ih.bsize = atoi(eq);
-                        return (&ih);
-                }
-                if (!strcmp("ffactor", s)) {
-                        ih.ffactor = atoi(eq);
-                        return (&ih);
-                }
-                if (!strcmp("nelem", s)) {
-                        ih.nelem = atoi(eq);
-                        return (&ih);
-                }
-                if (!strcmp("cachesize", s)) {
-                        ih.cachesize = atoi(eq);
-                        return (&ih);
-                }
-                if (!strcmp("lorder", s)) {
-                        ih.lorder = atoi(eq);
-                        return (&ih);
-                }
-                break;
-        case DB_RECNO:
-                if (!strcmp("flags", s)) {
-                        rh.flags = atoi(eq);
-                        return (&rh);
-                }
-                if (!strcmp("cachesize", s)) {
-                        rh.cachesize = atoi(eq);
-                        return (&rh);
-                }
-                if (!strcmp("lorder", s)) {
-                        rh.lorder = atoi(eq);
-                        return (&rh);
-                }
-                if (!strcmp("reclen", s)) {
-                        rh.reclen = atoi(eq);
-                        return (&rh);
-                }
-                if (!strcmp("bval", s)) {
-                        rh.bval = atoi(eq);
-                        return (&rh);
-                }
-                if (!strcmp("psize", s)) {
-                        rh.psize = atoi(eq);
-                        return (&rh);
-                }
-                break;
-        }
-        dberr("%s: unknown structure value", s);
-        /* NOTREACHED */
-}
-
-void *
-rfile(name, lenp)
-        char *name;
-        size_t *lenp;
-{
-        struct stat sb;
-        void *p;
-        int fd;
-        char *np;
-
-        for (; isspace((unsigned char)*name); ++name);
-        if ((np = strchr(name, '\n')) != NULL)
-                *np = '\0';
-        if ((fd = open(name, O_RDONLY, 0)) < 0 ||
-            fstat(fd, &sb))
-                dberr("%s: %s\n", name, strerror(errno));
-        if (sb.st_size > (off_t)INT_MAX)
-                dberr("%s: %s\n", name, strerror(E2BIG));
-        if ((p = (void *)malloc((u_int)sb.st_size)) == NULL)
-                dberr("%s", strerror(errno));
-        (void)read(fd, p, (int)sb.st_size);
-        *lenp = sb.st_size;
-        (void)close(fd);
-        return (p);
-}
-
-void *
-xmalloc(text, len)
-        char *text;
-        size_t len;
-{
-        void *p;
-
-        if ((p = (void *)malloc(len)) == NULL)
-                dberr("%s", strerror(errno));
-        memmove(p, text, len);
-        return (p);
-}
-
-void __dead
-usage()
-{
-        (void)fprintf(stderr,
-            "usage: dbtest [-l] [-f file] [-i info] [-o file] type script\n");
-        exit(1);
-}
-
-void __dead
-dberr(const char *fmt, ...)
-{
-        va_list ap;
-
-        va_start(ap, fmt);
-        (void)fprintf(stderr, "dbtest: ");
-        (void)vfprintf(stderr, fmt, ap);
-        va_end(ap);
-        (void)fprintf(stderr, "\n");
-        exit(1);
-        /* NOTREACHED */
-}
diff --git a/src/regress/lib/libc/db/run.test b/src/regress/lib/libc/db/run.test
deleted file mode 100644
index 0d6837e360..0000000000
--- a/src/regress/lib/libc/db/run.test
+++ /dev/null
@@ -1,707 +0,0 @@
-#!/bin/sh -
-#
-#       $OpenBSD: run.test,v 1.3 2001/01/29 02:05:41 niklas Exp $
-#       $NetBSD: run.test,v 1.8 1996/05/03 21:57:51 cgd Exp $
-#       @(#)run.test    8.10 (Berkeley) 7/26/94
-#
-
-# db regression tests
-main()
-{
-
-        PROG=./dbtest
-        TMP1=t1
-        TMP2=t2
-        TMP3=t3
-
-        if [ -f /usr/share/dict/words ]; then
-                DICT=/usr/share/dict/words
-        elif [ -f /usr/dict/words ]; then
-                DICT=/usr/dict/words
-        else
-                echo 'run.test: no dictionary'
-                exit 1
-        fi
-        
-        if [ $# -eq 0 ]; then
-                for t in 1 2 3 4 5 6 7 8 9 10 11 12 13 20; do
-                        test$t
-                done
-        else
-                while [ $# -gt 0 ]
-                        do case "$1" in
-                        test*)
-                                $1;;
-                        [0-9]*)
-                                test$1;;
-                        btree)
-                                for t in 1 2 3 7 8 9 10 12 13; do
-                                        test$t
-                                done;;
-                        hash)
-                                for t in 1 2 3 8 13 20; do
-                                        test$t
-                                done;;
-                        recno)
-                                for t in 1 2 3 4 5 6 7 10 11; do
-                                        test$t
-                                done;;
-                        *)
-                                echo "run.test: unknown test $1"
-                                echo "usage: run.test test# | type"
-                                exit 1
-                        esac
-                        shift
-                done
-        fi
-        rm -f $TMP1 $TMP2 $TMP3
-        exit 0
-}
-
-# Take the first hundred entries in the dictionary, and make them
-# be key/data pairs.
-test1()
-{
-        echo "Test 1: btree, hash: small key, small data pairs"
-        sed 200q $DICT > $TMP1
-        for type in btree hash; do
-                rm -f $TMP2 $TMP3
-                for i in `sed 200q $DICT`; do
-                        echo p
-                        echo k$i
-                        echo d$i
-                        echo g
-                        echo k$i
-                done > $TMP2
-                $PROG -o $TMP3 $type $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test1: type $type: failed"
-                        exit 1
-                fi
-        done
-        echo "Test 1: recno: small key, small data pairs"
-        rm -f $TMP2 $TMP3
-        sed 200q $DICT |
-        awk '{ 
-                ++i;
-                printf("p\nk%d\nd%s\ng\nk%d\n", i, $0, i);
-        }' > $TMP2
-        $PROG -o $TMP3 recno $TMP2
-        if (cmp -s $TMP1 $TMP3) ; then :
-        else
-                echo "test1: type recno: failed"
-                exit 1
-        fi
-}
-
-# Take the first 200 entries in the dictionary, and give them
-# each a medium size data entry.
-test2()
-{
-        echo "Test 2: btree, hash: small key, medium data pairs"
-        mdata=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-        echo $mdata |
-        awk '{ for (i = 1; i < 201; ++i) print $0 }' > $TMP1
-        for type in hash btree; do
-                rm -f $TMP2 $TMP3
-                for i in `sed 200q $DICT`; do
-                        echo p
-                        echo k$i
-                        echo d$mdata
-                        echo g
-                        echo k$i
-                done > $TMP2
-                $PROG -o $TMP3 $type $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test2: type $type: failed"
-                        exit 1
-                fi
-        done
-        echo "Test 2: recno: small key, medium data pairs"
-        rm -f $TMP2 $TMP3
-        echo $mdata | 
-        awk '{  for (i = 1; i < 201; ++i)
-                printf("p\nk%d\nd%s\ng\nk%d\n", i, $0, i);
-        }' > $TMP2
-        $PROG -o $TMP3 recno $TMP2
-        if (cmp -s $TMP1 $TMP3) ; then :
-        else
-                echo "test2: type recno: failed"
-                exit 1
-        fi
-}
-
-# Insert the programs in /bin with their paths as their keys.
-test3()
-{
-        echo "Test 3: hash: small key, big data pairs"
-        rm -f $TMP1
-        (find /bin -type f -print | xargs cat) > $TMP1
-        for type in hash; do
-                rm -f $TMP2 $TMP3
-                for i in `find /bin -type f -print`; do
-                        echo p
-                        echo k$i
-                        echo D$i
-                        echo g
-                        echo k$i
-                done > $TMP2
-                $PROG -o $TMP3 $type $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test3: $type: failed"
-                        exit 1
-                fi
-        done
-        echo "Test 3: btree: small key, big data pairs"
-        for psize in 512 16384 65536; do
-                echo "    page size $psize"
-                for type in btree; do
-                        rm -f $TMP2 $TMP3
-                        for i in `find /bin -type f -print`; do
-                                echo p
-                                echo k$i
-                                echo D$i
-                                echo g
-                                echo k$i
-                        done > $TMP2
-                        $PROG -i psize=$psize -o $TMP3 $type $TMP2
-                        if (cmp -s $TMP1 $TMP3) ; then :
-                        else
-                                echo "test3: $type: page size $psize: failed"
-                                exit 1
-                        fi
-                done
-        done
-        echo "Test 3: recno: big data pairs"
-        rm -f $TMP2 $TMP3
-        find /bin -type f -print | 
-        awk '{
-                ++i;
-                printf("p\nk%d\nD%s\ng\nk%d\n", i, $0, i);
-        }' > $TMP2
-        for psize in 512 16384 65536; do
-                echo "    page size $psize"
-                $PROG -i psize=$psize -o $TMP3 recno $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test3: recno: page size $psize: failed"
-                        exit 1
-                fi
-        done
-}
-
-# Do random recno entries.
-test4()
-{
-        echo "Test 4: recno: random entries"
-        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-        awk '{
-                for (i = 37; i <= 37 + 88 * 17; i += 17) {
-                        if (i % 41)
-                                s = substr($0, 1, i % 41);
-                        else
-                                s = substr($0, 1);
-                        printf("input key %d: %s\n", i, s);
-                }
-                for (i = 1; i <= 15; ++i) {
-                        if (i % 41)
-                                s = substr($0, 1, i % 41);
-                        else
-                                s = substr($0, 1);
-                        printf("input key %d: %s\n", i, s);
-                }
-                for (i = 19234; i <= 19234 + 61 * 27; i += 27) {
-                        if (i % 41)
-                                s = substr($0, 1, i % 41);
-                        else
-                                s = substr($0, 1);
-                        printf("input key %d: %s\n", i, s);
-                }
-                exit
-        }' > $TMP1
-        rm -f $TMP2 $TMP3
-        cat $TMP1 |
-        awk 'BEGIN {
-                        i = 37;
-                        incr = 17;
-                }
-                {
-                        printf("p\nk%d\nd%s\n", i, $0);
-                        if (i == 19234 + 61 * 27)
-                                exit;
-                        if (i == 37 + 88 * 17) {
-                                i = 1;
-                                incr = 1;
-                        } else if (i == 15) {
-                                i = 19234;
-                                incr = 27;
-                        } else
-                                i += incr;
-                }
-                END {
-                        for (i = 37; i <= 37 + 88 * 17; i += 17)
-                                printf("g\nk%d\n", i);
-                        for (i = 1; i <= 15; ++i)
-                                printf("g\nk%d\n", i);
-                        for (i = 19234; i <= 19234 + 61 * 27; i += 27)
-                                printf("g\nk%d\n", i);
-                }' > $TMP2
-        $PROG -o $TMP3 recno $TMP2
-        if (cmp -s $TMP1 $TMP3) ; then :
-        else
-                echo "test4: type recno: failed"
-                exit 1
-        fi
-}
-
-# Do reverse order recno entries.
-test5()
-{
-        echo "Test 5: recno: reverse order entries"
-        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-        awk ' {
-                for (i = 1500; i; --i) {
-                        if (i % 34)
-                                s = substr($0, 1, i % 34);
-                        else
-                                s = substr($0, 1);
-                        printf("input key %d: %s\n", i, s);
-                }
-                exit;
-        }' > $TMP1
-        rm -f $TMP2 $TMP3
-        cat $TMP1 |
-        awk 'BEGIN {
-                        i = 1500;
-                }
-                {
-                        printf("p\nk%d\nd%s\n", i, $0);
-                        --i;
-                }
-                END {
-                        for (i = 1500; i; --i) 
-                                printf("g\nk%d\n", i);
-                }' > $TMP2
-        $PROG -o $TMP3 recno $TMP2
-        if (cmp -s $TMP1 $TMP3) ; then :
-        else
-                echo "test5: type recno: failed"
-                exit 1
-        fi
-}
-                
-# Do alternating order recno entries.
-test6()
-{
-        echo "Test 6: recno: alternating order entries"
-        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-        awk ' {
-                for (i = 1; i < 1200; i += 2) {
-                        if (i % 34)
-                                s = substr($0, 1, i % 34);
-                        else
-                                s = substr($0, 1);
-                        printf("input key %d: %s\n", i, s);
-                }
-                for (i = 2; i < 1200; i += 2) {
-                        if (i % 34)
-                                s = substr($0, 1, i % 34);
-                        else
-                                s = substr($0, 1);
-                        printf("input key %d: %s\n", i, s);
-                }
-                exit;
-        }' > $TMP1
-        rm -f $TMP2 $TMP3
-        cat $TMP1 |
-        awk 'BEGIN {
-                        i = 1;
-                        even = 0;
-                }
-                {
-                        printf("p\nk%d\nd%s\n", i, $0);
-                        i += 2;
-                        if (i >= 1200) {
-                                if (even == 1)
-                                        exit;
-                                even = 1;
-                                i = 2;
-                        }
-                }
-                END {
-                        for (i = 1; i < 1200; ++i) 
-                                printf("g\nk%d\n", i);
-                }' > $TMP2
-        $PROG -o $TMP3 recno $TMP2
-        sort -o $TMP1 $TMP1
-        sort -o $TMP3 $TMP3
-        if (cmp -s $TMP1 $TMP3) ; then :
-        else
-                echo "test6: type recno: failed"
-                exit 1
-        fi
-}
-
-# Delete cursor record
-test7()
-{
-        echo "Test 7: btree, recno: delete cursor record"
-        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-        awk '{
-                for (i = 1; i <= 120; ++i)
-                        printf("%05d: input key %d: %s\n", i, i, $0);
-                printf("%05d: input key %d: %s\n", 120, 120, $0);
-                printf("seq failed, no such key\n");
-                printf("%05d: input key %d: %s\n", 1, 1, $0);
-                printf("%05d: input key %d: %s\n", 2, 2, $0);
-                exit;
-        }' > $TMP1
-        rm -f $TMP2 $TMP3
-
-        for type in btree recno; do
-                cat $TMP1 |
-                awk '{
-                        if (i == 120)
-                                exit;
-                        printf("p\nk%d\nd%s\n", ++i, $0);
-                }
-                END {
-                        printf("fR_NEXT\n");
-                        for (i = 1; i <= 120; ++i)
-                                printf("s\n");
-                        printf("fR_CURSOR\ns\nk120\n");
-                        printf("r\n");
-                        printf("fR_NEXT\ns\n");
-                        printf("fR_CURSOR\ns\nk1\n");
-                        printf("r\n");
-                        printf("fR_FIRST\ns\n");
-                }' > $TMP2
-                $PROG -o $TMP3 recno $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test7: type $type: failed"
-                        exit 1
-                fi
-        done
-}
-
-# Make sure that overflow pages are reused.
-test8()
-{
-        echo "Test 8: btree, hash: repeated small key, big data pairs"
-        rm -f $TMP1
-        echo "" | 
-        awk 'BEGIN {
-                for (i = 1; i <= 10; ++i) {
-                        printf("p\nkkey1\nD/bin/sh\n");
-                        printf("p\nkkey2\nD/bin/csh\n");
-                        if (i % 8 == 0) {
-                                printf("c\nkkey2\nD/bin/csh\n");
-                                printf("c\nkkey1\nD/bin/sh\n");
-                                printf("e\t%d of 10 (comparison)\n", i);
-                        } else
-                                printf("e\t%d of 10             \n", i);
-                        printf("r\nkkey1\nr\nkkey2\n");
-                }
-        }' > $TMP1
-        $PROG btree $TMP1
-#       $PROG hash $TMP1
-        # No explicit test for success.
-}
-
-# Test btree duplicate keys
-test9()
-{
-        echo "Test 9: btree: duplicate keys"
-        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-        awk '{
-                for (i = 1; i <= 543; ++i)
-                        printf("%05d: input key %d: %s\n", i, i, $0);
-                exit;
-        }' > $TMP1
-        rm -f $TMP2 $TMP3
-
-        for type in btree; do
-                cat $TMP1 | 
-                awk '{
-                        if (i++ % 2)
-                                printf("p\nkduplicatekey\nd%s\n", $0);
-                        else
-                                printf("p\nkunique%dkey\nd%s\n", i, $0);
-                }
-                END {
-                                printf("o\n");
-                }' > $TMP2
-                $PROG -iflags=1 -o $TMP3 $type $TMP2
-                sort -o $TMP3 $TMP3
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test9: type $type: failed"
-                        exit 1
-                fi
-        done
-}
-
-# Test use of cursor flags without initialization
-test10()
-{
-        echo "Test 10: btree, recno: test cursor flag use"
-        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-        awk '{
-                for (i = 1; i <= 20; ++i)
-                        printf("%05d: input key %d: %s\n", i, i, $0);
-                exit;
-        }' > $TMP1
-        rm -f $TMP2 $TMP3
-
-        # Test that R_CURSOR doesn't succeed before cursor initialized
-        for type in btree recno; do
-                cat $TMP1 |
-                awk '{
-                        if (i == 10)
-                                exit;
-                        printf("p\nk%d\nd%s\n", ++i, $0);
-                }
-                END {
-                        printf("fR_CURSOR\nr\n");
-                        printf("eR_CURSOR SHOULD HAVE FAILED\n");
-                }' > $TMP2
-                $PROG -o $TMP3 $type $TMP2 > /dev/null 2>&1
-                if [ -s $TMP3 ] ; then
-                        echo "Test 10: delete: R_CURSOR SHOULD HAVE FAILED"
-                        exit 1
-                fi
-        done
-        for type in btree recno; do
-                cat $TMP1 |
-                awk '{
-                        if (i == 10)
-                                exit;
-                        printf("p\nk%d\nd%s\n", ++i, $0);
-                }
-                END {
-                        printf("fR_CURSOR\np\nk1\ndsome data\n");
-                        printf("eR_CURSOR SHOULD HAVE FAILED\n");
-                }' > $TMP2
-                $PROG -o $TMP3 $type $TMP2 > /dev/null 2>&1
-                if [ -s $TMP3 ] ; then
-                        echo "Test 10: put: R_CURSOR SHOULD HAVE FAILED"
-                        exit 1
-                fi
-        done
-}
-
-# Test insert in reverse order.
-test11()
-{
-        echo "Test 11: recno: reverse order insert"
-        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-        awk '{
-                for (i = 1; i <= 779; ++i)
-                        printf("%05d: input key %d: %s\n", i, i, $0);
-                exit;
-        }' > $TMP1
-        rm -f $TMP2 $TMP3
-
-        for type in recno; do
-                cat $TMP1 |
-                awk '{
-                        if (i == 0) {
-                                i = 1;
-                                printf("p\nk1\nd%s\n", $0);
-                                printf("%s\n", "fR_IBEFORE");
-                        } else
-                                printf("p\nk1\nd%s\n", $0);
-                }
-                END {
-                                printf("or\n");
-                }' > $TMP2
-                $PROG -o $TMP3 $type $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test11: type $type: failed"
-                        exit 1
-                fi
-        done
-}
-
-# Take the first 20000 entries in the dictionary, reverse them, and give
-# them each a small size data entry.  Use a small page size to make sure
-# the btree split code gets hammered.
-test12()
-{
-        echo "Test 12: btree: lots of keys, small page size"
-        mdata=abcdefghijklmnopqrstuvwxy
-        echo $mdata |
-        awk '{ for (i = 1; i < 20001; ++i) print $0 }' > $TMP1
-        for type in btree; do
-                rm -f $TMP2 $TMP3
-                for i in `sed 20000q $DICT | rev`; do
-                        echo p
-                        echo k$i
-                        echo d$mdata
-                        echo g
-                        echo k$i
-                done > $TMP2
-                $PROG -i psize=512 -o $TMP3 $type $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test12: type $type: failed"
-                        exit 1
-                fi
-        done
-}
-
-# Test different byte orders.
-test13()
-{
-        echo "Test 13: btree, hash: differing byte orders"
-        sed 50q $DICT > $TMP1
-        for order in 1234 4321; do
-                for type in btree hash; do
-                        rm -f byte.file $TMP2 $TMP3
-                        for i in `sed 50q $DICT`; do
-                                echo p
-                                echo k$i
-                                echo d$i
-                                echo g
-                                echo k$i
-                        done > $TMP2
-                        $PROG -ilorder=$order -f byte.file -o $TMP3 $type $TMP2
-                        if (cmp -s $TMP1 $TMP3) ; then :
-                        else
-                                echo "test13: $type/$order put failed"
-                                exit 1
-                        fi
-                        for i in `sed 50q $DICT`; do
-                                echo g
-                                echo k$i
-                        done > $TMP2
-                        $PROG -s \
-                            -ilorder=$order -f byte.file -o $TMP3 $type $TMP2
-                        if (cmp -s $TMP1 $TMP3) ; then :
-                        else
-                                echo "test13: $type/$order get failed"
-                                exit 1
-                        fi
-                done
-        done
-        rm -f byte.file
-}
-
-# Try a variety of bucketsizes and fill factors for hashing
-test20()
-{
-        echo\
-    "Test 20: hash: bucketsize, fill factor; nelem 25000 cachesize 65536"
-        echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-        awk '{
-                for (i = 1; i <= 10000; ++i) {
-                        if (i % 34)
-                                s = substr($0, 1, i % 34);
-                        else
-                                s = substr($0, 1);
-                        printf("%s\n", s);
-                }
-                exit;
-        }' > $TMP1
-        sed 10000q $DICT |
-        awk 'BEGIN {
-                ds="abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg"
-        }
-        {
-                if (++i % 34)
-                        s = substr(ds, 1, i % 34);
-                else
-                        s = substr(ds, 1);
-                printf("p\nk%s\nd%s\n", $0, s);
-        }' > $TMP2
-        sed 10000q $DICT |
-        awk '{
-                ++i;
-                printf("g\nk%s\n", $0);
-        }' >> $TMP2
-        bsize=256
-        for ffactor in 11 14 21; do
-                echo "    bucketsize $bsize, fill factor $ffactor"
-                $PROG -o$TMP3 \
-                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-                    hash $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-                        exit 1
-                fi
-        done
-        bsize=512
-        for ffactor in 21 28 43; do
-                echo "    bucketsize $bsize, fill factor $ffactor"
-                $PROG -o$TMP3 \
-                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-                    hash $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-                        exit 1
-                fi
-        done
-        bsize=1024
-        for ffactor in 43 57 85; do
-                echo "    bucketsize $bsize, fill factor $ffactor"
-                $PROG -o$TMP3 \
-                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-                    hash $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-                        exit 1
-                fi
-        done
-        bsize=2048
-        for ffactor in 85 114 171; do
-                echo "    bucketsize $bsize, fill factor $ffactor"
-                $PROG -o$TMP3 \
-                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-                    hash $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-                        exit 1
-                fi
-        done
-        bsize=4096
-        for ffactor in 171 228 341; do
-                echo "    bucketsize $bsize, fill factor $ffactor"
-                $PROG -o$TMP3 \
-                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-                    hash $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-                        exit 1
-                fi
-        done
-        bsize=8192
-        for ffactor in 341 455 683; do
-                echo "    bucketsize $bsize, fill factor $ffactor"
-                $PROG -o$TMP3 \
-                    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-                    hash $TMP2
-                if (cmp -s $TMP1 $TMP3) ; then :
-                else
-                        echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-                        exit 1
-                fi
-        done
-}
-
-main $*
diff --git a/src/regress/lib/libc/dirname/Makefile b/src/regress/lib/libc/dirname/Makefile
deleted file mode 100644
index fc152df954..0000000000
--- a/src/regress/lib/libc/dirname/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-PROG=dirname_test
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/dirname/dirname_test.c b/src/regress/lib/libc/dirname/dirname_test.c
deleted file mode 100644
index 27d32b6eda..0000000000
--- a/src/regress/lib/libc/dirname/dirname_test.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2007 Bret S. Lambert <blambert@gsipt.net>
- *
- * Public domain.
- */
-
-#include <sys/param.h>
-
-#include <libgen.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <err.h>
-
-int
-main(void)
-{
-        char path[2 * MAXPATHLEN];
-        char dname[128];
-        const char *dir = "junk";
-        const char *fname = "/file.name.ext";
-        char *str;
-        int i;
-
-        /* Test normal functioning */
-        strlcpy(path, "/", sizeof(path));
-        strlcpy(dname, "/", sizeof(dname));
-        strlcat(path, dir, sizeof(path)); 
-        strlcat(dname, dir, sizeof(dname)); 
-        strlcat(path, fname, sizeof(path));
-        str = dirname(path);
-        if (strcmp(str, dname) != 0)
-                errx(1, "0: dirname(%s) = %s != %s", path, str, dname);
-
-        /*
-         * There are four states that require special handling:
-         *
-         * 1) path is NULL
-         * 2) path is the empty string
-         * 3) path is composed entirely of slashes
-         * 4) the resulting name is larger than MAXPATHLEN
-         *
-         * The first two cases require that a pointer
-         * to the string "." be returned.
-         *
-         * The third case requires that a pointer
-         * to the string "/" be returned.
-         *
-         * The final case requires that NULL be returned
-         * and errno * be set to ENAMETOOLONG.
-         */
-        /* Case 1 */
-        str = dirname(NULL);
-        if (strcmp(str, ".") != 0)
-                errx(1, "1: dirname(NULL) = %s != .", str);
-
-        /* Case 2 */
-        strlcpy(path, "", sizeof(path));
-        str = dirname(path);
-        if (strcmp(str, ".") != 0)
-                errx(1, "2: dirname(%s) = %s != .", path, str);
-
-        /* Case 3 */
-        for (i = 0; i < MAXPATHLEN - 1; i++)
-                strlcat(path, "/", sizeof(path));       /* path cleared above */
-        str = dirname(path);
-        if (strcmp(str, "/") != 0)
-                errx(1, "3: dirname(%s) = %s != /", path, str);
-
-        /* Case 4 */
-        strlcpy(path, "/", sizeof(path));               /* reset path */
-        for (i = 0; i <= MAXPATHLEN; i += strlen(dir))
-                strlcat(path, dir, sizeof(path));
-        strlcat(path, fname, sizeof(path));
-        str = dirname(path);
-        if (str != NULL)
-                errx(1, "4: dirname(%s) = %s != NULL", path, str);
-        if (errno != ENAMETOOLONG)
-                errx(1, "4: dirname(%s) sets errno to %d", path, errno);
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/env/Makefile b/src/regress/lib/libc/env/Makefile
deleted file mode 100644
index 92e04369f4..0000000000
--- a/src/regress/lib/libc/env/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2010/08/23 22:34:37 millert Exp $
-
-PROG=   envtest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/env/envtest.c b/src/regress/lib/libc/env/envtest.c
deleted file mode 100644
index 33fc463404..0000000000
--- a/src/regress/lib/libc/env/envtest.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*      $OpenBSD: envtest.c,v 1.1 2010/08/23 22:34:37 millert Exp $ */
-
-/*
- * Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-extern char **environ;
-
-static int
-count_instances(const char *name)
-{
-        int count = 0;
-        size_t namelen;
-        char **ep;
-
-        namelen = strlen(name);
-        for (ep = environ; *ep != NULL; ep++) {
-                if (strncmp(name, *ep, namelen) == 0 && (*ep)[namelen] == '=')
-                        count++;
-        }
-
-        return count;
-}
-
-static void
-fake_env(void)
-{
-        static char *fakenv[7];
-
-        fakenv[0] = "HOME=/root";
-        fakenv[1] = "USER=root";
-        fakenv[2] = "LOGNAME=root";
-        fakenv[3] = "SHELL=/bin/sh";
-        fakenv[4] = "USER=root";
-        fakenv[5] = NULL;
-
-        environ = fakenv;
-}
-
-int
-main(int argc, char *argv[])
-{
-        char *buf;
-        int n, failures = 0;
-        size_t len, bufsize;
-
-        /* Enable malloc security options. */
-        setenv("MALLOC_OPTIONS", "S", 0);
-
-        fake_env();
-        n = count_instances("USER");
-        if (n != 2) {
-                fprintf(stderr, "initial: %d instances of USER, expected %d\n",
-                    n, 2);
-                failures++;
-        }
-
-        if (unsetenv("USER") != 0) {
-                fprintf(stderr, "unsetenv: failed to remove USER\n");
-                failures++;
-        }
-        n = count_instances("USER");
-        if (n != 0) {
-                fprintf(stderr, "unsetenv: %d instances of USER, expected %d\n",
-                    n, 0);
-                failures++;
-        }
-
-        fake_env();
-        if (setenv("USER", "nobody", 0) != 0) {
-                fprintf(stderr, "setenv: failed to set USER\n");
-                failures++;
-        }
-        n = count_instances("USER");
-        if (n != 2) {
-                fprintf(stderr, "setenv: %d instances of USER, expected %d\n",
-                    n, 2);
-                failures++;
-        }
-
-        fake_env();
-        if (setenv("USER", "nobody", 1) != 0) {
-                fprintf(stderr, "setenv: failed to set USER\n");
-                failures++;
-        }
-        n = count_instances("USER");
-        if (n != 1) {
-                fprintf(stderr, "setenv: %d instances of USER, expected %d\n",
-                    n, 1);
-                failures++;
-        }
-
-        fake_env();
-        if (putenv("USER=nobody") != 0) {
-                fprintf(stderr, "putenv: failed to set USER\n");
-                failures++;
-        }
-        n = count_instances("USER");
-        if (n != 1) {
-                fprintf(stderr, "putenv: %d instances of USER, expected %d\n",
-                    n, 1);
-                failures++;
-        }
-
-        return failures;
-}
diff --git a/src/regress/lib/libc/explicit_bzero/Makefile b/src/regress/lib/libc/explicit_bzero/Makefile
deleted file mode 100644
index cd514a43a1..0000000000
--- a/src/regress/lib/libc/explicit_bzero/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/06/12 22:01:55 matthew Exp $
-
-PROG=   explicit_bzero
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/explicit_bzero/explicit_bzero.c b/src/regress/lib/libc/explicit_bzero/explicit_bzero.c
deleted file mode 100644
index 34c60baa8a..0000000000
--- a/src/regress/lib/libc/explicit_bzero/explicit_bzero.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*      $OpenBSD: explicit_bzero.c,v 1.6 2014/07/11 01:10:35 matthew Exp $      */
-/*
- * Copyright (c) 2014 Google Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-
-#define ASSERT_EQ(a, b) assert((a) == (b))
-#define ASSERT_NE(a, b) assert((a) != (b))
-#define ASSERT_GE(a, b) assert((a) >= (b))
-
-/* 128 bits of random data. */
-static const char secret[16] = {
-        0xa0, 0x6c, 0x0c, 0x81, 0xba, 0xd8, 0x5b, 0x0c,
-        0xb0, 0xd6, 0xd4, 0xe3, 0xeb, 0x52, 0x5f, 0x96,
-};
-
-enum {
-        SECRETCOUNT = 64,
-        SECRETBYTES = SECRETCOUNT * sizeof(secret)
-};
-
-static char altstack[SIGSTKSZ + SECRETBYTES];
-
-static void
-setup_stack(void)
-{
-        const stack_t sigstk = {
-                .ss_sp = altstack,
-                .ss_size = sizeof(altstack),
-        };
-
-        ASSERT_EQ(0, sigaltstack(&sigstk, NULL));
-}
-
-static void
-assert_on_stack(void)
-{
-        stack_t cursigstk;
-        ASSERT_EQ(0, sigaltstack(NULL, &cursigstk));
-        ASSERT_EQ(SS_ONSTACK, cursigstk.ss_flags & (SS_DISABLE|SS_ONSTACK));
-}
-
-static void
-call_on_stack(void (*fn)(int))
-{
-        /*
-         * This is a bit more complicated than strictly necessary, but
-         * it ensures we don't have any flaky test failures due to
-         * inherited signal masks/actions/etc.
-         *
-         * On systems where SA_ONSTACK is not supported, this could
-         * alternatively be implemented using makecontext() or
-         * pthread_attr_setstack().
-         */
-
-        const struct sigaction sigact = {
-                .sa_handler = fn,
-                .sa_flags = SA_ONSTACK,
-        };
-        struct sigaction oldsigact;
-        sigset_t sigset, oldsigset;
-
-        /* First, block all signals. */
-        ASSERT_EQ(0, sigemptyset(&sigset));
-        ASSERT_EQ(0, sigfillset(&sigset));
-        ASSERT_EQ(0, sigprocmask(SIG_BLOCK, &sigset, &oldsigset));
-
-        /* Next setup the signal handler for SIGUSR1. */
-        ASSERT_EQ(0, sigaction(SIGUSR1, &sigact, &oldsigact));
-
-        /* Raise SIGUSR1 and momentarily unblock it to run the handler. */
-        ASSERT_EQ(0, raise(SIGUSR1));
-        ASSERT_EQ(0, sigdelset(&sigset, SIGUSR1));
-        ASSERT_EQ(-1, sigsuspend(&sigset));
-        ASSERT_EQ(EINTR, errno);
-
-        /* Restore the original signal action, stack, and mask. */
-        ASSERT_EQ(0, sigaction(SIGUSR1, &oldsigact, NULL));
-        ASSERT_EQ(0, sigprocmask(SIG_SETMASK, &oldsigset, NULL));
-}
-
-static void
-populate_secret(char *buf, size_t len)
-{
-        int i, fds[2];
-        ASSERT_EQ(0, pipe(fds));
-
-        for (i = 0; i < SECRETCOUNT; i++)
-                ASSERT_EQ(sizeof(secret), write(fds[1], secret, sizeof(secret)));
-        ASSERT_EQ(0, close(fds[1]));
-
-        ASSERT_EQ(len, read(fds[0], buf, len));
-        ASSERT_EQ(0, close(fds[0]));
-}
-
-static int
-count_secrets(const char *buf)
-{
-        int res = 0;
-        size_t i;
-        for (i = 0; i < SECRETCOUNT; i++) {
-                if (memcmp(buf + i * sizeof(secret), secret,
-                    sizeof(secret)) == 0)
-                        res += 1;
-        }
-        return (res);
-}
-
-static char *
-test_without_bzero()
-{
-        char buf[SECRETBYTES];
-        assert_on_stack();
-        populate_secret(buf, sizeof(buf));
-        char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf));
-        ASSERT_NE(NULL, res);
-        return (res);
-}
-
-static char *
-test_with_bzero()
-{
-        char buf[SECRETBYTES];
-        assert_on_stack();
-        populate_secret(buf, sizeof(buf));
-        char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf));
-        ASSERT_NE(NULL, res);
-        explicit_bzero(buf, sizeof(buf));
-        return (res);
-}
-
-static void 
-do_test_without_bzero(int signo)
-{
-        char *buf = test_without_bzero();
-        ASSERT_GE(count_secrets(buf), 1);
-}
-
-static void 
-do_test_with_bzero(int signo)
-{
-        char *buf = test_with_bzero();
-        ASSERT_EQ(count_secrets(buf), 0);
-}
-
-int
-main()
-{
-        setup_stack();
-
-        /*
-         * Solaris and OS X clobber the signal stack after returning to the
-         * normal stack, so we need to inspect altstack while we're still
-         * running on it.  Unfortunately, this means we risk clobbering the
-         * buffer ourselves.
-         *
-         * To minimize this risk, test_with{,out}_bzero() are responsible for
-         * locating the offset of their buf variable within altstack, and
-         * and returning that address.  Then we can simply memcmp() repeatedly
-         * to count how many instances of secret we found.
-         */
-
-        /*
-         * First, test that if we *don't* call explicit_bzero, that we
-         * *are* able to find at least one instance of the secret data still
-         * on the stack.  This sanity checks that call_on_stack() and
-         * populate_secret() work as intended.
-         */
-        memset(altstack, 0, sizeof(altstack));
-        call_on_stack(do_test_without_bzero);
-
-        /*
-         * Now test with a call to explicit_bzero() and check that we
-         * *don't* find any instances of the secret data.
-         */
-        memset(altstack, 0, sizeof(altstack));
-        call_on_stack(do_test_with_bzero);
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/fmemopen/Makefile b/src/regress/lib/libc/fmemopen/Makefile
deleted file mode 100644
index 9cfbfaa99c..0000000000
--- a/src/regress/lib/libc/fmemopen/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2013/01/01 17:43:07 mpi Exp $
-
-PROG=   fmemopentest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/fmemopen/fmemopentest.c b/src/regress/lib/libc/fmemopen/fmemopentest.c
deleted file mode 100644
index 203c93be65..0000000000
--- a/src/regress/lib/libc/fmemopen/fmemopentest.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*      $OpenBSD: fmemopentest.c,v 1.3 2013/03/28 09:35:58 mpi Exp $ */
-
-/*
- * Copyright (c) 2011 Martin Pieuchot <mpi@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-int
-simpletest(void)
-{
-        FILE    *s1, *s2;
-        char     string[] = "fmemopen test string!";
-        char     buffer[1024], *buf = NULL;
-        size_t   len;
-        int      c, failures = 0;
-
-        s1 = fmemopen(string, strlen(string) + 1, "r");
-        if (s1 == NULL) {
-                warn("unable to open a stream s1");
-                return (1);
-        }
-
-        s2 = fmemopen(buf, 22, "w+");
-        if (s2 == NULL) {
-                warn("unable to create a stream s2");
-                fclose(s1);
-                return (1);
-        }
-
-        while ((c = fgetc(s1)) != EOF)
-                fputc(c, s2);
-
-        if (ftell(s2) != strlen(string) + 1) {
-                warnx("failed copy test (1)");
-                failures++;
-        }
-        fclose(s1);
-
-        fseek(s2, 0, SEEK_SET);
-        if (ftell(s2) != 0) {
-                warnx("failed seek test (2)");
-                failures++;
-        }
-
-        len = fread(buffer, 1, sizeof(buffer) - 1, s2);
-        if (len != strlen(string) + 1) {
-                warnx("failed read test (3) %zu != %zu",
-                    len, strlen(string) + 1);
-                failures++;
-        }
-
-        return (failures);
-}
-
-int
-updatetest(void)
-{
-        FILE    *s1;
-        char     string[] = "hello\0 test number 2";
-        char     buffer[256];
-        size_t   len;
-        int      failures = 0;
-
-        s1 = fmemopen(string, 19, "a+");
-        if (s1 == NULL)
-                return (1);
-
-        len = fwrite(" world", 1, 6, s1);
-        if (len != 6) {
-                warnx("failed write test (4)");
-                failures++;
-        }
-
-        fseek(s1, 0, SEEK_SET);
-        if (ftell(s1) != 0) {
-                warnx("failed seek test (5)");
-                failures++;
-        }
-
-        len = fread(buffer, 1, sizeof(buffer) - 1, s1);
-        if (strncmp(string, buffer, len)) {
-                warnx("failed compare test (6)");
-                failures++;
-        }
-
-        if (strcmp(string, "hello world")) {
-                warnx("failed compare test (7)");
-                failures++;
-        }
-
-        if (strcmp(string + strlen(string) + 1, "number 2")) {
-                warnx("failed compare test (8)");
-                failures++;
-        }
-
-        return (failures);
-}
-
-int
-writetest(void)
-{
-        FILE    *s1;
-        char     string[] = "super test number 3";
-        char     buffer[256];
-        size_t   len, slen;
-        int      failures = 0;
-
-        slen = strlen(string) + 1;
-
-        s1 = fmemopen(string, slen, "w");
-        if (s1 == NULL)
-                return (1);
-
-        len = fwrite("short", 1, 5, s1);
-        if (len != strlen("short")) {
-                warnx("failed write test (9)");
-                failures++;
-        }
-        fclose(s1);
-
-        s1 = fmemopen(string, slen, "r");
-        if (s1 == NULL) {
-                warnx("failed open test (10)");
-                failures++;
-        }
-
-        len = fread(buffer, 1, sizeof(buffer) - 1, s1);
-        if (strncmp(string, buffer, len)) {
-                warnx("failed compare test (11)");
-                failures++;
-        }
-
-        if (strcmp(string, "short")) {
-                warnx("failed compare test (12)");
-                failures++;
-        }
-
-        if (strcmp(string + strlen(string) + 1, "test number 3")) {
-                warnx("failed compare test (13)");
-                failures++;
-        }
-
-        return (failures);
-}
-
-int
-seektest(void)
-{
-        FILE    *s1;
-        char     string[] = "long string for testing seek";
-        size_t   len, slen;
-        int      failures = 0;
-
-        slen = strlen(string) + 1;
-
-        s1 = fmemopen(string, slen, "r");
-        if (s1 == NULL)
-                return (1);
-
-        if (fseek(s1, 8, SEEK_SET) != 0) {
-                warnx("failed to fseek. (14)");
-                failures++;
-        }
-
-        if (ftell(s1) != 8) {
-                warnx("failed seek test. (15)");
-                failures++;
-        }
-
-        /* Try to seek backward */
-        if (fseek(s1, -1, SEEK_CUR) != 0) {
-                warnx("failed to fseek. (16)");
-                failures++;
-        }
-
-        if (ftell(s1) != 7) {
-                warnx("failed seeking backward. (17)");
-                failures++;
-        }
-
-        return (failures);
-}
-
-int
-main(void)
-{
-        int      failures = 0;
-
-        failures += simpletest();
-        failures += updatetest();
-        failures += writetest();
-        failures += seektest();
-
-        return (failures);
-}
diff --git a/src/regress/lib/libc/fnmatch/Makefile b/src/regress/lib/libc/fnmatch/Makefile
deleted file mode 100644
index 4acdd351bc..0000000000
--- a/src/regress/lib/libc/fnmatch/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2011/09/17 15:12:38 stsp Exp $
-
-PROG=   fnm_test
-LDADD+= -lutil
-DPADD+= ${LIBUTIL}
-
-run-regress-${PROG}:
-        ./${PROG} ${.CURDIR}/${PROG}.in
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/fnmatch/fnm_test.c b/src/regress/lib/libc/fnmatch/fnm_test.c
deleted file mode 100644
index f5958837e2..0000000000
--- a/src/regress/lib/libc/fnmatch/fnm_test.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*      $OpenBSD: fnm_test.c,v 1.2 2011/09/17 15:12:38 stsp Exp $       */
-
-/*
- * Public domain, 2008, Todd C. Miller <Todd.Miller@courtesan.com>
- */
-
-#include <err.h>
-#include <fnmatch.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <util.h>
-
-int
-main(int argc, char **argv)
-{
-        FILE *fp = stdin;
-        char pattern[1024], string[1024];
-        char *line;
-        const char delim[3] = {'\0', '\0', '#'};
-        int errors = 0, flags, got, want;
-
-        if (argc > 1) {
-                if ((fp = fopen(argv[1], "r")) == NULL)
-                        err(1, "%s", argv[1]);
-        }
-
-        /*
-         * Read in test file, which is formatted thusly:
-         *
-         * pattern string flags expected_result
-         *
-         * lines starting with '#' are comments
-         */
-        for (;;) {
-                line = fparseln(fp, NULL, NULL, delim, 0);
-                if (!line)
-                        break;
-                got = sscanf(line, "%s %s 0x%x %d", pattern, string, &flags,
-                    &want);
-                if (got == EOF) {
-                        free(line);
-                        break;
-                }
-                if (pattern[0] == '#') {
-                        free(line);
-                        continue;
-                }
-                if (got == 4) {
-                        got = fnmatch(pattern, string, flags);
-                        if (got != want) {
-                                warnx("%s %s %d: want %d, got %d", pattern,
-                                    string, flags, want, got);
-                                errors++;
-                        }
-                } else {
-                        warnx("unrecognized line '%s'\n", line);
-                        errors++;
-                }
-                free(line);
-        }
-        exit(errors);
-}
diff --git a/src/regress/lib/libc/fnmatch/fnm_test.in b/src/regress/lib/libc/fnmatch/fnm_test.in
deleted file mode 100644
index c2f218ae1b..0000000000
--- a/src/regress/lib/libc/fnmatch/fnm_test.in
+++ /dev/null
@@ -1,260 +0,0 @@
-/bin/[[:alpha:][:alnum:]]* /bin/ls 0x2 0
-/bin/[[:upper:]][[:alnum:]] /bin/ls 0x10 0
-/bin/[[:opper:][:alnum:]]* /bin/ls 0x0 1
-[[:alpha:][:alnum:]]*.c foo1.c 0x4 0
-[[:upper:]]* FOO 0x0 0
-[![:space:]]* bar 0x0 0
-# 'te\st' 'test'; no match if FNM_NOESCAPE
-te\st test 0x0 0  
-te\st test 0x1 1
-te\st test 0x1e 0
-# 'te\\st' 'te\st'; no match if FNM_NOESCAPE
-te\\st te\st 0x0 0
-te\\st te\st 0x1 1
-te\\st te\st 0x1e 0
-# 'te\*t' 'te*t'; no match if FNM_NOESCAPE
-te\*t te*t 0x0 0
-te\*t te*t 0x1 1
-te\*t te*t 0x1e 0
-# 'te\*t' 'test'; no match
-te\*t test 0x0 1
-te\*t test 0x1f 1
-# 'te\?t' 'te?t'; no match if FNM_NOESCAPE
-te\?t te?t 0x0 0
-te\?t te?t 0x1 1
-te\?t te?t 0x1e 0
-# 'te\?t' 'test'; no match
-te\?t test 0x0 1
-te\?t test 0x1f 1
-# 'tesT' 'test'; match if FNM_CASEFOLD
-tesT test 0x0 1
-tesT test 0xf 1
-tesT test 0x10 0
-# 'test' 'Test'; match if FNM_CASEFOLD
-test Test 0x0 1
-test Test 0xf 1
-test Test 0x10 0
-# 'tEst' 'teSt'; match if FNM_CASEFOLD
-tEst teSt 0x0 1
-tEst teSt 0xf 1
-tEst teSt 0x10 0
-# '?est' 'test'; match always
-?est test 0x0 0
-?est test 0x1f 0
-# 'te?t' 'test'; match always
-te?t test 0x0 0
-te?t test 0x1f 0
-# 'tes?' 'test'; match always
-tes? test 0x0 0
-tes? test 0x1f 0
-# 'test?' 'test'; no match
-test? test 0x0 1
-test? test 0x1f 1
-# '*' always matches anything
-*  test 0x0 0
-*  test 0x1f 0
-# '*test' 'test'; match always
-*test test 0x0 0
-*test test 0x1f 0
-# '*est' 'test'; match always
-*est test 0x0 0
-*est test 0x1f 0
-# '*st' 'test'; match always
-*st test 0x0 0
-*st test 0x1f 0
-# 't*t' 'test'; match always
-t*t test 0x0 0
-t*t test 0x1f 0
-# 'te*t' 'test'; match always
-te*t test 0x0 0
-te*t test 0x1f 0
-# 'te*st' 'test'; match always
-te*st test 0x0 0
-te*st test 0x1f 0
-# 'te*' 'test'; match always
-te* test 0x0 0
-te* test 0x1f 0
-# 'tes*' 'test'; match always
-tes* test 0x0 0
-tes* test 0x1f 0
-# 'test*' 'test'; match always
-test* test 0x0 0
-test* test 0x1f 0
-# '.[\-\t]' '.t'; match always
-.[\-\t] .t 0x0 0
-.[\-\t] .t 0x1f 0
-# 'test*?*[a-z]*' 'testgoop'; match always
-test*?*[a-z]* testgoop 0x0 0
-test*?*[a-z]* testgoop 0x1f 0
-# 'te[^abc]t' 'test'; match always
-te[^abc]t test 0x0 0
-te[^abc]t test 0x1f 0
-# 'te[^x]t' 'test'; match always
-te[^x]t test 0x0 0
-te[^x]t test 0x1f 0
-# 'te[!x]t' 'test'; match always
-te[!x]t test 0x0 0
-te[^x]t test 0x1f 0
-# 'te[^x]t' 'text'; no match
-te[^x]t text 0x0 1
-te[^x]t text 0x1f 1
-# 'te[^\x]t' 'text'; no match
-te[^\x]t text 0x0 1
-te[^\x]t text 0x1f 1
-# 'te[^\x' 'text'; no match
-te[^\x text 0x0 1
-te[^\x text 0x1f 1
-# 'te[/]t' 'text'; no match
-te[/]t text 0x0 1
-te[/]t text 0x1f 1
-# 'te[S]t' 'test'; match if FNM_CASEFOLD
-te[S]t test 0x0 1
-te[S]t test 0xf 1
-te[S]t test 0x10 0
-# 'te[r-t]t' 'test'; match always
-te[r-t]t test 0x0 0
-te[r-t]t test 0x1f 0
-# 'te[r-t]t' 'teSt'; match if FNM_CASEFOLD
-te[r-t]t teSt 0x0 1
-te[r-t]t teSt 0xf 1
-te[r-t]t teSt 0x10 0
-# 'te[r-T]t' 'test'; match if FNM_CASEFOLD
-te[r-T]t test 0x0 1
-te[r-T]t test 0xf 1
-te[r-T]t test 0x10 0
-# 'te[R-T]t' 'test'; match if FNM_CASEFOLD
-te[R-T]t test 0x0 1
-te[R-T]t test 0xf 1
-te[R-T]t test 0x10 0
-# 'te[r-Tz]t' 'tezt'; match always
-te[r-Tz]t tezt 0x0 0
-te[r-Tz]t tezt 0x1f 0
-# 'te[R-T]t' 'tent'; no match
-te[R-T]t tent 0x0 1
-te[R-T]t tent 0x1f 1
-# 'tes[]t]' 'test'; match always
-tes[]t] test 0x0 0
-tes[]t] test 0x1f 0
-# 'tes[t-]' 'test'; match always
-tes[t-] test 0x0 0
-tes[t-] test 0x1f 0
-# 'tes[t-]]' 'test]'; match always
-tes[t-]] test] 0x0 0
-tes[t-]] test] 0x1f 0
-# 'tes[t-]]' 'test'; no match
-tes[t-]] test 0x0 1
-tes[t-]] test 0x1f 1
-# 'tes[u-]' 'test'; no match
-tes[u-] test 0x0 1
-tes[u-] test 0x1f 1
-# 'tes[t-]' 'tes[t-]'; no match
-tes[t-] test[t-] 0x0 1
-tes[t-] test[t-] 0x1f 1
-# 'test[/-/]' 'test[/-/]'; no match
-test[/-/] test/-/ 0x0 1
-test[/-/] test/-/ 0x1f 1
-# 'test[\/-/]' 'test[/-/]'; no match
-test[\/-/] test/-/ 0x0 1
-test[\/-/] test/-/ 0x1f 1
-# 'test[/-\/]' 'test[/-/]'; no match
-test[/-\/] test/-/ 0x0 1
-test[/-\/] test/-/ 0x1f 1
-# 'test[/-/]' 'test/'; no match if APR_FNM_PATHNAME
-test[/-/] test/ 0x0 0
-test[/-/] test/ 0x2 1
-test[/-/] test/ 0x1d 0
-# 'test[\/-/]' 'test/'; no match if APR_FNM_PATHNAME
-test[\/-/] test/ 0x0 0
-test[\/-/] test/ 0x2 1
-test[\/-/] test/ 0x1d 0
-# 'test[/-\/]' 'test/'; no match if APR_FNM_PATHNAME
-test[/-\/] test/ 0x0 0
-test[/-\/] test/ 0x2 1
-test[/-\/] test/ 0x1d 0
-# '/test' 'test'; no match
-/test test 0x0 1
-/test test 0x1f 1
-# 'test' '/test'; no match
-test /test 0x0 1
-test /test 0x1f 1
-# 'test/' 'test'; no match
-test/ test 0x0 1
-test/ test 0x1f 1
-# 'test' 'test/'; match if FNM_LEADING_DIR
-test test/ 0x0 1
-test test/ 0x17 1
-test test/ 0x8 0
-# '\/test' '/test'; match unless FNM_NOESCAPE
-\/test /test 0x0 0
-\/test /test 0x1 1
-\/test /test 0x1e 0
-# '*test' '/test'; match unless FNM_PATHNAME
-*test /test 0x0 0
-*test /test 0x2 1
-*test /test 0x1d 0
-# '/*/test' '/test'; no match
-/*/test /test 0x0 1
-/*/test /test 0x1f 1
-# '/*/test' '/test/test'; match always
-/*/test /test/test 0x0 0
-/*/test /test/test 0x1f 0
-# 'test/this' 'test/'; match never
-test/this test/ 0x0 1
-test/this test/ 0x1f 1
-# 'test/' 'test/this'; match never
-test/ test/this 0x0 1
-test/ test/this 0x1f 1
-# 'test*/this' 'test/this'; match always
-test*/this test/this 0x0 0
-test*/this test/this 0x1f 0
-# 'test*/this' 'test/that'; match never
-test*/this test/that 0x0 1
-test*/this test/that 0x1f 1
-# 'test/*this' 'test/this'; match always
-test/*this test/this 0x0 0
-test/*this test/this 0x1f 0
-# '.*' '.this'; match always
-.* .this 0x0 0
-.* .this 0x1f 0
-# '*' '.this'; fails if FNM_PERIOD
-* .this 0x0 0
-* .this 0x4 1
-* .this 0x1b 0
-# '?this' '.this'; fails if FNM_PERIOD
-?this .this 0x0 0
-?this .this 0x4 1
-?this .this 0x1b 0
-# '[.]this' '.this'; fails if FNM_PERIOD
-[.]this .this 0x0 0
-[.]this .this 0x4 1
-[.]this .this 0x1b 0
-# 'test/this' 'test/this'; match always
-test/this test/this 0x0 0
-test/this test/this 0x1f 0
-# 'test?this' 'test/this'; fails if FNM_PATHNAME
-test?this test/this 0x0 0
-test?this test/this 0x2 1
-test?this test/this 0x1d 0
-# 'test*this' 'test/this'; fails if FNM_PATHNAME
-test*this test/this 0x0 0
-test*this test/this 0x2 1
-test*this test/this 0x1d 0
-# 'test[/]this' 'test/this'; fails if FNM_PATHNAME
-test[/]this test/this 0x0 0
-test[/]this test/this 0x2 1
-test[/]this test/this 0x1d 0
-# 'test/.*' 'test/.this'; match always
-test/.* test/.this 0x0 0
-test/.* test/.this 0x1f 0
-# 'test/*' 'test/.this'; fails if FNM_PERIOD and FNM_PATHNAME
-test/* test/.this 0x0 0
-test/* test/.this 0x6 1
-test/* test/.this 0x19 0
-# 'test/?' 'test/.this'; fails if FNM_PERIOD and FNM_PATHNAME
-test/?this test/.this 0x0 0
-test/?this test/.this 0x6 1
-test/?this test/.this 0x19 0
-# 'test/[.]this' 'test/.this'; fails if FNM_PERIOD and FNM_PATHNAME
-test/[.]this test/.this 0x0 0
-test/[.]this test/.this 0x6 1
-test/[.]this test/.this 0x19 0
diff --git a/src/regress/lib/libc/fpclassify/Makefile b/src/regress/lib/libc/fpclassify/Makefile
deleted file mode 100644
index 96916d20e7..0000000000
--- a/src/regress/lib/libc/fpclassify/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2008/09/07 20:36:10 martynas Exp $
-
-PROG=   fpclassify
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/fpclassify/fpclassify.c b/src/regress/lib/libc/fpclassify/fpclassify.c
deleted file mode 100644
index 174c04d983..0000000000
--- a/src/regress/lib/libc/fpclassify/fpclassify.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*      $OpenBSD: fpclassify.c,v 1.1 2008/09/07 20:36:10 martynas Exp $ */
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/tools/regression/lib/libc/gen/test-fpclassify.c,v 1.3 2003/03/27 05:32:28 das Exp $
- */
-
-#include <assert.h>
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-
-int
-main(void)
-{
-
-        assert(fpclassify((float)0) == FP_ZERO);
-        assert(fpclassify((float)-0.0) == FP_ZERO);
-        assert(fpclassify((float)1) == FP_NORMAL);
-        assert(fpclassify((float)1000) == FP_NORMAL);
-#ifndef __alpha__
-        assert(fpclassify(0x1.2p-150f) == FP_SUBNORMAL);
-#endif /* !__alpha__ */
-        assert(fpclassify(HUGE_VALF) == FP_INFINITE);
-        assert(fpclassify((float)HUGE_VAL) == FP_INFINITE);
-        assert(fpclassify((float)HUGE_VALL) == FP_INFINITE);
-        assert(fpclassify(NAN) == FP_NAN);
-
-        assert(fpclassify((double)0) == FP_ZERO);
-        assert(fpclassify((double)-0) == FP_ZERO);
-        assert(fpclassify((double)1) == FP_NORMAL);
-        assert(fpclassify((double)1000) == FP_NORMAL);
-#ifndef __alpha__
-        assert(fpclassify(0x1.2p-1075) == FP_SUBNORMAL);
-#endif /* !__alpha__ */
-        assert(fpclassify(HUGE_VAL) == FP_INFINITE);
-        assert(fpclassify((double)HUGE_VALF) == FP_INFINITE);
-        assert(fpclassify((double)HUGE_VALL) == FP_INFINITE);
-        assert(fpclassify((double)NAN) == FP_NAN);
-
-        assert(fpclassify((long double)0) == FP_ZERO);
-        assert(fpclassify((long double)-0.0) == FP_ZERO);
-        assert(fpclassify((long double)1) == FP_NORMAL);
-        assert(fpclassify((long double)1000) == FP_NORMAL);
-#if (LDBL_MANT_DIG > DBL_MANT_DIG)
-        assert(fpclassify(0x1.2p-16383L) == FP_SUBNORMAL);
-#endif /* (LDBL_MANT_DIG > DBL_MANT_DIG) */
-        assert(fpclassify(HUGE_VALL) == FP_INFINITE);
-        assert(fpclassify((long double)HUGE_VALF) == FP_INFINITE);
-        assert(fpclassify((long double)HUGE_VAL) == FP_INFINITE);
-        assert(fpclassify((long double)NAN) == FP_NAN);
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/gcvt/Makefile b/src/regress/lib/libc/gcvt/Makefile
deleted file mode 100644
index d8efaa9362..0000000000
--- a/src/regress/lib/libc/gcvt/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2010/09/17 19:51:38 millert Exp $
-
-PROG=   gcvt_test
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/gcvt/gcvt_test.c b/src/regress/lib/libc/gcvt/gcvt_test.c
deleted file mode 100644
index 164d600cd2..0000000000
--- a/src/regress/lib/libc/gcvt/gcvt_test.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*      $OpenBSD: gcvt_test.c,v 1.4 2010/09/18 20:29:15 millert Exp $   */
-
-/*
- * Public domain, 2010, Todd C. Miller <Todd.Miller@courtesan.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static struct test_vector {
-        double d;
-        int ndig;
-        char *expect;
-} test_vectors[] = {
-        /* adapted from perl's Configure test */
-        { 0.1, 8, "0.1" },
-        { 0.01, 8, "0.01" },
-        { 0.001, 8, "0.001" },
-        { 0.0001, 8, "0.0001" },
-        { 0.00009, 8, "9e-05" },
-        { 1.0, 8, "1" },
-        { 1.1, 8, "1.1" },
-        { 1.01, 8, "1.01" },
-        { 1.001, 8, "1.001" },
-        { 1.0001, 8, "1.0001" },
-        { 1.00001, 8, "1.00001" },
-        { 1.000001, 8, "1.000001" },
-        { 0.0, 8, "0" },
-        { -1.0, 8, "-1" },
-        { 100000.0, 8, "100000" },
-        { -100000.0, 8, "-100000" },
-        { 123.456, 8, "123.456" },
-        { 1e34, 8, "1e+34" },
-        /* adapted from emx */
-        { 0.0, -1, "0" },
-        { 0.0, 0, "0" },
-        { 0.0, 1, "0" },
-        { 0.0, 2, "0" },
-        { 1.0, -1, "1" },
-        { 1.0, 0, "1" },
-        { 1.0, 2, "1" },
-        { 1.0, 10, "1" },
-        { 1.236, -1, "1.236" },
-        { 1.236, 0, "1" },
-        { 1.236, 1, "1" },
-        { 1.236, 2, "1.2" },
-        { 1.236, 3, "1.24" },
-        { 1.236, 4, "1.236" },
-        { 1.236, 5, "1.236" },
-        { 1.236, 6, "1.236" },
-        { 12.36, -1, "12.36" },
-        { 12.36, 0, "1e+01" },
-        { 12.36, 1, "1e+01" },
-        { 12.36, 2, "12" },
-        { 12.36, 3, "12.4" },
-        { 12.36, 4, "12.36" },
-        { 12.36, 5, "12.36" },
-        { 12.36, 6, "12.36" },
-        { 123.6, -1, "123.6" },
-        { 123.6, 0, "1e+02" },
-        { 123.6, 1, "1e+02" },
-        { 123.6, 2, "1.2e+02" },
-        { 123.6, 3, "124" },
-        { 123.6, 4, "123.6" },
-        { 123.6, 5, "123.6" },
-        { 123.6, 6, "123.6" },
-        { 1236.0, -1, "1236" },
-        { 1236.0, 0, "1e+03" },
-        { 1236.0, 1, "1e+03" },
-        { 1236.0, 2, "1.2e+03" },
-        { 1236.0, 3, "1.24e+03" },
-        { 1236.0, 4, "1236" },
-        { 1236.0, 5, "1236" },
-        { 1236.0, 6, "1236" },
-        { 1e100, 10, "1e+100" },
-        { 1e100, 20, "1.0000000000000000159e+100" },
-        { 0.01236, -1, "0.01236" },
-        { 0.01236, 0, "0.01" },
-        { 0.01236, 1, "0.01" },
-        { 0.01236, 2, "0.012" },
-        { 0.01236, 3, "0.0124" },
-        { 0.01236, 4, "0.01236" },
-        { 1e-100, 20, "1.00000000000000002e-100" },
-        { 1e-100, -1, "1e-100" },
-        { -1.2, 5, "-1.2" },
-        { -0.03, 5, "-0.03" },
-        { 0.1, 1, "0.1" },
-        { 0.1, 0, "0.1" },
-        { 0.099999, 10, "0.099999" },
-        { 0.99999, 10, "0.99999" },
-};
-
-#define NTESTVEC (sizeof(test_vectors) / sizeof(test_vectors[0]))
-
-static int
-dotest(struct test_vector *tv)
-{
-        char buf[256], *got;
-
-        got = gcvt(tv->d, tv->ndig, buf);
-        if (strcmp(tv->expect, got) != 0) {
-                fprintf(stderr, "%g @ %d: expected %s, got %s\n",
-                    tv->d, tv->ndig, tv->expect, got);
-                return 1;
-        }
-        return 0;
-}
-
-int
-main(int argc, char *argv[])
-{
-        int i, failures = 0;
-
-        for (i = 0; i < NTESTVEC; i++) {
-                failures += dotest(&test_vectors[i]);
-        }
-
-        return failures;
-}
diff --git a/src/regress/lib/libc/getaddrinfo/Makefile b/src/regress/lib/libc/getaddrinfo/Makefile
deleted file mode 100644
index 7a78438a12..0000000000
--- a/src/regress/lib/libc/getaddrinfo/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.5 2017/07/27 17:43:24 bluhm Exp $
-
-PROG =          gaitest
-CLEANFILES =    out
-
-run-regress-${PROG}: ${PROG}
-        sh ${.CURDIR}/testsuite.sh >out 2>&1
-        diff -u10 out ${.CURDIR}/answer
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/getaddrinfo/answer b/src/regress/lib/libc/getaddrinfo/answer
deleted file mode 100644
index af6d069bbe..0000000000
--- a/src/regress/lib/libc/getaddrinfo/answer
+++ /dev/null
@@ -1,110 +0,0 @@
-== basic ones
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv http
-ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv http
-ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
-ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv tftp
-ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv tftp
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv tftp
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69
-ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv echo
-ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7
-ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv echo
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv echo
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7
-ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7
-ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7
-
-== specific address family
-arg: flags 0x2 family 2 socktype 0 protocol 0 addrlen 0 host localhost serv http
-ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
-arg: flags 0x2 family 24 socktype 0 protocol 0 addrlen 0 host localhost serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-
-== empty hostname
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
-ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
-ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7
-ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7
-ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69
-ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 80
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
-ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 80
-ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
-ai1: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 80
-ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 80
-arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
-ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 7
-ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 7
-ai3: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 7
-ai4: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 7
-arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp
-ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 69
-ai2: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 69
-arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 80
-ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 80
-ai3: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 80
-ai4: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 80
-arg: flags 0x2 family 0 socktype 1 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
-ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-arg: flags 0x2 family 0 socktype 2 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 80
-ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 80
-
-== empty servname
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv (empty)
-ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0
-ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 0
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv (empty)
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv (empty)
-ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
-ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0
-ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 0
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv (empty)
-name or service is not known
-
-== sock_raw
-arg: flags 0x2 family 0 socktype 3 protocol 0 addrlen 0 host localhost serv (empty)
-ai1: flags 0x2 family 2 socktype 3 protocol 0 addrlen 16 host 127.0.0.1 serv 0
-ai2: flags 0x2 family 24 socktype 3 protocol 0 addrlen 28 host ::1 serv 0
-arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv (empty)
-ai1: flags 0x2 family 2 socktype 3 protocol 59 addrlen 16 host 127.0.0.1 serv 0
-ai2: flags 0x2 family 24 socktype 3 protocol 59 addrlen 28 host ::1 serv 0
-arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv 80
-service not supported for ai_socktype
-arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv www
-service not supported for ai_socktype
-arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host ::1 serv (empty)
-ai1: flags 0x2 family 24 socktype 3 protocol 59 addrlen 28 host ::1 serv 0
-
-== unsupported family
-arg: flags 0x2 family 99 socktype 0 protocol 0 addrlen 0 host localhost serv (empty)
-ai_family not supported
-
-== the following items are specified in jinmei scopeaddr format doc.
-arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host fe80::1%lo0 serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host fe80::1%lo0 serv 80
-
diff --git a/src/regress/lib/libc/getaddrinfo/gaitest.c b/src/regress/lib/libc/getaddrinfo/gaitest.c
deleted file mode 100644
index 12a4498459..0000000000
--- a/src/regress/lib/libc/getaddrinfo/gaitest.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*      $OpenBSD: gaitest.c,v 1.6 2009/06/09 18:15:08 phessler Exp $    */
-/*      $NetBSD: gaitest.c,v 1.3 2002/07/05 15:47:43 itojun Exp $       */
-
-/*
- * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Please note: the order of the responses (and the regress test)
- * is dependent on the "family" keywords in resolv.conf.
- *
- * This expects the default behaviour of "family inet4 inet6"
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-struct addrinfo ai;
-
-char host[NI_MAXHOST];
-char serv[NI_MAXSERV];
-int vflag = 0;
-
-static void usage(void);
-static void print1(const char *, const struct addrinfo *, char *, char *);
-int main(int, char *[]);
-
-static void
-usage()
-{
-        fprintf(stderr, "usage: test [-f family] [-s socktype] [-p proto] [-DPRSv46] host serv\n");
-}
-
-static void
-print1(title, res, h, s)
-        const char *title;
-        const struct addrinfo *res;
-        char *h;
-        char *s;
-{
-        char *start, *end;
-        int error;
-        const int niflag = NI_NUMERICHOST | NI_NUMERICSERV;
-
-        if (res->ai_addr) {
-                error = getnameinfo(res->ai_addr, res->ai_addr->sa_len,
-                                    host, sizeof(host), serv, sizeof(serv),
-                                    niflag);
-                h = host;
-                s = serv;
-        } else
-                error = 0;
-
-        if (vflag) {
-                start = "\t";
-                end = "\n";
-        } else {
-                start = " ";
-                end = "";
-        }
-        printf("%s%s", title, end);
-        printf("%sflags 0x%x%s", start, res->ai_flags, end);
-        printf("%sfamily %d%s", start, res->ai_family, end);
-        printf("%ssocktype %d%s", start, res->ai_socktype, end);
-        printf("%sprotocol %d%s", start, res->ai_protocol, end);
-        printf("%saddrlen %d%s", start, res->ai_addrlen, end);
-        if (error)
-                printf("%serror %d%s", start, error, end);
-        else {
-                printf("%shost %s%s", start, h, end);
-                printf("%sserv %s%s", start, s, end);
-        }
-#if 0
-        if (res->ai_canonname)
-                printf("%scname \"%s\"%s", start, res->ai_canonname, end);
-#endif
-        if (!vflag)
-                printf("\n");
-
-}
-
-int
-main(argc, argv)
-        int argc;
-        char *argv[];
-{
-        struct addrinfo *res;
-        int error, i;
-        char *p, *q;
-        extern int optind;
-        extern char *optarg;
-        int c;
-        char nbuf[10];
-
-        memset(&ai, 0, sizeof(ai));
-        ai.ai_family = PF_UNSPEC;
-        ai.ai_flags |= AI_CANONNAME;
-        while ((c = getopt(argc, argv, "Df:p:PRs:Sv46")) != -1) {
-                switch (c) {
-                case 'D':
-                        ai.ai_socktype = SOCK_DGRAM;
-                        break;
-                case 'f':
-                        ai.ai_family = atoi(optarg);
-                        break;
-                case 'p':
-                        ai.ai_protocol = atoi(optarg);
-                        break;
-                case 'P':
-                        ai.ai_flags |= AI_PASSIVE;
-                        break;
-                case 'R':
-                        ai.ai_socktype = SOCK_RAW;
-                        break;
-                case 's':
-                        ai.ai_socktype = atoi(optarg);
-                        break;
-                case 'S':
-                        ai.ai_socktype = SOCK_STREAM;
-                        break;
-                case 'v':
-                        vflag++;
-                        break;
-                case '4':
-                        ai.ai_family = PF_INET;
-                        break;
-                case '6':
-                        ai.ai_family = PF_INET6;
-                        break;
-                default:
-                        usage();
-                        exit(1);
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        if (argc != 2){
-                usage();
-                exit(1);
-        }
-
-        p = *argv[0] ? argv[0] : NULL;
-        q = *argv[1] ? argv[1] : NULL;
-
-        print1("arg:", &ai, p ? p : "(empty)", q ? q : "(empty)");
-
-        error = getaddrinfo(p, q, &ai, &res);
-        if (error) {
-                printf("%s\n", gai_strerror(error));
-                exit(1);
-        }
-
-        i = 1;
-        do {
-                snprintf(nbuf, sizeof(nbuf), "ai%d:", i);
-                print1(nbuf, res, NULL, NULL);
-
-                i++;
-        } while ((res = res->ai_next) != NULL);
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/getaddrinfo/testsuite.sh b/src/regress/lib/libc/getaddrinfo/testsuite.sh
deleted file mode 100644
index 1e4e524054..0000000000
--- a/src/regress/lib/libc/getaddrinfo/testsuite.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#       $OpenBSD: testsuite.sh,v 1.1 2002/07/05 15:54:30 itojun Exp $
-#       $NetBSD: testsuite.sh,v 1.3 2002/07/05 15:49:11 itojun Exp $
-
-#
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of the project nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-
-TEST=./gaitest
-#TEST='./test -v'
-#IF=`ifconfig -a | grep -v '^   ' | sed -e 's/:.*//' | head -1 | awk '{print $1}'`
-
-echo '== basic ones'
-$TEST ::1 http
-$TEST 127.0.0.1 http
-$TEST localhost http
-$TEST ::1 tftp
-$TEST 127.0.0.1 tftp
-$TEST localhost tftp
-$TEST ::1 echo
-$TEST 127.0.0.1 echo
-$TEST localhost echo
-echo
-
-echo '== specific address family'
-$TEST -4 localhost http
-$TEST -6 localhost http
-echo
-
-echo '== empty hostname'
-$TEST '' http
-$TEST '' echo
-$TEST '' tftp
-$TEST '' 80
-$TEST -P '' http
-$TEST -P '' echo
-$TEST -P '' tftp
-$TEST -P '' 80
-$TEST -S '' 80
-$TEST -D '' 80
-echo
-
-echo '== empty servname'
-$TEST ::1 ''
-$TEST 127.0.0.1 ''
-$TEST localhost ''
-$TEST '' ''
-echo
-
-echo '== sock_raw'
-$TEST -R -p 0 localhost ''
-$TEST -R -p 59 localhost ''
-$TEST -R -p 59 localhost 80
-$TEST -R -p 59 localhost www
-$TEST -R -p 59 ::1 ''
-echo
-
-echo '== unsupported family'
-$TEST -f 99 localhost ''
-echo
-
-echo '== the following items are specified in jinmei scopeaddr format doc.'
-$TEST fe80::1%lo0 http
-#$TEST fe80::1%$IF http
-echo
diff --git a/src/regress/lib/libc/getcap/Makefile b/src/regress/lib/libc/getcap/Makefile
deleted file mode 100644
index 7b7ae394ff..0000000000
--- a/src/regress/lib/libc/getcap/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2009/06/09 18:16:40 phessler Exp $
-
-PROG=           getcaptest
-
-REGRESS_TARGETS=shortcap
-
-shortcap: getcaptest
-        ./getcaptest ${.CURDIR}/shortcap.in
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/getcap/getcaptest.c b/src/regress/lib/libc/getcap/getcaptest.c
deleted file mode 100644
index 0f4464b6c5..0000000000
--- a/src/regress/lib/libc/getcap/getcaptest.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*      $OpenBSD: getcaptest.c,v 1.1 2006/03/10 05:28:57 ray Exp $      */
-
-/*
- * Written by Raymond Lai <ray@cyth.net>.
- * Public domain.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main(int argc, char *argv[])
-{
-        char *buf, *db_array[2];
-
-        if (argc != 2)
-                return (1);
-
-        db_array[0] = argv[1];
-        db_array[1] = NULL;
-
-        while (cgetnext(&buf, db_array) > 0)
-                puts(buf);
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/getcap/shortcap.in b/src/regress/lib/libc/getcap/shortcap.in
deleted file mode 100644
index 573541ac97..0000000000
--- a/src/regress/lib/libc/getcap/shortcap.in
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/src/regress/lib/libc/getopt_long/Makefile b/src/regress/lib/libc/getopt_long/Makefile
deleted file mode 100644
index 13a187e190..0000000000
--- a/src/regress/lib/libc/getopt_long/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2002/12/08 19:25:08 millert Exp $
-
-NOMAN=
-PROG=getopt_long_test
-CLEANFILES+=test.out
-
-# test getopt_long and getopt_long_only
-run-regress-${PROG}: ${PROG}
-        @( test -n "$$POSIXLY_CORRECT" && unset POSIXLY_CORRECT; \
-          test -n "$$LONG_ONLY" && unset LONG_ONLY; \
-          ./${PROG} myfile --force -f infile -9 ; \
-          ./${PROG} onefile twofile --best -Williterate -i foo.in threefile ; \
-          ./${PROG} -1bfast - ; \
-          ./${PROG} --fast --drinking=guiness -i foo.in somefile ; \
-          export POSIXLY_CORRECT=1 ; \
-          ./${PROG} myfile --force -f infile -9 ; \
-          ./${PROG} onefile twofile --best -Williterate -i foo.in threefile ; \
-          ./${PROG} -1bfast - ; \
-          ./${PROG} --fast --drinking=guiness -i foo.in somefile ; \
-          unset POSIXLY_CORRECT ; export LONG_ONLY=1 ; \
-          ./${PROG} myfile -force -f infile -9 ; \
-          ./${PROG} onefile twofile -best -Williterate -i foo.in threefile ; \
-          ./${PROG} -1bfast - ; \
-          ./${PROG} --fast -drinking=guiness -i foo.in somefile ; \
-          export POSIXLY_CORRECT=1 ; \
-          ./${PROG} myfile -force -f infile -9 ; \
-          ./${PROG} onefile twofile -best -Williterate -i foo.in threefile ; \
-          ./${PROG} -1bfast - ; \
-          ./${PROG} --fast -drinking=guiness -i foo.in somefile ) >test.out 2>&1
-        cmp -s ${.OBJDIR}/test.out ${.CURDIR}/test.ok
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/getopt_long/getopt_long_test.c b/src/regress/lib/libc/getopt_long/getopt_long_test.c
deleted file mode 100644
index 9f6f603702..0000000000
--- a/src/regress/lib/libc/getopt_long/getopt_long_test.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-
-/*
- * Simple getopt_long() and getopt_long_only() excerciser.
- * ENVIRONMENT:
- *      LONG_ONLY       : use getopt_long_only() (default is getopt_long())
- *      POSIXLY_CORRECT : don't permute args
- */
-
-int
-main(int argc, char **argv)
-{
-        int ch, idx, goggles;
-        int (*gl)(int, char * const *, const char *, const struct option *, int *);
-        struct option longopts[] = {
-                { "force", no_argument, 0, 0 },
-                { "fast", no_argument, 0, '1' },
-                { "best", no_argument, 0, '9' },
-                { "input", required_argument, 0, 'i' },
-                { "illiterate", no_argument, 0, 0 },
-                { "drinking", required_argument, &goggles, 42 },
-                { "help", no_argument, 0, 'h' },
-                { 0, 0, 0, 0 },
-        };
-
-        if (getenv("LONG_ONLY")) {
-                gl = getopt_long_only;
-                printf("getopt_long_only");
-        } else {
-                gl = getopt_long;
-                printf("getopt_long");
-        }
-        if (getenv("POSIXLY_CORRECT"))
-                printf(" (POSIXLY_CORRECT)");
-        printf(": ");
-        for (idx = 1; idx < argc; idx++)
-                printf("%s ", argv[idx]);
-        printf("\n");
-
-        goggles = 0;
-        for (;;) {
-                idx = -1;
-                ch = gl(argc, argv, "19bf:i:hW;-", longopts, &idx);
-                if (ch == -1)
-                        break;
-                switch (ch) {
-                case 0:
-                case '1':
-                case '9':
-                case 'h':
-                case 'b':
-                case '-':
-                        if (idx != -1) {
-                                if (goggles == 42)
-                                        printf("option %s, arg %s\n",
-                                            longopts[idx].name, optarg);
-                                else
-                                        printf("option %s\n",
-                                            longopts[idx].name);
-                        } else
-                                printf("option %c\n", ch);
-                        break;
-                case 'f':
-                case 'i':
-                        if (idx != -1)
-                                printf("option %s, arg %s\n",
-                                    longopts[idx].name, optarg);
-                        else
-                                printf("option %c, arg %s\n", ch, optarg);
-                        break;
-
-                case '?':
-                        break;
-
-                default:
-                        printf("unexpected return value: %c\n", ch);
-                        break;
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        if (argc > 0) {
-                printf("remaining ARGV: ");
-                while (argc--)
-                        printf("%s ", *argv++);
-                printf("\n");
-        }
-        printf("\n");
-
-        exit (0);
-}
diff --git a/src/regress/lib/libc/getopt_long/test.ok b/src/regress/lib/libc/getopt_long/test.ok
deleted file mode 100644
index 9782087f40..0000000000
--- a/src/regress/lib/libc/getopt_long/test.ok
+++ /dev/null
@@ -1,84 +0,0 @@
-getopt_long: myfile --force -f infile -9 
-option force
-option f, arg infile
-option 9
-remaining ARGV: myfile 
-
-getopt_long: onefile twofile --best -Williterate -i foo.in threefile 
-option best
-option illiterate
-option i, arg foo.in
-remaining ARGV: onefile twofile threefile 
-
-getopt_long: -1bfast - 
-option 1
-option b
-option f, arg ast
-option -
-
-getopt_long: --fast --drinking=guiness -i foo.in somefile 
-option fast
-option drinking, arg guiness
-option i, arg foo.in
-remaining ARGV: somefile 
-
-getopt_long (POSIXLY_CORRECT): myfile --force -f infile -9 
-remaining ARGV: myfile --force -f infile -9 
-
-getopt_long (POSIXLY_CORRECT): onefile twofile --best -Williterate -i foo.in threefile 
-remaining ARGV: onefile twofile --best -Williterate -i foo.in threefile 
-
-getopt_long (POSIXLY_CORRECT): -1bfast - 
-option 1
-option b
-option f, arg ast
-option -
-
-getopt_long (POSIXLY_CORRECT): --fast --drinking=guiness -i foo.in somefile 
-option fast
-option drinking, arg guiness
-option i, arg foo.in
-remaining ARGV: somefile 
-
-getopt_long_only: myfile -force -f infile -9 
-option force
-option f, arg infile
-option 9
-remaining ARGV: myfile 
-
-getopt_long_only: onefile twofile -best -Williterate -i foo.in threefile 
-option best
-option illiterate
-option i, arg foo.in
-remaining ARGV: onefile twofile threefile 
-
-getopt_long_only: -1bfast - 
-option 1
-option b
-option fast
-option -
-
-getopt_long_only: --fast -drinking=guiness -i foo.in somefile 
-option fast
-option drinking, arg guiness
-option i, arg foo.in
-remaining ARGV: somefile 
-
-getopt_long_only (POSIXLY_CORRECT): myfile -force -f infile -9 
-remaining ARGV: myfile -force -f infile -9 
-
-getopt_long_only (POSIXLY_CORRECT): onefile twofile -best -Williterate -i foo.in threefile 
-remaining ARGV: onefile twofile -best -Williterate -i foo.in threefile 
-
-getopt_long_only (POSIXLY_CORRECT): -1bfast - 
-option 1
-option b
-option fast
-option -
-
-getopt_long_only (POSIXLY_CORRECT): --fast -drinking=guiness -i foo.in somefile 
-option fast
-option drinking, arg guiness
-option i, arg foo.in
-remaining ARGV: somefile 
-
diff --git a/src/regress/lib/libc/glob/Makefile b/src/regress/lib/libc/glob/Makefile
deleted file mode 100644
index b3f9567833..0000000000
--- a/src/regress/lib/libc/glob/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2011/05/01 04:25:40 guenther Exp $
-
-PROG=   globtest
-
-run-regress-${PROG}:
-        mkdir -m 755 -p `sed 's@/[^/]*$$@@' ${.CURDIR}/files | sort -u`
-        umask 022; touch `cat ${.CURDIR}/files`
-        chmod 0755 `grep '/r[^/]*$$' ${.CURDIR}/files`
-        chmod 0444 `grep '/s[^/]*$$' ${.CURDIR}/files`
-        chmod 0711 `grep '/t[^/]*$$' ${.CURDIR}/files`
-        ./${PROG} ${.CURDIR}/${PROG}.in
-
-clean:
-        rm -rf fake ${PROG} ${OBJS} *.core
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/glob/files b/src/regress/lib/libc/glob/files
deleted file mode 100644
index c5e92aacd5..0000000000
--- a/src/regress/lib/libc/glob/files
+++ /dev/null
@@ -1,47 +0,0 @@
-fake/bin/[
-fake/bin/cat
-fake/bin/chgrp
-fake/bin/chio
-fake/bin/chmod
-fake/bin/cksum
-fake/bin/cp
-fake/bin/cpio
-fake/bin/csh
-fake/bin/date
-fake/bin/dd
-fake/bin/df
-fake/bin/domainname
-fake/bin/echo
-fake/bin/ed
-fake/bin/eject
-fake/bin/expr
-fake/bin/hostname
-fake/bin/kill
-fake/bin/ksh
-fake/bin/ln
-fake/bin/ls
-fake/bin/md5
-fake/bin/mkdir
-fake/bin/mt
-fake/bin/mv
-fake/bin/pax
-fake/bin/ps
-fake/bin/pwd
-fake/bin/rcp
-fake/bin/rksh
-fake/bin/rm
-fake/bin/rmail
-fake/bin/rmd160
-fake/bin/rmdir
-fake/bin/sh
-fake/bin/sha1
-fake/bin/sha256
-fake/bin/sha384
-fake/bin/sha512
-fake/bin/sleep
-fake/bin/stty
-fake/bin/sum
-fake/bin/sync
-fake/bin/systrace
-fake/bin/tar
-fake/bin/test
diff --git a/src/regress/lib/libc/glob/globtest.c b/src/regress/lib/libc/glob/globtest.c
deleted file mode 100644
index 325a7750f0..0000000000
--- a/src/regress/lib/libc/glob/globtest.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*      $OpenBSD: globtest.c,v 1.3 2011/01/07 19:45:44 millert Exp $    */
-
-/*
- * Public domain, 2008, Todd C. Miller <Todd.Miller@courtesan.com>
- */
-
-#include <err.h>
-#include <glob.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define MAX_RESULTS     256
-
-struct gl_entry {
-        int flags;
-        int nresults;
-        char pattern[1024];
-        char *results[MAX_RESULTS];
-        mode_t modes[MAX_RESULTS];
-};
-
-int test_glob(struct gl_entry *);
-
-int
-main(int argc, char **argv)
-{
-        FILE *fp = stdin;
-        char *buf, *cp;
-        int errors = 0, lineno, mode;
-        struct gl_entry entry;
-        size_t len;
-
-        if (argc > 1) {
-                if ((fp = fopen(argv[1], "r")) == NULL)
-                        err(1, "%s", argv[1]);
-        }
-
-        /*
-         * Read in test file, which is formatted thusly:
-         *
-         * [pattern] <flags>
-         * result1 [mode]
-         * result2 [mode]
-         * result3 [mode]
-         * ...
-         *
-         */
-        lineno = 0;
-        memset(&entry, 0, sizeof(entry));
-        while ((buf = fgetln(fp, &len)) != NULL) {
-                lineno++;
-                if (buf[len - 1] != '\n')
-                        errx(1, "missing newline at EOF");
-                buf[--len] = '\0';
-                if (len == 0)
-                        continue; /* blank line */
-
-                if (buf[0] == '[') {
-                        /* check previous pattern */
-                        if (entry.pattern[0])
-                                errors += test_glob(&entry);
-
-                        /* start new entry */
-                        if ((cp = strrchr(buf + 1, ']')) == NULL)
-                                errx(1, "invalid entry on line %d", lineno);
-                        len = cp - buf - 1;
-                        if (len >= sizeof(entry.pattern))
-                                errx(1, "pattern too big on line %d", lineno);
-                        memcpy(entry.pattern, buf + 1, len);
-                        entry.pattern[len] = '\0';
-
-                        buf = cp + 2;
-                        if (*buf++ != '<')
-                                errx(1, "invalid entry on line %d", lineno);
-                        if ((cp = strchr(buf, '>')) == NULL)
-                                errx(1, "invalid entry on line %d", lineno);
-                        entry.flags = (int)strtol(buf, &cp, 0);
-                        if (*cp != '>' || entry.flags < 0 || entry.flags > 0x4000)
-                                errx(1, "invalid flags: %s", buf);
-                        entry.nresults = 0;
-                        continue;
-                }
-                if (!entry.pattern[0])
-                        errx(1, "missing entry on line %d", lineno);
-
-                if (entry.nresults + 1 > MAX_RESULTS) {
-                        errx(1, "too many results for %s, max %d",
-                            entry.pattern, MAX_RESULTS);
-                }
-                if ((cp = strchr(buf, ' ')) != NULL) {
-                        *cp++ = '\0';
-                        mode = strtol(cp, NULL, 8);
-                } else
-                        mode = -1;
-                entry.modes[entry.nresults] = (mode_t)mode;
-                entry.results[entry.nresults++] = strdup(buf);
-        }
-        if (entry.pattern[0])
-                errors += test_glob(&entry); /* test last pattern */
-        exit(errors);
-}
-
-int test_glob(struct gl_entry *entry)
-{
-        glob_t gl;
-        int i = 0;
-
-        if (glob(entry->pattern, entry->flags, NULL, &gl) != 0)
-                errx(1, "glob failed: %s", entry->pattern);
-
-        if (gl.gl_matchc != entry->nresults)
-                goto mismatch;
-
-        for (i = 0; i < gl.gl_matchc; i++) {
-                if (strcmp(gl.gl_pathv[i], entry->results[i]) != 0)
-                        goto mismatch;
-                if ((entry->flags & GLOB_KEEPSTAT) != 0) {
-                        if (entry->modes[i] == -1 ||
-                            gl.gl_statv[i] == NULL ||
-                            entry->modes[i] != gl.gl_statv[i]->st_mode)
-                        goto badmode;
-                }
-                free(entry->results[i]);
-        }
-        return (0);
- badmode:
-        warnx("mismatch mode for pattern %s, flags 0x%x, file \"%s\" "
-            "(found %07o, expected %07o)", entry->pattern, entry->flags,
-            gl.gl_pathv[i], gl.gl_statv[i] ? gl.gl_statv[i]->st_mode : 0,
-            entry->modes[i]);
-        goto cleanup;
- mismatch:
-        warnx("mismatch for pattern %s, flags 0x%x "
-            "(found \"%s\", expected \"%s\")", entry->pattern, entry->flags,
-            gl.gl_pathv[i], entry->results[i]);
- cleanup:
-        while (i < gl.gl_matchc) {
-                free(entry->results[i++]);
-        }
-        return (1);
-}
diff --git a/src/regress/lib/libc/glob/globtest.in b/src/regress/lib/libc/glob/globtest.in
deleted file mode 100644
index 2ae3b4dfb2..0000000000
--- a/src/regress/lib/libc/glob/globtest.in
+++ /dev/null
@@ -1,116 +0,0 @@
-[fake/bin/[[:alpha:]]*] <0x0>
-fake/bin/cat
-fake/bin/chgrp
-fake/bin/chio
-fake/bin/chmod
-fake/bin/cksum
-fake/bin/cp
-fake/bin/cpio
-fake/bin/csh
-fake/bin/date
-fake/bin/dd
-fake/bin/df
-fake/bin/domainname
-fake/bin/echo
-fake/bin/ed
-fake/bin/eject
-fake/bin/expr
-fake/bin/hostname
-fake/bin/kill
-fake/bin/ksh
-fake/bin/ln
-fake/bin/ls
-fake/bin/md5
-fake/bin/mkdir
-fake/bin/mt
-fake/bin/mv
-fake/bin/pax
-fake/bin/ps
-fake/bin/pwd
-fake/bin/rcp
-fake/bin/rksh
-fake/bin/rm
-fake/bin/rmail
-fake/bin/rmd160
-fake/bin/rmdir
-fake/bin/sh
-fake/bin/sha1
-fake/bin/sha256
-fake/bin/sha384
-fake/bin/sha512
-fake/bin/sleep
-fake/bin/stty
-fake/bin/sum
-fake/bin/sync
-fake/bin/systrace
-fake/bin/tar
-fake/bin/test
-
-[fake/bin/[[:alpha:]]*] <0x4000>
-fake/bin/cat 0100644
-fake/bin/chgrp 0100644
-fake/bin/chio 0100644
-fake/bin/chmod 0100644
-fake/bin/cksum 0100644
-fake/bin/cp 0100644
-fake/bin/cpio 0100644
-fake/bin/csh 0100644
-fake/bin/date 0100644
-fake/bin/dd 0100644
-fake/bin/df 0100644
-fake/bin/domainname 0100644
-fake/bin/echo 0100644
-fake/bin/ed 0100644
-fake/bin/eject 0100644
-fake/bin/expr 0100644
-fake/bin/hostname 0100644
-fake/bin/kill 0100644
-fake/bin/ksh 0100644
-fake/bin/ln 0100644
-fake/bin/ls 0100644
-fake/bin/md5 0100644
-fake/bin/mkdir 0100644
-fake/bin/mt 0100644
-fake/bin/mv 0100644
-fake/bin/pax 0100644
-fake/bin/ps 0100644
-fake/bin/pwd 0100644
-fake/bin/rcp 0100755
-fake/bin/rksh 0100755
-fake/bin/rm 0100755
-fake/bin/rmail 0100755
-fake/bin/rmd160 0100755
-fake/bin/rmdir 0100755
-fake/bin/sh 0100444
-fake/bin/sha1 0100444
-fake/bin/sha256 0100444
-fake/bin/sha384 0100444
-fake/bin/sha512 0100444
-fake/bin/sleep 0100444
-fake/bin/stty 0100444
-fake/bin/sum 0100444
-fake/bin/sync 0100444
-fake/bin/systrace 0100444
-fake/bin/tar 0100711
-fake/bin/test 0100711
-
-[fake/bin/rm{,dir,ail}] <0x80>
-fake/bin/rm
-fake/bin/rmdir
-fake/bin/rmail
-
-[fake/bin/sha[[:digit:]]] <0x0>
-fake/bin/sha1
-
-[fake/bin/sha[[:digit:]]*] <0x0>
-fake/bin/sha1
-fake/bin/sha256
-fake/bin/sha384
-fake/bin/sha512
-
-[fake/bin/ca[a-z]] <0x0>
-fake/bin/cat
-
-[fake/b[a-z]*] <0x4000>
-fake/bin 0040755
-
diff --git a/src/regress/lib/libc/hsearch/Makefile b/src/regress/lib/libc/hsearch/Makefile
deleted file mode 100644
index cddc8ac0c4..0000000000
--- a/src/regress/lib/libc/hsearch/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2004/06/24 04:33:07 millert Exp $
-
-PROG=           hsearchtest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/hsearch/hsearchtest.c b/src/regress/lib/libc/hsearch/hsearchtest.c
deleted file mode 100644
index 8659ef7e77..0000000000
--- a/src/regress/lib/libc/hsearch/hsearchtest.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*      $OpenBSD: hsearchtest.c,v 1.2 2009/10/27 23:59:32 deraadt Exp $ */
-/*      $NetBSD: hsearchtest.c,v 1.5 2003/07/26 19:38:46 salo Exp $     */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *          This product includes software developed for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-/*
- * Test program for hsearch() et al.
- */
-
-#include <search.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#define TEST(e) ((e) ? (void)0 : testfail(__FILE__, __LINE__, #e))
-
-static void
-testfail(const char *file, unsigned long line, const char *expression)
-{
-
-        fprintf(stderr, "TEST FAILED: %s: file %s, line %ld\n",
-            expression, file, line);
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        ENTRY e, *ep, *ep2;
-        int created_ok;
-        char ch[2];
-        int i;
-
-        created_ok = hcreate(16);
-        TEST(created_ok);
-
-        /* ch[1] should be constant from here on down. */
-        ch[1] = '\0';
-        
-        /* Basic insertions.  Check enough that there'll be collisions. */
-        for (i = 0; i < 26; i++) {
-                ch[0] = 'a' + i;
-                e.key = strdup(ch);     /* ptr to provided key is kept! */
-                TEST(e.key != NULL);
-                e.data = (void *)(long)i;
-                ep = hsearch(e, ENTER);
-                TEST(ep != NULL);
-                TEST(strcmp(ep->key, ch) == 0);
-                TEST((long)ep->data == i);
-        }
-
-        /* e.key should be constant from here on down. */
-        e.key = ch;
-
-        /* Basic lookups. */
-        for (i = 0; i < 26; i++) {
-                ch[0] = 'a' + i;
-                ep = hsearch(e, FIND);
-                TEST(ep != NULL);
-                TEST(strcmp(ep->key, ch) == 0);
-                TEST((long)ep->data == i);
-        }
-
-        /* Check duplicate entry.  Should _not_ overwrite existing data.  */
-        ch[0] = 'a';
-        e.data = (void *)(long)12345;
-        ep = hsearch(e, FIND);
-        TEST(ep != NULL);
-        TEST(strcmp(ep->key, ch) == 0);
-        TEST((long)ep->data == 0);
-
-        /* Check for something that's not there. */
-        ch[0] = 'A';
-        ep = hsearch(e, FIND);
-        TEST(ep == NULL);
-
-        /* Check two at once. */
-        ch[0] = 'a';
-        ep = hsearch(e, FIND);
-        ch[0] = 'b';
-        ep2 = hsearch(e, FIND);
-        TEST(ep != NULL);
-        TEST(strcmp(ep->key, "a") == 0 && (long)ep->data == 0);
-        TEST(ep2 != NULL);
-        TEST(strcmp(ep2->key, "b") == 0 && (long)ep2->data == 1);
-
-        hdestroy();
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/ieeefp/Makefile b/src/regress/lib/libc/ieeefp/Makefile
deleted file mode 100644
index 89ff51a2e7..0000000000
--- a/src/regress/lib/libc/ieeefp/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.6 2004/01/15 18:53:23 miod Exp $
-#       $NetBSD: Makefile,v 1.5 1996/04/09 16:54:18 phil Exp $
-
-SUBDIR+= except inf infinity round
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/ieeefp/except/Makefile b/src/regress/lib/libc/ieeefp/except/Makefile
deleted file mode 100644
index 205331548f..0000000000
--- a/src/regress/lib/libc/ieeefp/except/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#       $OpenBSD: Makefile,v 1.5 2004/07/22 19:29:42 kettenis Exp $
-
-PROG=except
-
-REGRESS_TARGETS+= fltdiv fltinv fltovf fltund
-
-fltdiv: ${PROG}
-        ./${PROG} fltdiv
-
-fltinv: ${PROG}
-        ./${PROG} fltinv
-
-fltovf: ${PROG}
-        ./${PROG} fltovf
-
-fltund: ${PROG}
-        ./${PROG} fltund
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ieeefp/except/except.c b/src/regress/lib/libc/ieeefp/except/except.c
deleted file mode 100644
index cc3dcf8e44..0000000000
--- a/src/regress/lib/libc/ieeefp/except/except.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*      $OpenBSD: except.c,v 1.12 2010/05/08 19:16:33 naddy Exp $       */
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <assert.h>
-#include <ieeefp.h>
-#include <float.h>
-#include <err.h>
-
-volatile sig_atomic_t signal_status;
-
-volatile const double one  = 1.0;
-volatile const double zero = 0.0;
-volatile const double huge = DBL_MAX;
-volatile const double tiny = DBL_MIN;
-
-void
-sigfpe(int sig, siginfo_t *si, void *v)
-{
-        char buf[132];
-
-        if (si) {
-                snprintf(buf, sizeof(buf), "sigfpe: addr=%p, code=%d\n",
-                    si->si_addr, si->si_code);
-                write(1, buf, strlen(buf));
-        }
-        _exit(signal_status);
-}
-
-
-int
-main(int argc, char *argv[])
-{
-        struct sigaction sa;
-        volatile double x;
-
-        if (argc != 2) {
-                fprintf(stderr, "usage: %s condition\n", argv[0]);
-                exit(1);
-        }
-
-        /*
-         * check to make sure that all exceptions are masked and 
-         * that the accumulated exception status is clear.
-         */
-        assert(fpgetmask() == 0);
-        assert(fpgetsticky() == 0);
-
-        memset(&sa, 0, sizeof(sa));
-        sa.sa_sigaction = sigfpe;
-        sa.sa_flags = SA_SIGINFO;
-        sigaction(SIGFPE, &sa, NULL);
-        signal_status = 1;
-
-        if (strcmp(argv[1], "fltdiv") == 0) {
-                /* trip divide by zero */
-                x = one / zero;
-                assert(fpgetsticky() & FP_X_DZ);
-                fpsetsticky(0);
-
-                /* and now unmask to get a signal */
-                signal_status = 0;
-                fpsetmask(FP_X_DZ);
-                x = one / zero;
-        } else if (strcmp(argv[1], "fltinv") == 0) {
-                /* trip invalid operation */
-                x = zero / zero;
-                assert(fpgetsticky() & FP_X_INV);
-                fpsetsticky(0);
-
-                /* and now unmask to get a signal */
-                signal_status = 0;
-                fpsetmask(FP_X_INV);
-                x = zero / zero;
-        } else if (strcmp(argv[1], "fltovf") == 0) {
-                /* trip overflow */
-                x = huge * huge;
-                assert(fpgetsticky() & FP_X_OFL);
-                fpsetsticky(0);
-
-                /* and now unmask to get a signal */
-                signal_status = 0;
-                fpsetmask(FP_X_OFL);
-                x = huge * huge;
-        } else if (strcmp(argv[1], "fltund") == 0) {
-                /* trip underflow */
-                x = tiny * tiny;
-                assert(fpgetsticky() & FP_X_UFL);
-                fpsetsticky(0);
-
-                /* and now unmask to get a signal */
-                signal_status = 0;
-                fpsetmask(FP_X_UFL);
-                x = tiny * tiny;
-        } else {
-                errx(1, "unrecognized condition %s", argv[1]);
-        }
-
-        /*
-         * attempt to trigger the exception on machines where
-         * floating-point exceptions are deferred.
-         */
-        x = one * one;
-
-        errx(1, "signal wasn't caught");
-}
diff --git a/src/regress/lib/libc/ieeefp/inf/Makefile b/src/regress/lib/libc/ieeefp/inf/Makefile
deleted file mode 100644
index b9a50e0ce6..0000000000
--- a/src/regress/lib/libc/ieeefp/inf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2002/02/16 17:22:16 pvalchev Exp $
-
-PROG=   inf
-SRCS=   inf.c
-
-LDADD+= -lm
-DPADD+= ${LIBM}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ieeefp/inf/inf.c b/src/regress/lib/libc/ieeefp/inf/inf.c
deleted file mode 100644
index a1956145a6..0000000000
--- a/src/regress/lib/libc/ieeefp/inf/inf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*      $OpenBSD: inf.c,v 1.3 2003/07/31 21:48:03 deraadt Exp $ */
-
-/*
- * Peter Valchev <pvalchev@openbsd.org> Public Domain, 2002.
- */
-
-#include <math.h>
-
-int
-main(int argc, char *argv[])
-{
-        if (isinf(HUGE_VAL))
-                return 0;
-
-        return 1;
-}
diff --git a/src/regress/lib/libc/ieeefp/infinity/Makefile b/src/regress/lib/libc/ieeefp/infinity/Makefile
deleted file mode 100644
index ac102d8a63..0000000000
--- a/src/regress/lib/libc/ieeefp/infinity/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2004/01/16 19:34:37 miod Exp $
-
-PROG=   infinity
-
-DPADD+= ${LIBM}
-LDADD+= -lm
-
-REGRESS_TARGETS+= add mult neg pumpkin
-
-add: ${PROG}
-        ./${PROG} -a
-
-mult: ${PROG}
-        ./${PROG} -m
-
-neg: ${PROG}
-        ./${PROG} -n
-
-pumpkin: ${PROG}
-        ./${PROG} -p
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ieeefp/infinity/infinity.c b/src/regress/lib/libc/ieeefp/infinity/infinity.c
deleted file mode 100644
index 3b1b71ec90..0000000000
--- a/src/regress/lib/libc/ieeefp/infinity/infinity.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*      $OpenBSD: infinity.c,v 1.2 2004/01/16 19:34:37 miod Exp $       */
-/*
- * Written by Miodrag Vallat, 2004 - Public Domain
- * Inspired from Perl's t/op/arith test #134
- */
-
-#include <math.h>
-#include <signal.h>
-#include <unistd.h>
-
-void
-sigfpe(int signum)
-{
-        /* looks like we don't handle fp overflow correctly... */
-        _exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        int opt;
-        double d, two;
-        int i;
-        char method = 'a';
-
-        while ((opt = getopt(argc, argv, "amnp")) != -1)
-                method = (char)opt;
-
-        signal(SIGFPE, sigfpe);
-
-        switch (method) {
-        case 'a':
-                /* try to produce +Inf through addition */
-                d = 1.0;
-                for (i = 2000; i != 0; i--) {
-                        d = d + d;
-                }
-                /* result should be _positive_ infinity */
-                if (!isinf(d) || copysign(1.0, d) < 0.0)
-                        return (1);
-                break;
-        case 'm':
-                /* try to produce +Inf through multiplication */
-                d = 1.0;
-                two = 2.0;
-                for (i = 2000; i != 0; i--) {
-                        d = d * two;
-                }
-                /* result should be _positive_ infinity */
-                if (!isinf(d) || copysign(1.0, d) < 0.0)
-                        return (1);
-                break;
-        case 'n':
-                /* try to produce -Inf through subtraction */
-                d = -1.0;
-                for (i = 2000; i != 0; i--) {
-                        d = d + d;
-                }
-                /* result should be _negative_ infinity */
-                if (!isinf(d) || copysign(1.0, d) > 0.0)
-                        return (1);
-                break;
-        case 'p':
-                /* try to produce -Inf through multiplication */
-                d = -1.0;
-                two = 2.0;
-                for (i = 2000; i != 0; i--) {
-                        d = d * two;
-                }
-                /* result should be _negative_ infinity */
-                if (!isinf(d) || copysign(1.0, d) > 0.0)
-                        return (1);
-                break;
-        }
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/ieeefp/round/Makefile b/src/regress/lib/libc/ieeefp/round/Makefile
deleted file mode 100644
index 9ea6dd8c39..0000000000
--- a/src/regress/lib/libc/ieeefp/round/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2002/02/18 11:25:34 art Exp $
-
-PROG=   round
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ieeefp/round/round.c b/src/regress/lib/libc/ieeefp/round/round.c
deleted file mode 100644
index 807941ea56..0000000000
--- a/src/regress/lib/libc/ieeefp/round/round.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*      $OpenBSD: round.c,v 1.3 2003/07/31 21:48:03 deraadt Exp $       */
-/*      $NetBSD: round.c,v 1.1 1995/04/26 00:27:28 jtc Exp $    */
-
-/*
- * Written by J.T. Conklin, Apr 18, 1995
- * Public domain.
- */
-
-#include <assert.h>
-#include <stdlib.h>
-#include <ieeefp.h>
-#include <float.h>
-
-int
-main(int argc, char *argv[])
-{
-        /*
-         * This test would be better if it actually performed some
-         * calculations to verify the selected rounding mode.  But
-         * this is probably acceptable since the fp{get,set}round
-         * functions usually just get or set the processors fpu
-         * control word.
-         */
-
-        assert(fpgetround() == FP_RN);
-        assert(FLT_ROUNDS == 1);
-
-        assert(fpsetround(FP_RP) == FP_RN);
-        assert(fpgetround() == FP_RP);
-        assert(FLT_ROUNDS == 2);
-
-        assert(fpsetround(FP_RM) == FP_RP);
-        assert(fpgetround() == FP_RM);
-        assert(FLT_ROUNDS == 3);
-
-        assert(fpsetround(FP_RZ) == FP_RM);
-        assert(fpgetround() == FP_RZ);
-        assert(FLT_ROUNDS == 0);
-
-        assert(fpsetround(FP_RN) == FP_RZ);
-        assert(fpgetround() == FP_RN);
-        assert(FLT_ROUNDS == 1);
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/ifnameindex/Makefile b/src/regress/lib/libc/ifnameindex/Makefile
deleted file mode 100644
index 1f21973a10..0000000000
--- a/src/regress/lib/libc/ifnameindex/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2015/10/22 15:47:00 claudio Exp $
-
-PROG=           ifnitest
-SRCS=           ifnitest.c
-NOMAN=          # defined
-
-REGRESS_TARGETS=do-test
-
-do-test: ${PROG}
-        ./${PROG}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ifnameindex/ifnitest.c b/src/regress/lib/libc/ifnameindex/ifnitest.c
deleted file mode 100644
index fb7ed3704f..0000000000
--- a/src/regress/lib/libc/ifnameindex/ifnitest.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*      $OpenBSD: ifnitest.c,v 1.3 2017/02/25 07:28:32 jsg Exp $ */
-
-/* Public domain. 2015, Claudio Jeker */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-int
-main(int argc, char *argv[])
-{
-        char name[IF_NAMESIZE], *ifname;
-        unsigned int lo0index;
-
-        lo0index = if_nametoindex("lo0");
-        if (lo0index == 0)
-                err(1, "if_nametoindex(lo0)");
-        ifname = if_indextoname(lo0index, name);
-        if (ifname == NULL || strcmp("lo0", ifname) != 0)
-                err(1, "if_indextoname(%u)", lo0index);
-
-        /* test failures */
-        if (if_nametoindex("4kingbula") != 0)
-                err(1, "if_nametoindex(4kingbula)");
-        if (if_indextoname(65536, name) != NULL)
-                err(1, "if_indextoname(%u)", 65536);
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/ldexp/Makefile b/src/regress/lib/libc/ldexp/Makefile
deleted file mode 100644
index bfe79ac679..0000000000
--- a/src/regress/lib/libc/ldexp/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2017/10/15 12:15:30 visa Exp $
-
-PROG=ldexp_test
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/ldexp/ldexp_test.c b/src/regress/lib/libc/ldexp/ldexp_test.c
deleted file mode 100644
index 75031e3083..0000000000
--- a/src/regress/lib/libc/ldexp/ldexp_test.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*      $OpenBSD: ldexp_test.c,v 1.1 2017/10/15 12:15:30 visa Exp $     */
-
-/*
- * Copyright (c) 2017 Visa Hankala
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <assert.h>
-#include <math.h>
-
-int
-main(int argc, char *argv[])
-{
-        double f;
-
-        /*
-         * Test that the result has the correct sign.
-         * Assumes IEEE 754 double-precision arithmetics.
-         */
-
-        assert(ldexp(1.0, -1022) > 0.0); /* IEEE 754 minimum normal positive */
-        assert(ldexp(1.0, -1023) > 0.0); /* subnormal positive */
-        assert(ldexp(1.0, -1024) > 0.0); /* subnormal positive */
-        assert(ldexp(1.0, -1074) > 0.0); /* minimum subnormal positive */
-        assert(ldexp(1.0, -1075) >= 0.0); /* zero */
-        assert(ldexp(ldexp(1.0, -1022), -53) >= 0.0); /* zero */
-
-        assert(ldexp(1.0, 1023) > 0.0); /* normal positive */
-
-        f = ldexp(1.0, 1024);           /* infinite positive */
-        assert(isinf(f));
-        assert(!signbit(f));
-
-        f = ldexp(ldexp(1.0, 1023), 1); /* infinite positive */
-        assert(isinf(f));
-        assert(!signbit(f));
-
-        assert(ldexp(-1.0, -1022) < 0.0); /* IEEE 754 maximum normal negative */
-        assert(ldexp(-1.0, -1023) < 0.0); /* subnormal negative */
-        assert(ldexp(-1.0, -1024) < 0.0); /* subnormal negative */
-        assert(ldexp(-1.0, -1074) < 0.0); /* maximum subnormal negative */
-        assert(ldexp(-1.0, -1075) <= 0.0); /* zero */
-        assert(ldexp(ldexp(-1.0, -1022), -53) <= 0.0); /* zero */
-
-        assert(ldexp(-1.0, 1023) < 0.0); /* normal negative */
-
-        f = ldexp(-1.0, 1024);          /* infinite negative */
-        assert(isinf(f));
-        assert(signbit(f));
-
-        f = ldexp(ldexp(-1.0, 1023), 1); /* infinite negative */
-        assert(isinf(f));
-        assert(signbit(f));
-
-        f = ldexp(NAN, 0);
-        assert(isnan(f));
-        assert(!signbit(f));
-
-        f = ldexp(-NAN, 0);
-        assert(isnan(f));
-        assert(signbit(f));
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/locale/Makefile b/src/regress/lib/libc/locale/Makefile
deleted file mode 100644
index b3ca6bad85..0000000000
--- a/src/regress/lib/libc/locale/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/27 15:08:37 bluhm Exp $
-
-SUBDIR =        check_isw mbrtowc setlocale wcrtomb
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/locale/check_isw/Makefile b/src/regress/lib/libc/locale/check_isw/Makefile
deleted file mode 100644
index cd79d6cb7f..0000000000
--- a/src/regress/lib/libc/locale/check_isw/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2017/07/27 15:08:37 bluhm Exp $
-
-PROG =  check_isw
-
-run-regress-${PROG}: ${PROG}
-        ./${PROG} >/dev/null
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/locale/check_isw/check_isw.c b/src/regress/lib/libc/locale/check_isw/check_isw.c
deleted file mode 100644
index 718f387883..0000000000
--- a/src/regress/lib/libc/locale/check_isw/check_isw.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* $OpenBSD: check_isw.c,v 1.2 2017/07/27 15:08:37 bluhm Exp $ */
-/*
- * Copyright (c) 2005 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* This checks consistency of the isw* functions with the default <ctype>
- * functions.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <wchar.h>
-#include <wctype.h>
-
-int bad = 0;
-
-void
-check_bool(int v1, int v2, char msg)
-{
-        if (!v1 != !v2) {
-                printf("%c", msg);
-                bad++;
-        }
-}
-
-void 
-check_value(int v1, int v2, char msg)
-{
-        if (v1 != v2) {
-                printf("%c", msg);
-                bad++;
-        }
-}
-
-void
-test1()
-{
-        int i;
-
-        for (i = 0; i < 256; i++) {
-                printf(" %02x: ", i);
-                check_bool(isalnum(i), iswalnum(i), '1');
-                check_bool(isalpha(i), iswalpha(i), '2');
-                check_bool(isblank(i), iswblank(i), '3');
-                check_bool(iscntrl(i), iswcntrl(i), '4');
-                check_bool(isdigit(i), iswdigit(i), '5');
-                check_bool(isgraph(i), iswgraph(i), '6');
-                check_bool(islower(i), iswlower(i), '6');
-                check_bool(isprint(i), iswprint(i), '7');
-                check_bool(ispunct(i), iswpunct(i), '8');
-                check_bool(isspace(i), iswspace(i), '9');
-                check_bool(isupper(i), iswupper(i), 'a');
-                check_bool(isxdigit(i), iswxdigit(i), 'b');
-                check_value(tolower(i), towlower(i), 'c');
-                check_value(toupper(i), towupper(i), 'd');
-                if (i % 8 == 7)
-                        printf("\n");
-        }
-        printf("\n");
-}
-
-void
-test2()
-{
-        unsigned char *s;
-        unsigned char *buf;
-        int i, j;
-        size_t n;
-        wchar_t c, d;
-        mbstate_t state;
-
-        s = malloc(256);
-        if (!s) {
-                bad++;
-                return;
-        }
-        buf = malloc(MB_CUR_MAX);
-        if (!buf) {
-                bad++;
-                free(s);
-                return;
-        }
-        for (i = 0; i < 256; i++)
-                s[i] = i+1;
-
-        j = 0;
-        mbrtowc(NULL, NULL, 1, &state);
-        printf(" %02x: ", 0);
-
-        while ((n = mbrtowc(&c, s+j, 256-j, &state)) == 1) {
-                printf(" %02x: ", s[j]);
-                check_bool(isalnum(s[j]), iswalnum(c), '1');
-                check_bool(isalpha(s[j]), iswalpha(c), '2');
-                check_bool(isblank(s[j]), iswblank(c), '3');
-                check_bool(iscntrl(s[j]), iswcntrl(c), '4');
-                check_bool(isdigit(s[j]), iswdigit(c), '5');
-                check_bool(isgraph(s[j]), iswgraph(c), '6');
-                check_bool(islower(s[j]), iswlower(c), '6');
-                check_bool(isprint(s[j]), iswprint(c), '7');
-                check_bool(ispunct(s[j]), iswpunct(c), '8');
-                check_bool(isspace(s[j]), iswspace(c), '9');
-                check_bool(isupper(s[j]), iswupper(c), 'a');
-                check_bool(isxdigit(s[j]), iswxdigit(c), 'b');
-                d = towlower(c);
-                if (wctomb(buf, d) == 1) {      
-                        check_value(tolower(s[j]), buf[0], 'c');
-                } else {
-                        bad++;
-                }
-                d = towupper(c);
-                if (wctomb(buf, d) == 1) {      
-                        check_value(toupper(s[j]), buf[0], 'c');
-                } else {
-                        bad++;
-                }
-                if (s[j] % 8 == 7)
-                        printf("\n");
-                j++;
-        }
-        if (n != 0 || j != 255) {
-                bad++;
-        }
-        free(s);
-        free(buf);
-}
-
-
-int
-main()
-{
-        test1();
-        test2();
-        return bad !=0;
-}
diff --git a/src/regress/lib/libc/locale/mbrtowc/Makefile b/src/regress/lib/libc/locale/mbrtowc/Makefile
deleted file mode 100644
index 5436383911..0000000000
--- a/src/regress/lib/libc/locale/mbrtowc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/27 15:08:37 bluhm Exp $
-
-PROG =  test_mbrtowc
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/locale/mbrtowc/test_mbrtowc.c b/src/regress/lib/libc/locale/mbrtowc/test_mbrtowc.c
deleted file mode 100644
index 5926d25fd0..0000000000
--- a/src/regress/lib/libc/locale/mbrtowc/test_mbrtowc.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*      $OpenBSD: test_mbrtowc.c,v 1.2 2017/07/27 15:08:37 bluhm Exp $  */
-/*
- * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <err.h>
-#include <errno.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-static mbstate_t         mbs;
-
-void
-onetest(const char *name, const char *in, size_t insz,
-    int outerr, size_t outsz, wint_t out)
-{
-        wchar_t          wc;
-        size_t           sz;
-
-        sz = mbrtowc(&wc, in, insz, &mbs);
-        if (errno != outerr)
-                err(1, "%zu %s(%zd)", MB_CUR_MAX, name, insz);
-        if (sz != outsz || (out != WEOF && wc != out))
-                errx(1, "%zu %s(%zd) = (%zd, %d) != (%zd, %d)",
-                    MB_CUR_MAX, name, insz, sz, wc, outsz, out);
-        if (mbsinit(&mbs) == (insz && outsz == (size_t)-2))
-                errx(1, "%zu %s(%zd) mbsinit", MB_CUR_MAX, name, insz);
-        if (errno == 0 && outerr == 0)
-                return;
-        errno = 0;
-        memset(&mbs, 0, sizeof(mbs));
-}
-
-int
-main(void)
-{
-        onetest("NUL", "", 0, 0, -2, WEOF);
-        onetest("NUL", "", 2, 0, 0, L'\0');
-        onetest("BEL", "\a", 2, 0, 1, L'\a');
-        onetest("A", "A", 2, 0, 1, L'A');
-        onetest("DEL", "\177", 2, 0, 1, L'\177');
-        onetest("CSI", "\233", 2, 0, 1, L'\233');
-
-        if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL)
-                errx(1, "setlocale(UTF-8) failed"),
-
-        onetest("NUL", "", 0, 0, -2, WEOF);
-        onetest("NUL", "", 8, 0, 0, L'\0');
-        onetest("BEL", "\a", 8, 0, 1, L'\a');
-        onetest("A", "A", 8, 0, 1, L'A');
-        onetest("DEL", "\177", 8, 0, 1, L'\177');
-        onetest("0x80", "\200", 8, EILSEQ, -1, WEOF);
-        onetest("0xc3", "\303", 1, 0, -2, WEOF);
-        onetest("U+00E9", "\251", 8, 0, 1, 0xe9);
-        onetest("0xec", "\354", 1, 0, -2, WEOF);
-        onetest("0xecbf", "\277", 1, 0, -2, WEOF);
-        onetest("U+CFFF", "\277", 8, 0, 1, 0xcfff);
-
-        if (setlocale(LC_CTYPE, "POSIX") == NULL)
-                errx(1, "setlocale(POSIX) failed"),
-
-        onetest("0xff", "\277", 2, 0, 1, L'\277');
-
-        if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL)
-                errx(1, "second setlocale(UTF-8) failed"),
-
-        onetest("U+13000", "\360\223\200\200", 8, 0, 4, 0x13000);
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/locale/setlocale/Makefile b/src/regress/lib/libc/locale/setlocale/Makefile
deleted file mode 100644
index 966f7926e5..0000000000
--- a/src/regress/lib/libc/locale/setlocale/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2017/07/27 15:08:37 bluhm Exp $
-
-PROG =  setlocale
-
-run-regress-${PROG}: ${PROG}
-        env -i LC_ALL=fr_FR.UTF-8 ./${PROG}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/locale/setlocale/setlocale.c b/src/regress/lib/libc/locale/setlocale/setlocale.c
deleted file mode 100644
index 82245df5c5..0000000000
--- a/src/regress/lib/libc/locale/setlocale/setlocale.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* $OpenBSD: setlocale.c,v 1.4 2018/03/29 16:34:25 schwarze Exp $ */
-/*
- * Copyright (c) 2015 Sebastien Marie <semarie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-/*
- * test helpers for __LINE__
- */
-#define test_setlocale(_e, _c, _l) _test_setlocale(_e, _c, _l, __LINE__)
-#define test_MB_CUR_MAX(_e) _test_MB_CUR_MAX(_e, __LINE__)
-#define test_isalpha(_e, _c) _test_isalpha(_e, _c, __LINE__)
-
-
-static void
-_test_setlocale(char *expected, int category, char *locale, int line)
-{
-        char *result = setlocale(category, locale);
-
-        if ((expected == NULL) || (result == NULL)) {
-                if (expected == result)
-                        return;
-
-                errx(1, "[%d] setlocale(%d, \"%s\")=\"%s\" [expected: \"%s\"]",
-                       line, category, locale, result, expected);
-        }
-
-        if (strcmp(expected, result) != 0)
-                errx(1, "[%d] setlocale(%d, \"%s\")=\"%s\" [expected: \"%s\"]",
-                       line, category, locale, result, expected);
-}
-
-static void
-_test_MB_CUR_MAX(size_t expected, int line)
-{
-        if (MB_CUR_MAX != expected)
-                errx(1, "[%d] MB_CUR_MAX=%ld [expected %ld]", 
-                        line, MB_CUR_MAX, expected);
-}
-
-static void
-_test_isalpha(int expected, int c, int line)
-{
-        int result = isalpha(c);
-        if (!!result != expected)
-                errx(1, "[%d] isalpha(%d)=%d [expected %d]",
-                        line, c, result, expected);
-}
-
-int
-main(int argc, char *argv[])
-{
-        /* check initial state (should be "C") */
-        test_setlocale("C", LC_ALL, NULL); /* check */
-        test_MB_CUR_MAX(1);
-        test_isalpha(0, 0xe9); /* iso-8859-1 eacute */
-
-        /* load from env */
-        /* NOTE: we don't support non-C locales for some categories */
-        test_setlocale("fr_FR.UTF-8", LC_CTYPE, ""); /* set */
-        test_setlocale("fr_FR.UTF-8", LC_MESSAGES, ""); /* set */
-        test_MB_CUR_MAX(4);
-        test_isalpha(0, 0xe9); /* iso-8859-1 eacute */
-
-        test_setlocale("C", LC_MESSAGES, "C"); /* set */
-        test_MB_CUR_MAX(4);
-        test_setlocale("C/fr_FR.UTF-8/C/C/C/C", LC_ALL, NULL); /* check */
-
-        test_setlocale("C", LC_CTYPE, "C"); /* set */
-        test_MB_CUR_MAX(1);
-        test_setlocale("C", LC_ALL, NULL); /* check */
-
-        /* check for errors on checking */
-        test_setlocale("C", LC_ALL, "C"); /* reset */
-        test_setlocale(NULL, -1, NULL);
-        test_setlocale(NULL, _LC_LAST, NULL);
-        test_setlocale(NULL, _LC_LAST+0xff, NULL);
-        test_setlocale("C", LC_ALL, NULL); /* check */
-
-        /* check for errors on setting */
-        test_setlocale(NULL, -1, "");
-        test_setlocale(NULL, _LC_LAST, "");
-        test_setlocale(NULL, _LC_LAST+0xff, "");
-        test_setlocale("C", LC_ALL, NULL); /* check */
-
-        /* no codeset, fallback to ASCII */
-        test_setlocale("C", LC_ALL, "C"); /* reset */
-        test_setlocale("invalid", LC_CTYPE, "invalid"); /* set */
-        test_setlocale("invalid", LC_CTYPE, NULL);
-        test_MB_CUR_MAX(1);
-        test_isalpha(0, 0xe9); /* iso-8859-1 eacute */
-
-        /* with codeset */
-        test_setlocale("C", LC_ALL, "C"); /* reset */
-        test_setlocale("invalid.UTF-8", LC_CTYPE, "invalid.UTF-8"); /* set */
-        test_setlocale("invalid.UTF-8", LC_CTYPE, NULL);
-        test_setlocale("C/invalid.UTF-8/C/C/C/C", LC_ALL, NULL);
-        test_MB_CUR_MAX(4);
-
-        /* with invalid codeset (is an error) */
-        test_setlocale("C", LC_ALL, "C"); /* reset */
-        test_setlocale(NULL, LC_CTYPE, "fr_FR.invalid"); /* set */
-        test_setlocale("C", LC_CTYPE, NULL);
-        test_MB_CUR_MAX(1);
-
-        return (EXIT_SUCCESS);
-}
diff --git a/src/regress/lib/libc/locale/uselocale/Makefile b/src/regress/lib/libc/locale/uselocale/Makefile
deleted file mode 100644
index a10471bcf6..0000000000
--- a/src/regress/lib/libc/locale/uselocale/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2017/08/16 01:40:30 schwarze Exp $
-
-PROG =          uselocale
-CFLAGS +=       -Wno-macro-redefined -Wno-int-to-pointer-cast
-LDFLAGS +=      -pthread
-
-run-regress-${PROG}: ${PROG}
-        ./${PROG}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/locale/uselocale/uselocale.c b/src/regress/lib/libc/locale/uselocale/uselocale.c
deleted file mode 100644
index 445bb64876..0000000000
--- a/src/regress/lib/libc/locale/uselocale/uselocale.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/* $OpenBSD: uselocale.c,v 1.5 2017/08/16 13:52:50 schwarze Exp $ */
-/*
- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <locale.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/* Keep in sync with /usr/src/lib/libc/locale/rune.h. */
-#define _LOCALE_NONE     (locale_t)0
-#define _LOCALE_C        (locale_t)1
-#define _LOCALE_UTF8     (locale_t)2
-#define _LOCALE_BAD      (locale_t)3
-
-/* Options for switch_thread() below. */
-#define SWITCH_SIGNAL    1      /* Call pthread_cond_signal(3). */
-#define SWITCH_WAIT      2      /* Call pthread_cond_timedwait(3). */
-
-/* Options for TESTFUNC(). */
-#define TOPT_ERR         (1 << 0)
-#define TOPT_STR         (1 << 1)
-
-/*
- * Generate one test function for a specific interface.
- * Fn =         function name
- * Ft =         function return type
- * FUNCPARA =   function parameter list with types and names
- * FUNCARGS =   function argument list, names only, no types
- * Af =         format string to print the arguments
- * Rf =         format string to print the return value
- * Op =         options for the test function, see above
- * line =       source code line number in this test file
- * ee =         expected error number
- * er =         expected return value
- * ar =         actual return value
- * errno =      actual error number (global)
- */
-#define TESTFUNC(Fn, Ft, Af, Rf, Op)                                    \
-static void                                                             \
-_test_##Fn(int line, int ee, Ft er, FUNCPARA)                           \
-{                                                                       \
-        Ft ar;                                                          \
-        errno = 0;                                                      \
-        ar = Fn(FUNCARGS);                                              \
-        if (Op & TOPT_STR) {                                            \
-                if (er == (Ft)NULL)                                     \
-                        er = (Ft)"NULL";                                \
-                if (ar == (Ft)NULL)                                     \
-                        ar = (Ft)"NULL";                                \
-        }                                                               \
-        if (Op & TOPT_STR ? strcmp((const char *)er, (const char *)ar)  \
-            : ar != er)                                                 \
-                errx(1, "[%d] %s(" Af ")=" Rf " [exp: " Rf "]",         \
-                    line, #Fn, FUNCARGS, ar, er);                       \
-        if (Op & TOPT_ERR && errno != ee)                               \
-                errx(1, "[%d] %s(" Af ") errno=%d [exp: %d]",           \
-                    line, #Fn, FUNCARGS, errno, ee);                    \
-}
-
-/*
- * Test functions for all tested interfaces.
- */
-#define FUNCPARA        int mask, const char *locname
-#define FUNCARGS        mask, locname, _LOCALE_NONE
-TESTFUNC(newlocale, locale_t, "%d, %s, %p", "%p", TOPT_ERR)
-
-#define FUNCPARA        locale_t locale
-#define FUNCARGS        locale
-TESTFUNC(duplocale, locale_t, "%p", "%p", TOPT_ERR)
-TESTFUNC(uselocale, locale_t, "%p", "%p", TOPT_ERR)
-
-#define FUNCPARA        int category, char *locname
-#define FUNCARGS        category, locname
-TESTFUNC(setlocale, const char *, "%d, %s", "%s", TOPT_STR)
-
-#define FUNCPARA        nl_item item
-#define FUNCARGS        item
-TESTFUNC(nl_langinfo, const char *, "%ld", "%s", TOPT_STR)
-
-#define FUNCPARA        nl_item item, locale_t locale
-#define FUNCARGS        item, locale
-TESTFUNC(nl_langinfo_l, const char *, "%ld, %p", "%s", TOPT_STR)
-
-#define FUNCPARA        int c
-#define FUNCARGS        c
-TESTFUNC(isalpha, int, "0x%.2x", "%d", 0)
-TESTFUNC(tolower, int, "0x%.2x", "0x%.2x", 0)
-
-#define FUNCPARA        int c, locale_t locale
-#define FUNCARGS        c, locale
-TESTFUNC(isalpha_l, int, "0x%.2x, %p", "%d", 0)
-TESTFUNC(tolower_l, int, "0x%.2x, %p", "0x%.2x", 0)
-
-#define FUNCPARA        wint_t wc
-#define FUNCARGS        wc
-TESTFUNC(iswalpha, int, "U+%.4X", "%d", 0)
-TESTFUNC(towupper, wint_t, "U+%.4X", "U+%.4X", 0)
-
-#define FUNCPARA        wint_t wc, locale_t locale
-#define FUNCARGS        wc, locale
-TESTFUNC(iswalpha_l, int, "U+%.4X, %p", "%d", 0)
-TESTFUNC(towupper_l, wint_t, "U+%.4X, %p", "U+%.4X", 0)
-
-#define FUNCPARA        wint_t wc, wctype_t charclass
-#define FUNCARGS        wc, charclass
-TESTFUNC(iswctype, int, "U+%.4X, %p", "%d", 0)
-
-#define FUNCPARA        wint_t wc, wctype_t charclass, locale_t locale
-#define FUNCARGS        wc, charclass, locale
-TESTFUNC(iswctype_l, int, "U+%.4X, %p, %p", "%d", 0)
-
-#define FUNCPARA        wint_t wc, wctrans_t charmap
-#define FUNCARGS        wc, charmap
-TESTFUNC(towctrans, wint_t, "U+%.4X, %p", "U+%.4X", 0)
-
-#define FUNCPARA        wint_t wc, wctrans_t charmap, locale_t locale
-#define FUNCARGS        wc, charmap, locale
-TESTFUNC(towctrans_l, wint_t, "U+%.4X, %p, %p", "U+%.4X", 0)
-
-#define FUNCPARA        const wchar_t *s1, const wchar_t *s2
-#define FUNCARGS        s1, s2
-TESTFUNC(wcscasecmp, int, "%ls, %ls", "%d", 0)
-
-#define FUNCPARA        const wchar_t *s1, const wchar_t *s2, locale_t locale
-#define FUNCARGS        s1, s2, locale
-TESTFUNC(wcscasecmp_l, int, "%ls, %ls, %p", "%d", 0)
-
-#define FUNCPARA        const wchar_t *s1, const wchar_t *s2, size_t len
-#define FUNCARGS        s1, s2, len
-TESTFUNC(wcsncasecmp, int, "%ls, %ls, %zu", "%d", 0)
-
-#define FUNCPARA        const wchar_t *s1, const wchar_t *s2, size_t len, \
-                        locale_t locale
-#define FUNCARGS        s1, s2, len, locale
-TESTFUNC(wcsncasecmp_l, int, "%ls, %ls, %zu, %p", "%d", 0)
-
-static void
-_test_MB_CUR_MAX(int line, int ee, size_t ar)
-{
-        if (MB_CUR_MAX != ar)
-                errx(1, "[%d] MB_CUR_MAX=%zd [exp: %zd]",
-                    line, MB_CUR_MAX, ar);
-}
-
-/*
- * Test macros:
- * TEST_R(funcname, er, arguments) if you expect errno == 0.
- * TEST_ER(funcname, ee, er, arguments) otherwise.
- */
-#define TEST_R(Fn, ...)         _test_##Fn(__LINE__, 0, __VA_ARGS__)
-#define TEST_ER(Fn, ...)        _test_##Fn(__LINE__, __VA_ARGS__)
-
-/*
- * SWITCH_SIGNAL wakes the other thread.
- * SWITCH_WAIT goes to sleep.
- * Both can be combined.
- * The step argument is used for error reporting only.
- */
-static void
-switch_thread(int step, int flags)
-{
-        static pthread_mutexattr_t       ma;
-        static struct timespec           t;
-        static pthread_cond_t           *c;
-        static pthread_mutex_t          *m;
-        int                              irc;
-
-        if (m == NULL) {
-                if ((m = malloc(sizeof(*m))) == NULL)
-                        err(1, NULL);
-                if ((irc = pthread_mutexattr_init(&ma)) != 0)
-                        errc(1, irc, "pthread_mutexattr_init");
-                if ((irc = pthread_mutexattr_settype(&ma,
-                    PTHREAD_MUTEX_STRICT_NP)) != 0)
-                        errc(1, irc, "pthread_mutexattr_settype");
-                if ((irc = pthread_mutex_init(m, &ma)) != 0)
-                        errc(1, irc, "pthread_mutex_init");
-        }
-        if (c == NULL) {
-                if ((c = malloc(sizeof(*c))) == NULL)
-                        err(1, NULL);
-                if ((irc = pthread_cond_init(c, NULL)) != 0)
-                        errc(1, irc, "pthread_cond_init");
-        }
-        if (flags & SWITCH_SIGNAL) {
-                if ((irc = pthread_cond_signal(c)) != 0)
-                        errc(1, irc, "pthread_cond_signal(%d)", step);
-        }
-        if (flags & SWITCH_WAIT) {
-                if ((irc = pthread_mutex_trylock(m)) != 0)
-                        errc(1, irc, "pthread_mutex_trylock(%d)", step);
-                t.tv_sec = time(NULL) + 2;
-                if ((irc = pthread_cond_timedwait(c, m, &t)) != 0)
-                        errc(1, irc, "pthread_cond_timedwait(%d)", step);
-                if ((irc = pthread_mutex_unlock(m)) != 0)
-                        errc(1, irc, "pthread_mutex_unlock(%d)", step);
-        }
-}
-
-static void *
-child_func(void *arg)
-{
-        const wchar_t    s1[] = { 0x00C7, 0x00E0, 0x0000 }; 
-        const wchar_t    s2[] = { 0x00E7, 0x00C0, 0x0000 };
-        const wchar_t    s3[] = { 0x00C9, 0x0074, 0x00C9, 0x0000 }; 
-        const wchar_t    s4[] = { 0x00E9, 0x0054, 0x00CC, 0x0000 }; 
-        wctype_t         wctyg, wctyu, wctyc;
-        wctrans_t        wctrg, wctru, wctrc;
-        char            *sego, *segc, *selo, *selc;
-
-        /* Test invalid newlocale(3) arguments. */
-        TEST_ER(newlocale, EINVAL, _LOCALE_NONE, LC_CTYPE_MASK, NULL);
-        TEST_R(MB_CUR_MAX, 1);
-        TEST_ER(newlocale, EINVAL, _LOCALE_NONE, LC_ALL_MASK + 1, "C.UTF-8");
-        TEST_R(MB_CUR_MAX, 1);
-        TEST_ER(newlocale, ENOENT, _LOCALE_NONE, LC_COLLATE_MASK, "C.INV");
-        TEST_R(MB_CUR_MAX, 1);
-        setenv("LC_TIME", "C.INV", 1);
-        TEST_ER(newlocale, ENOENT, _LOCALE_NONE, LC_TIME_MASK, "");
-        unsetenv("LC_TIME");
-        TEST_R(MB_CUR_MAX, 1);
-        setenv("LC_CTYPE", "C.INV", 1);
-        TEST_ER(newlocale, ENOENT, _LOCALE_NONE, LC_CTYPE_MASK, "");
-        TEST_R(MB_CUR_MAX, 1);
-
-        /* Test duplocale(3). */
-        TEST_ER(duplocale, EINVAL, _LOCALE_NONE, _LOCALE_UTF8);
-        TEST_R(duplocale, _LOCALE_C, _LOCALE_C);
-        TEST_R(duplocale, _LOCALE_C, LC_GLOBAL_LOCALE);
-
-        /* Test premature UTF-8 uselocale(3). */
-        TEST_ER(uselocale, EINVAL, _LOCALE_NONE, _LOCALE_UTF8);
-        TEST_R(MB_CUR_MAX, 1);
-        TEST_R(uselocale, LC_GLOBAL_LOCALE, _LOCALE_NONE);
-
-        /* Test UTF-8 initialization. */
-        setenv("LC_CTYPE", "C.UTF-8", 1);
-        TEST_R(newlocale, _LOCALE_UTF8, LC_CTYPE_MASK, "");
-        unsetenv("LC_CTYPE");
-        TEST_R(MB_CUR_MAX, 1);
-        TEST_R(duplocale, _LOCALE_UTF8, _LOCALE_UTF8);
-
-        /* Test invalid uselocale(3) argument. */
-        TEST_ER(uselocale, EINVAL, _LOCALE_NONE, _LOCALE_BAD);
-        TEST_R(MB_CUR_MAX, 1);
-        TEST_R(uselocale, LC_GLOBAL_LOCALE, _LOCALE_NONE);
-        TEST_R(nl_langinfo, "US-ASCII", CODESET);
-        TEST_R(nl_langinfo_l, "UTF-8", CODESET, _LOCALE_UTF8);
-        TEST_R(iswalpha, 0, 0x00E9);
-        TEST_R(iswalpha_l, 1, 0x00E9, _LOCALE_UTF8);
-        TEST_R(towupper, 0x00E9, 0x00E9);
-        TEST_R(towupper_l, 0x00C9, 0x00E9, _LOCALE_UTF8);
-        TEST_R(wcscasecmp, *s1 - *s2, s1, s2);
-        TEST_R(wcscasecmp_l, 0, s1, s2, _LOCALE_UTF8);
-
-        /* Test switching the thread locale. */
-        TEST_R(uselocale, LC_GLOBAL_LOCALE, _LOCALE_UTF8);
-        TEST_R(MB_CUR_MAX, 4);
-        TEST_R(uselocale, _LOCALE_UTF8, _LOCALE_NONE);
-        TEST_R(nl_langinfo, "UTF-8", CODESET);
-        TEST_R(nl_langinfo_l, "UTF-8", CODESET, _LOCALE_UTF8);
-        TEST_R(nl_langinfo_l, "US-ASCII", CODESET, _LOCALE_C);
-        TEST_R(isalpha, _L, 0x65);  /* e */
-        TEST_R(isalpha_l, _L, 0x65, _LOCALE_UTF8);
-        TEST_R(isalpha_l, _L, 0x65, _LOCALE_C);
-        TEST_R(isalpha_l, _L, 0x65, _LOCALE_C);
-        TEST_R(isalpha, 0, 0x30);  /* 0 */
-        TEST_R(isalpha_l, 0, 0x30, _LOCALE_UTF8);
-        TEST_R(isalpha_l, 0, 0x30, _LOCALE_C);
-        TEST_R(tolower, 0x61, 0x41);  /* A */
-        TEST_R(tolower_l, 0x61, 0x41, _LOCALE_UTF8);
-        TEST_R(tolower_l, 0x61, 0x41, _LOCALE_C);
-        TEST_R(tolower, 0x40, 0x40);  /* @ */
-        TEST_R(tolower_l, 0x40, 0x40, _LOCALE_UTF8);
-        TEST_R(tolower_l, 0x40, 0x40, _LOCALE_C);
-        TEST_R(iswalpha, 1, 0x00E9);  /* e accent aigu */
-        TEST_R(iswalpha_l, 1, 0x00E9, _LOCALE_UTF8);
-        TEST_R(iswalpha_l, 0, 0x00E9, _LOCALE_C);
-        TEST_R(iswalpha, 1, 0x0153);  /* ligature oe */
-        TEST_R(iswalpha_l, 1, 0x0153, _LOCALE_UTF8);
-        TEST_R(iswalpha_l, 0, 0x0153, _LOCALE_C);
-        TEST_R(iswalpha, 0, 0x2200);  /* for all */
-        TEST_R(iswalpha_l, 0, 0x2200, _LOCALE_UTF8);
-        TEST_R(iswalpha_l, 0, 0x2200, _LOCALE_C);
-        TEST_R(towupper, 0x00C9, 0x00E9);
-        TEST_R(towupper_l, 0x00C9, 0x00E9, _LOCALE_UTF8);
-        TEST_R(towupper_l, 0x00E9, 0x00E9, _LOCALE_C);
-        TEST_R(towupper, 0x0152, 0x0153);
-        TEST_R(towupper_l, 0x0152, 0x0153, _LOCALE_UTF8);
-        TEST_R(towupper_l, 0x0153, 0x0153, _LOCALE_C);
-        TEST_R(towupper, 0x2205, 0x2205);
-        TEST_R(towupper_l, 0x2205, 0x2205, _LOCALE_UTF8);
-        TEST_R(towupper_l, 0x2205, 0x2205, _LOCALE_C);
-        wctyg = wctype("upper");
-        if (wctyg == NULL)
-                errx(1, "wctype(upper) == NULL");
-        wctyu = wctype_l("upper", _LOCALE_UTF8);
-        if (wctyu == NULL)
-                errx(1, "wctype_l(upper, UTF-8) == NULL");
-        if (wctyg != wctyu)
-                errx(1, "wctype global != UTF-8");
-        wctyc = wctype_l("upper", _LOCALE_C);
-        if (wctyc == NULL)
-                errx(1, "wctype_l(upper, C) == NULL");
-        if (wctyg == wctyc)
-                errx(1, "wctype global == C");
-        TEST_R(iswctype, 1, 0x00D0, wctyg);  /* Eth */
-        TEST_R(iswctype_l, 1, 0x00D0, wctyu, _LOCALE_UTF8);
-        TEST_R(iswctype_l, 0, 0x00D0, wctyc, _LOCALE_C);
-        TEST_R(iswctype, 1, 0x0393, wctyg);  /* Gamma */
-        TEST_R(iswctype_l, 1, 0x0393, wctyu, _LOCALE_UTF8);
-        TEST_R(iswctype_l, 0, 0x0393, wctyc, _LOCALE_C);
-        TEST_R(iswctype, 0, 0x2205, wctyg);  /* empty set */
-        TEST_R(iswctype_l, 0, 0x2205, wctyu, _LOCALE_UTF8);
-        TEST_R(iswctype_l, 0, 0x2205, wctyc, _LOCALE_C);
-        wctrg = wctrans("tolower");
-        if (wctrg == NULL)
-                errx(1, "wctrans(tolower) == NULL");
-        wctru = wctrans_l("tolower", _LOCALE_UTF8);
-        if (wctru == NULL)
-                errx(1, "wctrans(tolower, UTF-8) == NULL");
-        if (wctrg != wctru)
-                errx(1, "wctrans global != UTF-8");
-        wctrc = wctrans_l("tolower", _LOCALE_C);
-        if (wctrc == NULL)
-                errx(1, "wctrans(tolower, C) == NULL");
-        if (wctrg == wctrc)
-                errx(1, "wctrans global == C");
-        TEST_R(towctrans, 0x00FE, 0x00DE, wctrg);  /* Thorn */
-        TEST_R(towctrans_l, 0x00FE, 0x00DE, wctru, _LOCALE_UTF8);
-        TEST_R(towctrans_l, 0x00DE, 0x00DE, wctrc, _LOCALE_C);
-        TEST_R(towctrans, 0x03C6, 0x03A6, wctrg);  /* Phi */
-        TEST_R(towctrans_l, 0x03C6, 0x03A6, wctru, _LOCALE_UTF8);
-        TEST_R(towctrans_l, 0x03A6, 0x03A6, wctrc, _LOCALE_C);
-        TEST_R(towctrans, 0x2207, 0x2207, wctrg);  /* Nabla */
-        TEST_R(towctrans_l, 0x2207, 0x2207, wctru, _LOCALE_UTF8);
-        TEST_R(towctrans_l, 0x2207, 0x2207, wctrc, _LOCALE_C);
-        TEST_R(wcscasecmp, 0, s1, s2);
-        TEST_R(wcscasecmp_l, 0, s1, s2, _LOCALE_UTF8);
-        TEST_R(wcscasecmp_l, *s1 - *s2, s1, s2, _LOCALE_C);
-        TEST_R(wcsncasecmp, 0, s3, s4, 2);
-        TEST_R(wcsncasecmp_l, 0, s3, s4, 2, _LOCALE_UTF8);
-        TEST_R(wcsncasecmp_l, *s3 - *s4, s3, s4, 2, _LOCALE_C);
-
-        /* Test non-ctype newlocale(3). */
-        TEST_R(newlocale, _LOCALE_C, LC_MESSAGES_MASK, "en_US.UTF-8");
-
-        /* Test strerror(3). */
-        sego = strerror(EPERM);
-        segc = strdup(sego);
-        selo = strerror_l(ENOENT, _LOCALE_C);
-        selc = strdup(selo);
-        if (strcmp(sego, segc) != 0)
-                errx(1, "child: strerror_l clobbered strerror");
-        free(segc);
-        sego = strerror(ESRCH);
-        if (strcmp(selo, selc) != 0)
-                errx(1, "child: strerror clobbered strerror_l");
-        
-        /* Temporarily switch to the main thread. */
-        switch_thread(2, SWITCH_SIGNAL | SWITCH_WAIT);
-        if (strcmp(selo, selc) != 0)
-                errx(1, "child: main clobbered strerror_l");
-        free(selc);
-
-        /* Check that the C locale works even while all is set to UTF-8. */
-        TEST_R(nl_langinfo_l, "US-ASCII", CODESET, _LOCALE_C);
-        TEST_R(iswalpha_l, 0, 0x00E9, _LOCALE_C);
-        TEST_R(towupper_l, 0x00E9, 0x00E9, _LOCALE_C);
-        TEST_R(wcscasecmp_l, *s1 - *s2, s1, s2, _LOCALE_C);
-
-        /* Test displaying the global locale while a local one is set. */
-        TEST_R(setlocale, "C/C.UTF-8/C/C/C/C", LC_ALL, NULL);
-
-        /* Test switching the thread locale back. */
-        TEST_R(MB_CUR_MAX, 4);
-        TEST_R(duplocale, _LOCALE_UTF8, LC_GLOBAL_LOCALE);
-        TEST_R(uselocale, _LOCALE_UTF8, _LOCALE_C);
-        TEST_R(MB_CUR_MAX, 1);
-        TEST_R(uselocale, _LOCALE_C, _LOCALE_NONE);
-
-        /* Check that UTF-8 works even with a C thread locale. */
-        TEST_R(nl_langinfo, "US-ASCII", CODESET);
-        TEST_R(nl_langinfo_l, "UTF-8", CODESET, _LOCALE_UTF8);
-        TEST_R(iswalpha, 0, 0x0153);
-        TEST_R(iswalpha_l, 1, 0x0153, _LOCALE_UTF8);
-        TEST_R(towupper, 0x0153, 0x0153);
-        TEST_R(towupper_l, 0x0152, 0x0153, _LOCALE_UTF8);
-        TEST_R(wcsncasecmp, *s3 - *s4, s3, s4, 2);
-        TEST_R(wcsncasecmp_l, 0, s3, s4, 2, _LOCALE_UTF8);
-
-        /* Test switching back to the global locale. */
-        TEST_R(uselocale, _LOCALE_C, LC_GLOBAL_LOCALE);
-        TEST_R(MB_CUR_MAX, 4);
-        TEST_R(uselocale, LC_GLOBAL_LOCALE, _LOCALE_NONE);
-
-        /* Check that the global locale takes effect even in a thread. */
-        TEST_R(nl_langinfo, "UTF-8", CODESET);
-        TEST_R(iswalpha, 1, 0x0153);
-        TEST_R(towupper, 0x0152, 0x0153);
-        TEST_R(wcscasecmp, 0, s1, s2);
-
-        /* Hand control back to the main thread. */
-        switch_thread(4, SWITCH_SIGNAL);
-        return NULL;
-}
-
-int
-main(void)
-{
-        pthread_t        child_thread;
-        char            *sego, *segc, *selo, *selc;
-        int              irc;
-
-        /* Initialize environment. */
-        unsetenv("LC_ALL");
-        unsetenv("LC_COLLATE");
-        unsetenv("LC_CTYPE");
-        unsetenv("LC_MONETARY");
-        unsetenv("LC_NUMERIC");
-        unsetenv("LC_TIME");
-        unsetenv("LC_MESSAGES");
-        unsetenv("LANG");
-
-        /* First let the child do some tests. */
-        if ((irc = pthread_create(&child_thread, NULL, child_func, NULL)) != 0)
-                errc(1, irc, "pthread_create");
-        switch_thread(1, SWITCH_WAIT);
-
-        /* Check that the global locale is undisturbed. */
-        TEST_R(setlocale, "C", LC_ALL, NULL);
-        TEST_R(MB_CUR_MAX, 1);
-
-        /* Check that *_l(3) works without any locale installed. */
-        TEST_R(nl_langinfo_l, "UTF-8", CODESET, _LOCALE_UTF8);
-        TEST_R(iswalpha_l, 1, 0x00E9, _LOCALE_UTF8);
-        TEST_R(towupper_l, 0x00C9, 0x00E9, _LOCALE_UTF8);
-
-        /* Test setting the globale locale. */
-        TEST_R(setlocale, "C.UTF-8", LC_CTYPE, "C.UTF-8");
-        TEST_R(MB_CUR_MAX, 4);
-        TEST_R(uselocale, LC_GLOBAL_LOCALE, _LOCALE_NONE);
-
-        /* Test strerror(3). */
-        sego = strerror(EINTR);
-        segc = strdup(sego);
-        selo = strerror_l(EIO, _LOCALE_C);
-        selc = strdup(selo);
-        if (strcmp(sego, segc) != 0)
-                errx(1, "main: strerror_l clobbered strerror");
-        free(segc);
-        sego = strerror(ENXIO);
-        if (strcmp(selo, selc) != 0)
-                errx(1, "main: strerror clobbered strerror_l");
-        free(selc);
-
-        /* Let the child do some more tests, then clean up. */
-        switch_thread(3, SWITCH_SIGNAL);
-        if ((irc = pthread_join(child_thread, NULL)) != 0)
-                errc(1, irc, "pthread_join");
-        return 0;
-}
diff --git a/src/regress/lib/libc/locale/wcrtomb/Makefile b/src/regress/lib/libc/locale/wcrtomb/Makefile
deleted file mode 100644
index b09cecc454..0000000000
--- a/src/regress/lib/libc/locale/wcrtomb/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/27 15:08:37 bluhm Exp $
-
-PROG =  test_wcrtomb
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/locale/wcrtomb/test_wcrtomb.c b/src/regress/lib/libc/locale/wcrtomb/test_wcrtomb.c
deleted file mode 100644
index 26b21fdd5b..0000000000
--- a/src/regress/lib/libc/locale/wcrtomb/test_wcrtomb.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*      $OpenBSD: test_wcrtomb.c,v 1.2 2017/07/27 15:08:37 bluhm Exp $  */
-/*
- * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-static mbstate_t         mbs;
-
-void
-onetest(const char *name, const wchar_t wcin, int outerr, const char *out)
-{
-        char             buf[MB_LEN_MAX];
-        size_t           sz, outsz;
-
-        memset(buf, 0, MB_LEN_MAX);
-        outsz = out == NULL ? (size_t)-1 : *out == '\0' ? 1 : strlen(out);
-        sz = wcrtomb(buf, wcin, &mbs);
-        if (errno != outerr)
-                err(1, "%zu %s U+%04X", MB_CUR_MAX, name, wcin);
-        if (sz != outsz || (out != NULL && strncmp(buf, out, sz)))
-                errx(1, "%zu %s U+%04X: %4.4s(%zd) != %4.4s(%zd)",
-                    MB_CUR_MAX, name, wcin, buf, sz,
-                    out == NULL ? "(NULL)" : out, outsz);
-        if (mbsinit(&mbs) == 0)
-                errx(1, "%zu %s U+%04X mbsinit", MB_CUR_MAX, name, wcin);
-        if (errno == 0 && outerr == 0)
-                return;
-        errno = 0;
-        memset(&mbs, 0, sizeof(mbs));
-}
-
-int
-main(void)
-{
-        onetest("NUL", L'\0', 0, "");
-        onetest("BEL", L'\a', 0, "\a");
-        onetest("A", L'A', 0, "A");
-        onetest("DEL", L'\177', 0, "\177");
-        onetest("CSI", L'\233', 0, "\233");
-        onetest("0x100", 0x100, EILSEQ, NULL);
-
-        if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL)
-                errx(1, "setlocale(UTF-8) failed"),
-
-        onetest("NUL", L'\0', 0, "");
-        onetest("BEL", L'\a', 0, "\a");
-        onetest("A", L'A', 0, "A");
-        onetest("DEL", L'\177', 0, "\177");
-        onetest("CSI", L'\233', 0, "\302\233");
-        onetest("0xe9", 0xe9, 0, "\303\251");
-        onetest("0xcfff", 0xcfff, 0, "\354\277\277");
-        onetest("0xd800", 0xd800, EILSEQ, NULL);
-
-        if (setlocale(LC_CTYPE, "POSIX") == NULL)
-                errx(1, "setlocale(POSIX) failed"),
-
-        onetest("0xff", L'\377', 0, "\377");
-
-        if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL)
-                errx(1, "second setlocale(UTF-8) failed"),
-
-        onetest("U+13000", 0x13000, 0, "\360\223\200\200");
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/longjmp/Makefile b/src/regress/lib/libc/longjmp/Makefile
deleted file mode 100644
index 825e0f86d9..0000000000
--- a/src/regress/lib/libc/longjmp/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
-PROG=   longjmp
-
-do-longjmp: ${PROG}
-        ./longjmp
-
-do-_longjmp: ${PROG}
-        ./longjmp -_
-
-REGRESS_TARGETS=do-longjmp do-_longjmp
-.PHONY: ${REGRESS_TARGETS}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/longjmp/longjmp.c b/src/regress/lib/libc/longjmp/longjmp.c
deleted file mode 100644
index 7dea5bd97c..0000000000
--- a/src/regress/lib/libc/longjmp/longjmp.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*      $OpenBSD: longjmp.c,v 1.4 2002/02/18 11:27:45 art Exp $ */
-/*
- *      Artur Grabowski <art@openbsd.org>, 2002 Public Domain.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <err.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-
-jmp_buf buf;
-
-/*
- * When longjmp is passed the incorrect arg (0), it should translate it into
- * something better.
- *
- * The rlimit is here in case we start spinning.
- */
-int
-main(int argc, char **argv)
-{
-        struct rlimit rl;
-        volatile int i, expect;
-        int (*sj)(jmp_buf);
-        void (*lj)(jmp_buf, int);
-        int ch;
-        extern char *__progname;
-
-        sj = setjmp;
-        lj = longjmp;
-
-        while ((ch = getopt(argc, argv, "_")) != -1) {
-                switch (ch) {
-                case '_':
-                        sj = _setjmp;
-                        lj = _longjmp;
-                        break;
-                default:
-                        fprintf(stderr, "Usage: %s [-_]\n", __progname);
-                        exit(1);
-                }
-        }
-
-        rl.rlim_cur = 2;
-        rl.rlim_max = 2;
-        if (setrlimit(RLIMIT_CPU, &rl) < 0)
-                err(1, "setrlimit");
-
-        expect = 0;
-        i = (*sj)(buf);
-        if (i == 0 && expect != 0)
-                errx(1, "setjmp returns 0 on longjmp(.., 0)");
-        if (expect == 0) {
-                expect = -1;
-                (*lj)(buf, 0);
-        }
-
-        expect = 0;
-        i = (*sj)(buf);
-        if (i != expect)
-                errx(1, "bad return from setjmp %d/%d", expect, i);
-        if (expect < 1000)
-                (*lj)(buf, expect += 2);
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/malloc/Makefile b/src/regress/lib/libc/malloc/Makefile
deleted file mode 100644
index 7eb84f6a6c..0000000000
--- a/src/regress/lib/libc/malloc/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.7 2018/01/28 13:42:17 otto Exp $
-
-SUBDIR+= malloc_general malloc0test malloc_errno malloc_ulimit1 malloc_ulimit2
-SUBDIR+= malloc_threaderr
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/malloc/malloc0test/Makefile b/src/regress/lib/libc/malloc/malloc0test/Makefile
deleted file mode 100644
index fc2295c091..0000000000
--- a/src/regress/lib/libc/malloc/malloc0test/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2017/07/08 00:08:26 bluhm Exp $
-
-PROG=   malloc0test
-
-.for m in C D F G J j R S U X << >>>
-REGRESS_TARGETS +=      run-regress-${PROG}-${m:S/</-/g:S/>/+/g}
-run-regress-${PROG}-${m:S/</-/g:S/>/+/g}: ${PROG}
-        MALLOC_OPTIONS='${m}' ./${PROG}
-.endfor
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/malloc/malloc0test/malloc0test.c b/src/regress/lib/libc/malloc/malloc0test/malloc0test.c
deleted file mode 100644
index 06ff0996ee..0000000000
--- a/src/regress/lib/libc/malloc/malloc0test/malloc0test.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*      $OpenBSD: malloc0test.c,v 1.5 2008/04/13 00:22:17 djm Exp $     */
-/*
- * Public domain.  2001, Theo de Raadt
- */
-#include <sys/types.h>
-#include <sys/signal.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <setjmp.h>
-#include <limits.h>
-#include <errno.h>
-
-volatile sig_atomic_t got;
-jmp_buf jmp;
-
-static void
-catch(int signo)
-{
-        got++;
-        longjmp(jmp, 1);
-}
-
-static int
-test(char *p, int size)
-{
-        signal(SIGSEGV, catch);
-        got = 0;
-        if (setjmp(jmp) == 0)
-                *p = 0;
-        if (setjmp(jmp) == 0)
-                *(p+size-1) = 0;
-        return (got);
-}
-
-char *prot_table[] = {
-        "unprotected",
-        "fuckup",
-        "protected"
-};
-
-#define SIZE    10
-
-/*
- * Do random memory allocations.
- *
- * For each one, ensure that it is at least 16 bytes in size (that
- * being what our current malloc returns for the minsize of an
- * object, alignment wise);
- *
- * For zero-byte allocations, check that they are still aligned.
- *
- * For each object, ensure that they are correctly protected or not
- * protected.
- *
- * Does not regress test malloc + free combinations ... it should.
- */
-int
-main(int argc, char *argv[])
-{
-        caddr_t blob;
-        int size, tsize;
-        int prot;
-        int rval = 0, fuckup = 0;
-        long limit = 200000, count;
-        int ch, silent = 0;
-        char *ep;
-        extern char *__progname;
-
-        while ((ch = getopt(argc, argv, "sn:")) != -1) {
-                switch (ch) {
-                case 's':
-                        silent = 1;
-                        break;
-                case 'n':
-                        errno = 0;
-                        limit = strtol(optarg, &ep, 10);
-                        if (optarg[0] == '\0' || *ep != '\0' ||
-                            (errno == ERANGE &&
-                             (limit == LONG_MAX || limit == LONG_MIN)))
-                                goto usage;
-                        break;
-                default:
-usage:
-                        fprintf(stderr, "Usage: %s [-s][-n <count>]\n",
-                            __progname);
-                        exit(1);
-                }
-        }
-
-        if (limit == 0)
-                limit = LONG_MAX;
-
-        for (count = 0; count < limit; count++) {
-                size = arc4random_uniform(SIZE);
-                blob = malloc(size);
-                if (blob == NULL) {
-                        fprintf(stderr, "success: out of memory\n");
-                        exit(rval);
-                }
-
-                tsize = size == 0 ? 16 : size;
-                fuckup = 0;
-                prot = test(blob, tsize);
-
-                if (size == 0 && prot < 2)
-                        fuckup = 1;
-
-                if (fuckup) {
-                        printf("%8p %6d %20s %10s\n", blob, size,
-                            prot_table[prot], fuckup ? "fuckup" : "");
-                        rval = 1;
-                }
-
-                if (!silent && count % 100000 == 0 && count != 0)
-                        fprintf(stderr, "count = %ld\n", count);
-        }
-
-        return rval;
-}
diff --git a/src/regress/lib/libc/malloc/malloc_errno/Makefile b/src/regress/lib/libc/malloc/malloc_errno/Makefile
deleted file mode 100644
index 73ebe37491..0000000000
--- a/src/regress/lib/libc/malloc/malloc_errno/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2003/07/15 10:06:31 otto Exp $
-
-PROG=   malloc_errno
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/malloc/malloc_errno/malloc_errno.c b/src/regress/lib/libc/malloc/malloc_errno/malloc_errno.c
deleted file mode 100644
index 896ea3c900..0000000000
--- a/src/regress/lib/libc/malloc/malloc_errno/malloc_errno.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*      $OpenBSD: malloc_errno.c,v 1.4 2003/12/25 18:49:57 miod Exp $   */
-/*
- * Public domain.  2003, Otto Moerbeek
- */
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-static void
-testerrno(size_t sz)
-{
-        void *p;
-
-        errno = -1;
-        p = malloc(sz);
-
-        if (p == NULL && errno != ENOMEM)
-                errx(1, "fail: %lx %p %d", (unsigned long)sz, p, errno);
-
-        /* if alloc succeeded, test if errno did not change */
-        if (p != NULL && errno != -1) 
-                errx(1, "fail: %lx %p %d", (unsigned long)sz, p, errno);
-
-        free(p);
-}
-
-/*
- * Provide some (silly) arguments to malloc(), and check if ERRNO is set
- * correctly.
- */
-int
-main(int argc, char *argv[])
-{
-        size_t i;
-
-        testerrno(1);
-        testerrno(100000);
-        testerrno(-1);
-        testerrno(-1000);
-        testerrno(-10000);
-        testerrno(-10000000);
-        for (i = 0; i < 0x10; i++)
-                testerrno(i * 0x10000000);
-        return 0;
-}
diff --git a/src/regress/lib/libc/malloc/malloc_general/Makefile b/src/regress/lib/libc/malloc/malloc_general/Makefile
deleted file mode 100644
index a0ee823bbe..0000000000
--- a/src/regress/lib/libc/malloc/malloc_general/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2017/01/24 16:03:28 otto Exp $
-
-REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7
-PROG=                   malloc_general
-
-.include <bsd.regress.mk>
-
-t1:     malloc_general
-        ${.OBJDIR}/malloc_general ""
-
-t2:     malloc_general
-        ${.OBJDIR}//malloc_general C
-
-t3:     malloc_general
-        ${.OBJDIR}//malloc_general J
-
-t4:     malloc_general
-        ${.OBJDIR}//malloc_general F
-
-t5:     malloc_general
-        ${.OBJDIR}//malloc_general G
-
-t6:     malloc_general
-        ${.OBJDIR}//malloc_general S
-
-t7:     malloc_general
-        ${.OBJDIR}//malloc_general FGJ
diff --git a/src/regress/lib/libc/malloc/malloc_general/malloc_general.c b/src/regress/lib/libc/malloc/malloc_general/malloc_general.c
deleted file mode 100644
index 51bfb03a34..0000000000
--- a/src/regress/lib/libc/malloc/malloc_general/malloc_general.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*      $OpenBSD        */
-/*
- * Copyright (c) 2017 Otto Moerbeek <otto@drijf.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* $define VERBOSE */
-
-#define N 1000
-
-size_t
-size(void)
-{
-        int p = arc4random_uniform(13) + 3;
-        return arc4random_uniform(1 << p);
-}
-
-struct { void *p; size_t sz; } a[N];
-
-extern char *malloc_options;
-
-void
-fill(u_char *p, size_t sz)
-{
-        size_t i;
-
-        for (i = 0; i < sz; i++)
-                p[i] = i % 256;
-}
-
-void
-check(u_char *p, size_t sz)
-{
-        size_t i;
-
-        for (i = 0; i < sz; i++)
-                if (p[i] != i % 256)
-                        errx(1, "check");
-}
-
-int
-main(int argc, char *argv[])
-{
-        int count, p, i;
-        void * q;
-        size_t sz;
-
-        if (argc == 1)
-                errx(1, "usage: malloc_options");
-
-        malloc_options = argv[1];
-
-        for (count = 0; count < 800000; count++) {
-                if (count % 10000 == 0) {
-                        printf(".");
-                        fflush(stdout);
-                }
-                p = arc4random_uniform(2);
-                i = arc4random_uniform(N);
-                switch (p) {
-                case 0:
-                        if (a[i].p) {
-#ifdef VERBOSE
-                                printf("F %p\n", a[i].p);
-#endif
-                                if (a[i].p)
-                                        check(a[i].p, a[i].sz);
-                                free(a[i].p);
-                                a[i].p = NULL;
-                        }
-                        sz = size();
-#ifdef VERBOSE
-                        printf("M %zu=", sz);
-#endif
-                        a[i].p = malloc(sz);
-                        a[i].sz = sz;
-#ifdef VERBOSE
-                        printf("%p\n", a[i].p);
-#endif
-                        if (a[i].p)
-                                fill(a[i].p, sz);
-                        break;
-                case 1:
-                        sz = size();
-#ifdef VERBOSE
-                        printf("R %p %zu=", a[i].p, sz);
-#endif
-                        q = realloc(a[i].p, sz);
-#ifdef VERBOSE
-                        printf("%p\n", q);
-#endif
-                        if (a[i].p && q)
-                                check(q, a[i].sz < sz ? a[i].sz : sz);
-                        if (q) {
-                                a[i].p = q;
-                                a[i].sz = sz;
-                                fill(a[i].p, sz);
-                        }
-                        break;
-                }
-        }
-        for (i = 0; i < N; i++) {
-                if (a[i].p)
-                        check(a[i].p, a[i].sz);
-                free(a[i].p);
-        }
-        printf("\n");
-        return 0;
-}
diff --git a/src/regress/lib/libc/malloc/malloc_threaderr/Makefile b/src/regress/lib/libc/malloc/malloc_threaderr/Makefile
deleted file mode 100644
index 2d715af58b..0000000000
--- a/src/regress/lib/libc/malloc/malloc_threaderr/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2018/01/28 14:55:24 otto Exp $
-
-# This test is supposed to print a malloc error and create a core dump
-
-REGRESS_TARGETS=        t1
-PROG=                   malloc_threaderr
-LDADD+=                 -pthread
-DPADD+=                 ${LIBPTHREAD}
-
-.include <bsd.regress.mk>
-
-t1:     malloc_threaderr
-        ${.OBJDIR}/malloc_threaderr 2>&1 | fgrep 'in free(): bogus pointer (double free?)'
diff --git a/src/regress/lib/libc/malloc/malloc_threaderr/malloc_threaderr.c b/src/regress/lib/libc/malloc/malloc_threaderr/malloc_threaderr.c
deleted file mode 100644
index f34f37fc93..0000000000
--- a/src/regress/lib/libc/malloc/malloc_threaderr/malloc_threaderr.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2018 Otto Moerbeek <otto@drijf.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-pthread_cond_t cond;
-pthread_mutex_t mutex;
-
-void *p;
-
-void *m(void *arg)
-{
-        p = malloc(100000);
-        if (p == NULL)
-                err(1, NULL);
-        return NULL;
-}
-
-void *f(void *arg)
-{
-        free(p);
-        free(p);
-        return NULL;
-}
-
-int
-main(void)
-{
-        pthread_t t1, t2;
-
-        printf("This test is supposed to print a malloc error and create a core dump\n");
-
-        if (pthread_create(&t1, NULL, m, NULL))
-                err(1, "pthread_create");
-        pthread_join(t1, NULL);
-
-        if (pthread_create(&t2, NULL, f, NULL))
-                err(1, "pthread_create");
-        pthread_join(t2, NULL);
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/malloc/malloc_ulimit1/Makefile b/src/regress/lib/libc/malloc/malloc_ulimit1/Makefile
deleted file mode 100644
index 46ced27a98..0000000000
--- a/src/regress/lib/libc/malloc/malloc_ulimit1/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2006/04/18 19:03:30 otto Exp $
-
-PROG=   malloc_ulimit1
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/malloc/malloc_ulimit1/malloc_ulimit1.c b/src/regress/lib/libc/malloc/malloc_ulimit1/malloc_ulimit1.c
deleted file mode 100644
index 94f7eb16b5..0000000000
--- a/src/regress/lib/libc/malloc/malloc_ulimit1/malloc_ulimit1.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*      $OpenBSD: malloc_ulimit1.c,v 1.3 2017/07/27 15:08:37 bluhm Exp $        */
-
-/* Public Domain, 2006, Otto Moerbeek <otto@drijf.net> */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <err.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-/*
- * This code tries to trigger the case present in -current as of April
- * 2006) where the allocation of the region itself succeeds, but the
- * page dir entry pages fails.
- * This in turn trips a "hole in directories" error.
- * Having a large (512M) ulimit -m helps a lot in triggering the 
- * problem. Note that you may need to run this test multiple times to
- * see the error.
-*/
-
-#define STARTI  1300
-#define FACTOR  1024
-
-int
-main()
-{
-        struct rlimit lim;
-        size_t sz;
-        int i;
-        void *p;
-
-        if (getrlimit(RLIMIT_DATA, &lim) == -1)
-                err(1, "getrlimit");
-
-        sz = lim.rlim_cur / FACTOR;
-
-        for (i = STARTI; i >= 0; i--) {
-                size_t len = (sz-i) * FACTOR;
-                p = malloc(len);
-                free(p);
-                free(malloc(4096));
-        }
-        return (0);
-}
diff --git a/src/regress/lib/libc/malloc/malloc_ulimit2/Makefile b/src/regress/lib/libc/malloc/malloc_ulimit2/Makefile
deleted file mode 100644
index bc83666415..0000000000
--- a/src/regress/lib/libc/malloc/malloc_ulimit2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2006/04/18 19:04:03 otto Exp $
-
-PROG=   malloc_ulimit2
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/malloc/malloc_ulimit2/malloc_ulimit2.c b/src/regress/lib/libc/malloc/malloc_ulimit2/malloc_ulimit2.c
deleted file mode 100644
index 9510649090..0000000000
--- a/src/regress/lib/libc/malloc/malloc_ulimit2/malloc_ulimit2.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*      $OpenBSD: malloc_ulimit2.c,v 1.3 2017/07/27 15:08:37 bluhm Exp $        */
-
-/* Public Domain, 2006, Otto Moerbeek <otto@drijf.net> */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <err.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define FACTOR  1024
-
-int
-main()
-{
-        struct rlimit lim;
-        size_t sz;
-        int i;
-        void *p;
-
-        if (getrlimit(RLIMIT_DATA, &lim) == -1)
-                err(1, "getrlimit");
-
-        sz = lim.rlim_cur / FACTOR;
-
-        for (i = 0; ; i++) {
-                size_t len = (sz-i) * FACTOR;
-                p = malloc(len);
-                if (p != NULL) {
-                        free(p);
-                        break;
-                }
-        }
-        i += 10;
-        for (; i >= 0; i--) {
-                size_t len = (sz-i) * FACTOR;
-                p = malloc(len);
-                free(p);
-                free(malloc(4096));
-        }
-        return (0);
-}
diff --git a/src/regress/lib/libc/mkstemp/Makefile b/src/regress/lib/libc/mkstemp/Makefile
deleted file mode 100644
index dc7eb281a9..0000000000
--- a/src/regress/lib/libc/mkstemp/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2010/02/11 07:35:38 guenther Exp $
-
-PROG=mkstemp_test
-CLEANFILES+= ; rm -rf output
-
-O = output
-
-# The ktrace/kdump/perl combo verifies that all open() calls that
-# were passed O_CREAT were also passed O_EXCL
-run-regress-${PROG}: ${PROG}
-        mkdir -p $O && cd $O && ktrace ../${PROG}
-        cd $O && kdump | perl -mFcntl -nl \
-                -e '/ open\([^,]*,([^,]+)/      or next;'       \
-                -e '$$f = oct($$1);'                            \
-                -e 'if ($$f & O_CREAT && !($$f & O_EXCL)) {'    \
-                -e '    print "FAIL"; exit 1'                   \
-                -e '}'
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/mkstemp/mkstemp_test.c b/src/regress/lib/libc/mkstemp/mkstemp_test.c
deleted file mode 100644
index c1c05eae39..0000000000
--- a/src/regress/lib/libc/mkstemp/mkstemp_test.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2010  Philip Guenther <guenther@openbsd.org>
- *
- * Public domain.
- *
- * Verify that mkstemp() and mkstemps() doesn't overrun or underrun
- * the template buffer and that it can generate names that don't
- * contain any X's
- */
-
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define MAX_TEMPLATE_LEN        10
-#define MAX_TRIES               100
-#define MIN_Xs                  6
-
-#define SUFFIX  ".suff"
-#define SLEN    (sizeof SUFFIX - 1)
-
-long pg;
-
-/*
- * verify that a path generated by mkstemp() or mkstemp() looks like a
- * reasonable expansion of the template and matches the fd.  Returns true
- * if all the X's were replaced with non-X's
- */
-int
-check(int fd, char const *path, char const *prefix, size_t plen,
-    char const *suffix, size_t slen, int tlen)
-{
-        struct stat sb, fsb;
-        char const *p;
-
-        if (tlen < MIN_Xs) {
-                if (fd >= 0)
-                        errx(1, "mkstemp(%s) succeed with too few Xs", path);
-                if (errno != EINVAL)
-                        err(1, "mkstemp(%s) failed with wrong errno", path);
-                return 1;
-        }
-        if (fd < 0)
-                err(1, "mkstemp(%s)", path);
-        if (stat(path, &sb))
-                err(1, "stat(%s)", path);
-        if (fstat(fd, &fsb))
-                err(1, "fstat(%d==%s)", fd, path);
-        if (sb.st_dev != fsb.st_dev || sb.st_ino != fsb.st_ino)
-                errx(1, "stat mismatch");
-        close(fd);
-        if (memcmp(path, prefix, plen) != 0)
-                errx(1, "prefix changed!  %s vs %s", prefix, path);
-        if (memcmp(path + plen + tlen, suffix, slen + 1) != 0)
-                errx(1, "suffix changed!  %s vs %s", suffix, path);
-        for (p = path + plen; p < path + plen + tlen; p++)
-                if (*p == '\0')
-                        errx(1, "unexpected truncation");
-                else if (*p == 'X')
-                        return 0;
-        return 1;
-}
-
-
-void
-try_mkstemp(char *p, char const *prefix, int len)
-{
-        char *q;
-        size_t plen = strlen(prefix);
-        int tries, fd;
-
-        for (tries = 0; tries < MAX_TRIES; tries++) {
-                memcpy(p, prefix, plen);
-                memset(p + plen, 'X', len);
-                p[plen + len] = '\0';
-                fd = mkstemp(p);
-                if (check(fd, p, prefix, plen, "", 0, len))
-                        return;
-        }
-        errx(1, "exceeded MAX_TRIES");
-}
-
-void
-try_mkstemps(char *p, char const *prefix, int len, char const *suffix)
-{
-        char *q;
-        size_t plen = strlen(prefix);
-        size_t slen = strlen(suffix);
-        int tries, fd;
-
-        for (tries = 0; tries < MAX_TRIES; tries++) {
-                memcpy(p, prefix, plen);
-                memset(p + plen, 'X', len);
-                memcpy(p + plen + len, suffix, slen + 1);
-                fd = mkstemps(p, slen);
-                if (check(fd, p, prefix, plen, suffix, slen, len))
-                        return;
-        }
-        errx(1, "exceeded MAX_TRIES");
-}
-
-int
-main(void)
-{
-        struct stat sb, fsb;
-        char cwd[MAXPATHLEN + 1];
-        char *p;
-        size_t clen;
-        int i;
-
-        pg = sysconf(_SC_PAGESIZE);
-        if (getcwd(cwd, sizeof cwd - 1) == NULL)
-                err(1, "getcwd");
-        clen = strlen(cwd);
-        cwd[clen++] = '/';
-        cwd[clen] = '\0';
-        p = mmap(NULL, pg * 3, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
-        if (p == MAP_FAILED)
-                err(1, "mmap");
-        if (mprotect(p, pg, PROT_NONE) || mprotect(p + pg * 2, pg, PROT_NONE))
-                err(1, "mprotect");
-        p += pg;
-
-        i = MAX_TEMPLATE_LEN + 1;
-        while (i-- > 0) {
-                /* try first at the start of a page, no prefix */
-                try_mkstemp(p, "", i);
-                /* now at the end of the page, no prefix */
-                try_mkstemp(p + pg - i - 1, "", i);
-                /* start of the page, prefixed with the cwd */
-                try_mkstemp(p, cwd, i);
-                /* how about at the end of the page, prefixed with cwd? */
-                try_mkstemp(p + pg - clen - i - 1, cwd, i);
-
-                /* again, with mkstemps() and an empty suffix */
-                /* try first at the start of a page, no prefix */
-                try_mkstemps(p, "", i, "");
-                /* now at the end of the page, no prefix */
-                try_mkstemps(p + pg - i - 1, "", i, "");
-                /* start of the page, prefixed with the cwd */
-                try_mkstemps(p, cwd, i, "");
-                /* how about at the end of the page, prefixed with cwd? */
-                try_mkstemps(p + pg - clen - i - 1, cwd, i, "");
-
-                /* mkstemps() and a non-empty suffix */
-                /* try first at the start of a page, no prefix */
-                try_mkstemps(p, "", i, SUFFIX);
-                /* now at the end of the page, no prefix */
-                try_mkstemps(p + pg - i - SLEN - 1, "", i, SUFFIX);
-                /* start of the page, prefixed with the cwd */
-                try_mkstemps(p, cwd, i, SUFFIX);
-                /* how about at the end of the page, prefixed with cwd? */
-                try_mkstemps(p + pg - clen - i - SLEN - 1, cwd, i, SUFFIX);
-
-        }
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/modf/Makefile b/src/regress/lib/libc/modf/Makefile
deleted file mode 100644
index 587c595f12..0000000000
--- a/src/regress/lib/libc/modf/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-PROG=modf_test
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/modf/modf_test.c b/src/regress/lib/libc/modf/modf_test.c
deleted file mode 100644
index f732533635..0000000000
--- a/src/regress/lib/libc/modf/modf_test.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Public domain, 2014, Tobias Ulmer <tobiasu@tmux.org> */
-
-/* Test for bug introduced in 4.4BSD modf() on sparc */
-
-#include <math.h>
-
-#define BIGFLOAT (5e15) /* Number large enough to trigger the "big" case */
-
-int
-main(void)
-{
-        double f, i;
-
-        f = modf(BIGFLOAT, &i);
-        if (i != BIGFLOAT)
-                return 1;
-        if (f != 0.0)
-                return 1;
-
-        /* Repeat, maybe we were lucky */
-        f = modf(BIGFLOAT, &i);
-        if (i != BIGFLOAT)
-                return 1;
-        if (f != 0.0)
-                return 1;
-
-        /* With negative number, for good measure */
-        f = modf(-BIGFLOAT, &i);
-        if (i != -BIGFLOAT)
-                return 1;
-        if (f != 0.0)
-                return 1;
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/netdb/Makefile b/src/regress/lib/libc/netdb/Makefile
deleted file mode 100644
index 8254607227..0000000000
--- a/src/regress/lib/libc/netdb/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2004/10/25 15:10:36 otto Exp $
-
-PROG=   netdb
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/netdb/netdb.c b/src/regress/lib/libc/netdb/netdb.c
deleted file mode 100644
index fabb3ee4e1..0000000000
--- a/src/regress/lib/libc/netdb/netdb.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*      $OpenBSD: netdb.c,v 1.2 2011/05/01 04:27:07 guenther Exp $      */
-
-/*
- * Public domain, 2004, Otto Moerbeek <otto@drijf.net>
- */
-
-#include <err.h>
-#include <netdb.h>
-#include <stdarg.h>
-#include <string.h>
-
-int ret = 0;
-
-void
-checkp(int n, struct protoent *p, int proto, const char *name, ...)
-{
-        va_list va;
-        char *a;
-        int i;
-
-        if (p == NULL) {
-                warnx("%d proto struct is NULL", n);
-                ret = 1;
-                return;
-        }
-        if (p->p_proto != proto) {
-                warnx("%d proto num mismatch %d %d", n, p->p_proto, proto);
-                ret = 1;
-        }
-        if (strcmp(p->p_name, name) != 0) {
-                warnx("%d proto name mismatch %s %s", n, p->p_name, name);
-                ret = 1;
-        }
-        va_start(va, name);
-        a = va_arg(va, char *);
-        i = 0;
-        while (a != NULL) {
-                if (strcmp(p->p_aliases[i], a) != 0) {
-                        warnx("%d proto alias mismatch %s %s", n,
-                            p->p_aliases[i], a);
-                        ret = 1;
-                }
-                i++;
-                a = va_arg(va, char *);
-        }
-        if (p->p_aliases[i] != NULL) {
-                        warnx("%d proto alias list does not end with NULL", n);
-                        ret = 1;
-        }
-        va_end(va);
-}
-
-
-void
-checks(int n, struct servent *s, int port, const char *proto,
-    const char *name, ...)
-{
-        va_list va;
-        char *a;
-        int i;
-
-        if (s == NULL) {
-                warnx("%d serv struct is NULL", n);
-                ret = 1;
-                return;
-        }
-        if (s->s_port != ntohs(port)) {
-                warnx("%d port num mismatch %d %d", n, s->s_port, port);        
-                ret = 1;
-        }
-        if (strcmp(s->s_name, name) != 0) {
-                warnx("%d serv name mismatch %s %s", n, s->s_name, name);
-                ret = 1;
-        }
-        if (strcmp(s->s_proto, proto) != 0) {
-                warnx("%d serv proto mismatch %s %s", n, s->s_proto, proto);
-                ret = 1;
-        }
-        va_start(va, name);
-        a = va_arg(va, char *);
-        i = 0;
-        while (a != NULL) {
-                if (strcmp(s->s_aliases[i], a) != 0) {
-                        warnx("%d serv alias mismatch %s %s", n,
-                            s->s_aliases[i], a);
-                        ret = 1;
-                }
-                i++;
-                a = va_arg(va, char *);
-        }
-        if (s->s_aliases[i] != NULL) {
-                        warnx("%d serv alias list does not end with NULL", n);
-                        ret = 1;
-        }
-        va_end(va);
-}
-
-int
-main()
-{
-        struct protoent *p;
-        struct protoent protoent;
-        struct protoent_data protoent_data;
-        struct servent *s;
-        struct servent servent;
-        struct servent_data servent_data;
-        int r;
-
-        p = getprotobynumber(35);
-        checkp(1, p, 35, "idpr", "IDPR", (char *)NULL);
-
-        p = getprotobyname("igp");
-        checkp(2, p, 9, "igp", "IGP", (char *) NULL);
-
-        p = getprotobyname("RDP");
-        checkp(3, p, 27, "rdp", "RDP", (char *) NULL);
-
-        p = getprotobyname("vrrp");
-        checkp(4, p, 112, "carp", "CARP", "vrrp", (char *) NULL);
-
-        p = getprotobyname("nonexistent");
-        if (p != NULL)
-                err(1, "nonexistent proto found");
-
-        memset(&protoent_data, 0, sizeof(protoent_data));
-        r = getprotobynumber_r(35, &protoent, &protoent_data);
-        if (r != 0) 
-                err(1, "proto not found");
-
-        checkp(5, &protoent, 35, "idpr", "IDPR", (char *)NULL);
-
-        r = getprotobyname_r("vrrp", &protoent, &protoent_data);
-        if (r != 0) 
-                err(1, "proto not found");
-        checkp(6, &protoent, 112, "carp", "CARP", "vrrp", (char *) NULL);
-
-        r = getprotobyname_r("nonexistent", &protoent, &protoent_data);
-        if (r != -1)
-                err(1, "nonexistent proto found");
-
-        r = getprotobyname_r("", &protoent, &protoent_data);
-        if (r != -1)
-                err(1, "nonexistent proto found");
-
-
-        r = getprotobynumber_r(256, &protoent, &protoent_data);
-        if (r != -1)
-                err(1, "nonexistent proto found");
-
-        s = getservbyname("zip", NULL);
-        checks(7, s, 6, "ddp", "zip", (char *)NULL);
-
-        s = getservbyname("nicname", "tcp");
-        checks(8, s, 43, "tcp", "whois", "nicname", (char *)NULL);
-
-        s = getservbyport(htons(42), "tcp");
-        checks(9, s, 42, "tcp", "nameserver", "name", (char *)NULL);
-
-        memset(&servent_data, 0, sizeof(servent_data));
-        r = getservbyname_r("zip", "ddp", &servent, &servent_data);
-        if (r != 0) 
-                err(1, "servent not found");
-        checks(10, &servent, 6, "ddp", "zip", (char *)NULL);
-
-        r = getservbyport_r(htons(520), NULL, &servent, &servent_data);
-        if (r != 0) 
-                err(1, "servent not found");
-        checks(11, &servent, 520, "udp", "route", "router", "routed", (char *)NULL);
-
-        r = getservbyname_r("nonexistent", NULL, &servent, &servent_data);
-        if (r != -1) 
-                err(1, "nonexiststent servent found");
-
-        r = getservbyport_r(htons(50000), NULL, &servent, &servent_data);
-        if (r != -1) 
-                err(1, "nonexistent servent found");
-
-        r = getservbyport_r(htons(520), "tcp", &servent, &servent_data);
-        if (r != -1) 
-                err(1, "nonexistent servent found");
-
-        return ret;
-}
diff --git a/src/regress/lib/libc/open_memstream/Makefile b/src/regress/lib/libc/open_memstream/Makefile
deleted file mode 100644
index ab7d194232..0000000000
--- a/src/regress/lib/libc/open_memstream/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2013/06/02 15:33:53 dtucker Exp $
-
-PROG=   open_memstreamtest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/open_memstream/open_memstreamtest.c b/src/regress/lib/libc/open_memstream/open_memstreamtest.c
deleted file mode 100644
index 0608bddeba..0000000000
--- a/src/regress/lib/libc/open_memstream/open_memstreamtest.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*      $OpenBSD: open_memstreamtest.c,v 1.4 2014/07/20 01:58:37 guenther Exp $ */
-
-/*
- * Copyright (c) 2011 Martin Pieuchot <mpi@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define OFFSET 16384
-
-const char start[] = "start";
-const char hello[] = "hello";
-
-int
-main(void)
-{
-        FILE    *fp;
-        char    *buf = (char *)0xff;
-        size_t   size = 0;
-        off_t    off;
-        int      i, failures = 0;
-
-        if ((fp = open_memstream(&buf, &size)) == NULL) {
-                warn("open_memstream failed");
-                return (1);
-        }
-
-        off = ftello(fp);
-        if (off != 0) {
-                warnx("ftello failed. (1)");
-                failures++;
-        }
-
-        if (fflush(fp) != 0) {
-                warnx("fflush failed. (2)");
-                failures++;
-        }
-
-        if (size != 0) {
-                warnx("string should be empty. (3)");
-                failures++;
-        }
-
-        if (buf == (char *)0xff) {
-                warnx("buf not updated. (4)");
-                failures++;
-        }
-
-        if (fseek(fp, OFFSET, SEEK_SET) != 0) {
-                warnx("failed to fseek. (5)");
-                failures++;
-        }
-
-        if (fprintf(fp, hello) == EOF) {
-                warnx("fprintf failed. (6)");
-                failures++;
-        }
-
-        if (fflush(fp) == EOF) {
-                warnx("fflush failed. (7)");
-                failures++;
-        }
-
-        if (size != OFFSET + sizeof(hello)-1) {
-                warnx("failed, size %zu should be %zu. (8)",
-                    size, OFFSET + sizeof(hello)-1);
-                failures++;
-        }
-
-        if (fseek(fp, 0, SEEK_SET) != 0) {
-                warnx("failed to fseek. (9)");
-                failures++;
-        }
-
-        if (fprintf(fp, start) == EOF) {
-                warnx("fprintf failed. (10)");
-                failures++;
-        }
-
-        if (fflush(fp) == EOF) {
-                warnx("fflush failed. (11)");
-                failures++;
-        }
-
-        if (size != sizeof(start)-1) {
-                warnx("failed, size %zu should be %zu. (12)",
-                    size, sizeof(start)-1);
-                failures++;
-        }
-
-        /* Needed for sparse files */
-        if (strncmp(buf, start, sizeof(start)-1) != 0) {
-                warnx("failed, buffer didn't start with '%s'. (13)", start);
-                failures++;
-        }
-        for (i = sizeof(start)-1; i < OFFSET; i++)
-                if (buf[i] != '\0') {
-                        warnx("failed, buffer non zero (offset %d). (14)", i);
-                        failures++;
-                        break;
-                }
-
-        if (memcmp(buf + OFFSET, hello, sizeof(hello)-1) != 0) {
-                warnx("written string incorrect. (15)");
-                failures++;
-        }
-
-        /* verify that simply seeking past the end doesn't increase the size */
-        if (fseek(fp, 100, SEEK_END) != 0) {
-                warnx("failed to fseek. (16)");
-                failures++;
-        }
-
-        if (fflush(fp) == EOF) {
-                warnx("fflush failed. (17)");
-                failures++;
-        }
-
-        if (size != OFFSET + sizeof(hello)-1) {
-                warnx("failed, size %zu should be %zu. (18)",
-                    size, OFFSET + sizeof(hello)-1);
-                failures++;
-        }
-
-        if (fseek(fp, 8, SEEK_SET) != 0) {
-                warnx("failed to fseek. (19)");
-                failures++;
-        }
-
-        if (ftell(fp) != 8) {
-                warnx("failed seek test. (20)");
-                failures++;
-        }
-
-        /* Try to seek backward */
-        if (fseek(fp, -1, SEEK_CUR) != 0) {
-                warnx("failed to fseek. (21)");
-                failures++;
-        }
-
-        if (ftell(fp) != 7) {
-                warnx("failed seeking backward. (22)");
-                failures++;
-        }
-
-        if (fseek(fp, 5, SEEK_CUR) != 0) {
-                warnx("failed to fseek. (23)");
-                failures++;
-        }
-
-        if (fclose(fp) == EOF) {
-                warnx("fclose failed. (24)");
-                failures++;
-        }
-
-        if (size != 12) {
-                warnx("failed, size %zu should be %u.  (25)",
-                    size, 12);
-                failures++;
-        }
-
-        free(buf);
-
-        return (failures);
-}
diff --git a/src/regress/lib/libc/orientation/Makefile b/src/regress/lib/libc/orientation/Makefile
deleted file mode 100644
index 5c73702abe..0000000000
--- a/src/regress/lib/libc/orientation/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2010/06/29 16:20:28 guenther Exp $
-
-NOMAN=
-PROG=orientation_test
-CPPFLAGS+=-I${.CURDIR}/../../../../lib/libc
-
-run-regress-${PROG}: ${PROG}
-        ./${PROG}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/orientation/orientation_test.c b/src/regress/lib/libc/orientation/orientation_test.c
deleted file mode 100644
index 4d713f80bf..0000000000
--- a/src/regress/lib/libc/orientation/orientation_test.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*      $OpenBSD: orientation_test.c,v 1.5 2014/04/22 02:29:52 lteo Exp $ */
-
-/*
- * Copyright (c) 2009 Philip Guenther
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - Redistributions in binary form must reproduce the above
- *      copyright notice, this list of conditions and the following
- *      disclaimer in the documentation and/or other materials provided
- *      with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Test whether the various stdio functions set the stream orientation
- * ("width") as they should
- */
-
-#include <sys/types.h>
-#include <err.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <wchar.h>
-
-char filename[] = "/tmp/fwide.XXXXXXXXXX";
-
-FILE *dup_stdout = NULL;
-int failures = 0;
-
-void
-fail(int line, int r, char const *expect, char const *test)
-{
-        failures++;
-        fprintf(dup_stdout,
-                "FAIL: %d: fwide returned %d, expected %s 0 after %s\n",
-                line, r, expect, test);
-}
-
-FILE *
-setup(int line)
-{
-        FILE    *f;
-        int     r;
-
-        if ((f = fopen(filename, "r+")) == NULL)
-                err(2, "fopen");
-        if ((r = fwide(f, 0)) != 0)
-                fail(line, r, "==", "fopen");
-        return (f);
-}
-
-FILE *
-setup_std(FILE *std, int line)
-{
-        int     r;
-
-        if (freopen(filename, "r+", std) == NULL)
-                err(2, "freopen");
-        if ((r = fwide(std, 0)) != 0)
-                fail(line, r, "==", "freopen");
-        return (std);
-}
-
-#define TEST_(x, op)                                            \
-        do {                                                    \
-                f = setup(__LINE__);                            \
-                x;                                              \
-                if (!((r = fwide(f, 0)) op 0))                  \
-                        fail(__LINE__, r, #op, #x);             \
-                fclose(f);                                      \
-        } while (0)
-
-#define TEST_STD_(std, x, op)                                   \
-        do {                                                    \
-                f = setup_std(std, __LINE__);                   \
-                x;                                              \
-                if (!((r = fwide(f, 0)) op 0))                  \
-                        fail(__LINE__, r, #op, #x);             \
-        } while (0)
-
-#define TEST_UNCHANGED(x)               TEST_(x, ==)
-#define TEST_NARROW(x)                  TEST_(x, <)
-#define TEST_WIDE(x)                    TEST_(x, >)
-#define TEST_UNCHANGED_STD(std, x)      TEST_STD_(std, x, ==)
-#define TEST_NARROW_STD(std, x)         TEST_STD_(std, x, <)
-#define TEST_WIDE_STD(std, x)           TEST_STD_(std, x, >)
-
-int
-main(int argc, char *argv[])
-{
-        char    buffer[BUFSIZ];
-        wchar_t wbuffer[BUFSIZ];
-        char    *buf;
-        wchar_t *wbuf;
-        FILE    *f;
-        off_t   off;
-        fpos_t  pos;
-        size_t  size;
-        int     fd, r;
-        char    c;
-        wchar_t wc;
-
-        if ((fd = dup(1)) == -1)
-                err(2, "dup");
-        if ((dup_stdout = fdopen(fd, "w")) == NULL)
-                err(2, "fdopen");
-        if ((fd = mkstemp(filename)) == -1)
-                err(2, "mkstemp");
-        if (write(fd, "0123456789\n\n", 12) != 12 || close(fd))
-                err(2, "write + close");
-
-        /* status */
-        TEST_UNCHANGED(fwide(f, 0));
-        TEST_NARROW(fwide(f, -1));
-        TEST_WIDE(fwide(f, 1));
-        TEST_UNCHANGED(feof(f));
-        TEST_UNCHANGED(ferror(f));
-        TEST_UNCHANGED(fileno(f));
-        TEST_UNCHANGED(clearerr(f));
-
-        /* flush and purge */
-        TEST_UNCHANGED(fflush(f));
-        TEST_UNCHANGED(fpurge(f));
-
-        /* positioning */
-        TEST_UNCHANGED(fgetpos(f, &pos));
-        TEST_UNCHANGED(fgetpos(f, &pos); fsetpos(f, &pos));
-        TEST_UNCHANGED(ftell(f));
-        TEST_UNCHANGED(ftello(f));
-        TEST_UNCHANGED(fseek(f, 1, SEEK_CUR));
-        TEST_UNCHANGED(fseek(f, 1, SEEK_SET));
-        TEST_UNCHANGED(fseek(f, 1, SEEK_END));
-        TEST_UNCHANGED(fseeko(f, 1, SEEK_CUR));
-        TEST_UNCHANGED(fseeko(f, 1, SEEK_SET));
-        TEST_UNCHANGED(fseeko(f, 1, SEEK_END));
-        TEST_UNCHANGED(rewind(f));
-
-        /* buffering */
-        TEST_UNCHANGED(setbuf(f, NULL));
-        TEST_UNCHANGED(setbuf(f, buffer));
-        TEST_UNCHANGED(setvbuf(f, buffer, _IONBF, BUFSIZ));
-        TEST_UNCHANGED(setvbuf(f, buffer, _IOLBF, BUFSIZ));
-        TEST_UNCHANGED(setvbuf(f, buffer, _IOFBF, BUFSIZ));
-        TEST_UNCHANGED(setvbuf(f, NULL, _IONBF, 0));
-        TEST_UNCHANGED(setvbuf(f, NULL, _IOLBF, 0));
-        TEST_UNCHANGED(setvbuf(f, NULL, _IOFBF, 0));
-        TEST_UNCHANGED(setbuffer(f, NULL, 0));
-        TEST_UNCHANGED(setbuffer(f, buffer, BUFSIZ));
-        TEST_UNCHANGED(setlinebuf(f));
-
-        /* locking */
-        TEST_UNCHANGED(flockfile(f);funlockfile(f));
-        TEST_UNCHANGED(ftrylockfile(f);funlockfile(f));
-
-        /* input */
-        TEST_NARROW(getc(f));
-        TEST_NARROW(getc_unlocked(f));
-        TEST_NARROW(fgetc(f));
-        TEST_NARROW(c = fgetc(f); ungetc(c, f));
-        TEST_NARROW(fgets(buffer, BUFSIZ, f));
-        TEST_NARROW(fscanf(f, "%s\n", buffer));
-        TEST_NARROW(fgetln(f, &size));
-
-        /* output */
-        TEST_NARROW(putc('c', f));
-        TEST_NARROW(putc_unlocked('c', f));
-        TEST_NARROW(fputc('c', f));
-        TEST_NARROW(fputs("foo", f));
-        TEST_NARROW(fprintf(f, "%s\n", "foo"));
-
-        /* input from stdin */
-        TEST_NARROW_STD(stdin, getchar());
-        TEST_NARROW_STD(stdin, getchar_unlocked());
-        TEST_NARROW_STD(stdin, scanf("%s\n", buffer));
-
-        /* output to stdout */
-        TEST_NARROW_STD(stdout, putchar('c'));
-        TEST_NARROW_STD(stdout, putchar_unlocked('c'));
-        TEST_NARROW_STD(stdout, puts("foo"));
-        TEST_NARROW_STD(stdout, printf("foo"));
-
-        /* word-size ops */
-        /*
-         * fread and fwrite are specified as being implemented in
-         * terms of fgetc() and fputc() and therefore must set the
-         * stream orientation to narrow.
-         */
-        TEST_NARROW(fread(buffer, 4, BUFSIZ / 4, f));
-        TEST_NARROW(fwrite(buffer, 4, BUFSIZ / 4, f));
-
-        /*
-         * getw() and putw() aren't specified anywhere but logically
-         * should behave the same as fread/fwrite.  Not all OSes agree:
-         * Solaris 10 has them not changing the orientation.
-         */
-        TEST_NARROW(getw(f));
-        TEST_NARROW(putw(1234, f));
-
-
-        /* WIDE CHAR TIME! */
-
-        /* input */
-        TEST_WIDE(getwc(f));
-        TEST_WIDE(fgetwc(f));
-        TEST_WIDE(wc = fgetwc(f); ungetwc(wc, f));
-        TEST_WIDE(fgetws(wbuffer, BUFSIZ, f));
-        TEST_WIDE(fwscanf(f, L"%s\n", wbuffer));
-
-        /* output */
-        TEST_WIDE(putwc(L'c', f));
-        TEST_WIDE(fputwc(L'c', f));
-        TEST_WIDE(fputws(L"foo", f));
-        TEST_WIDE(fwprintf(f, L"%s\n", L"foo"));
-
-        /* input from stdin */
-        TEST_WIDE_STD(stdin, getwchar());
-        TEST_WIDE_STD(stdin, wscanf(L"%s\n", wbuffer));
-
-        /* output to stdout */
-        TEST_WIDE_STD(stdout, putwchar(L'c'));
-        TEST_WIDE_STD(stdout, wprintf(L"foo"));
-
-
-        /* memory streams */
-        f = open_memstream(&buf, &size);
-        if (!((r = fwide(f, 0)) < 0))
-                fail(__LINE__, r, "<", "open_memstream()");
-        fclose(f);
-        f = open_wmemstream(&wbuf, &size);
-        if (!((r = fwide(f, 0)) > 0))
-                fail(__LINE__, r, ">", "open_wmemstream()");
-        fclose(f);
-
-
-        /* random stuff? */
-        TEST_UNCHANGED_STD(stderr, perror("foo"));
-
-        remove(filename);
-        if (failures)
-                exit(1);
-        exit(0);
-}
-
diff --git a/src/regress/lib/libc/popen/Makefile b/src/regress/lib/libc/popen/Makefile
deleted file mode 100644
index 25b8668a7a..0000000000
--- a/src/regress/lib/libc/popen/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2002/02/16 01:55:09 art Exp $
-
-PROG=popen
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/popen/popen.c b/src/regress/lib/libc/popen/popen.c
deleted file mode 100644
index 916cb71b03..0000000000
--- a/src/regress/lib/libc/popen/popen.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*      $NetBSD: popen.c,v 1.1 1999/09/30 09:23:23 tron Exp $   */
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthias Scheler.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-
-#include <err.h>
-#include <errno.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-
-#define _PATH_CAT       "/bin/cat"
-#define BUFSIZE         (640*1024)
-                        /* 640KB ought to be enough for everyone. */
-#define DATAFILE        "popen.data"
-
-int
-main(int argc, char **argv)
-{
-        char *buffer, command[MAXPATHLEN];
-        int index, in;
-        FILE *pipe;
-
-        if ((buffer = malloc(BUFSIZE*sizeof(char))) == NULL)
-            err(1, NULL);
-
-        for (index=0; index<BUFSIZE; index++)
-            buffer[index]=arc4random();
-
-        (void)snprintf(command, sizeof(command), "%s >%s",
-                       _PATH_CAT, DATAFILE);
-        if ((pipe = popen(command, "w")) == NULL)
-            err(1, "popen write");
-
-        if (fwrite(buffer, sizeof(char), BUFSIZE, pipe) != BUFSIZE)
-            err(1, "write");
-
-        if (pclose(pipe) == -1)
-            err(1, "pclose");
-
-        (void)snprintf(command, sizeof(command), "%s %s",
-                       _PATH_CAT, DATAFILE);
-        if ((pipe = popen(command, "r")) == NULL)
-            err(1, "popen read");
-
-        index = 0;
-        while ((in = fgetc(pipe)) != EOF)
-            if (index == BUFSIZE) {
-                errno = EFBIG;
-                err(1, "read");
-            }
-            else
-                if ((char)in != buffer[index++]) {
-                    errno = EINVAL;
-                    err(1, "read");
-                }
-
-        if (index < BUFSIZE) {
-            errno = EIO;
-            err(1, "read");
-        }
-
-        if (pclose(pipe) == -1)
-            err(1, "pclose");
-
-        (void)unlink(DATAFILE);
-        return 0;
-}
diff --git a/src/regress/lib/libc/printf/Makefile b/src/regress/lib/libc/printf/Makefile
deleted file mode 100644
index c2e2732d6e..0000000000
--- a/src/regress/lib/libc/printf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2008/09/07 20:36:10 martynas Exp $
-
-PROG=   fp
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/printf/fp.c b/src/regress/lib/libc/printf/fp.c
deleted file mode 100644
index 6ed52fdb49..0000000000
--- a/src/regress/lib/libc/printf/fp.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*      $OpenBSD: fp.c,v 1.1 2008/09/07 20:36:10 martynas Exp $ */
-/*-
- * Copyright (c) 2002, 2005 David Schultz <das@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Test for printf() floating point formats.
- */
-
-#include <assert.h>
-#include <err.h>
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define testfmt(result, fmt, ...)       \
-        _testfmt((result), __LINE__, #__VA_ARGS__, fmt, __VA_ARGS__)
-void _testfmt(const char *, int, const char *, const char *, ...);
-void smash_stack(void);
-
-int
-main(int argc, char *argv[])
-{
-        /*
-         * Basic tests of decimal output functionality.
-         */
-        testfmt(" 1.000000E+00", "%13E", 1.0);
-        testfmt("     1.000000", "%13f", 1.0);
-        testfmt("            1", "%13G", 1.0);
-        testfmt(" 1.000000E+00", "%13LE", 1.0L);
-        testfmt("     1.000000", "%13Lf", 1.0L);
-        testfmt("            1", "%13LG", 1.0L);
-
-        testfmt("2.718282", "%.*f", -2, 2.7182818);
-
-        testfmt("1.234568e+06", "%e", 1234567.8);
-        testfmt("1234567.800000", "%f", 1234567.8);
-        testfmt("1.23457E+06", "%G", 1234567.8);
-        testfmt("1.234568e+06", "%Le", 1234567.8L);
-        testfmt("1234567.800000", "%Lf", 1234567.8L);
-        testfmt("1.23457E+06", "%LG", 1234567.8L);
-
-#if (LDBL_MANT_DIG > DBL_MANT_DIG) && !defined(__i386__)
-        testfmt("123456789.864210", "%Lf", 123456789.8642097531L);
-        testfmt("-1.23457E+08", "%LG", -123456789.8642097531L);
-        testfmt("123456789.8642097531", "%.10Lf", 123456789.8642097531L);
-        testfmt(" 3.141592653589793238e-4000", "%L27.18Le",
-            3.14159265358979323846e-4000L);
-#endif /* (LDBL_MANT_DIG > DBL_MANT_DIG) && !defined(__i386__) */
-
-        /*
-         * Infinities and NaNs
-         */
-#ifdef NAN
-        testfmt("nan", "%e", NAN);
-        testfmt("NAN", "%F", NAN);
-        testfmt("nan", "%g", NAN);
-        testfmt("NAN", "%LE", (long double)NAN);
-        testfmt("  nan", "%05e", NAN);
-#endif /* NAN */
-
-        testfmt("INF", "%E", HUGE_VAL);
-        testfmt("-inf", "%f", -HUGE_VAL);
-        testfmt("+inf", "%+g", HUGE_VAL);
-        testfmt(" inf", "%4.2Le", HUGE_VALL);
-        testfmt("-inf", "%Lf", -HUGE_VALL);
-        testfmt("  inf", "%05e", HUGE_VAL);
-        testfmt(" -inf", "%05e", -HUGE_VAL);
-
-        /*
-         * Padding
-         */
-        testfmt("0.000000e+00", "%e", 0.0);
-        testfmt("0.000000", "%F", (double)0.0);
-        testfmt("0", "%G", 0.0);
-        testfmt("  0", "%3.0Lg", 0.0L);
-        testfmt("    0", "%5.0f", 0.001);
-
-        /*
-         * Precision specifiers
-         */
-        testfmt("1.0123e+00", "%.4e", 1.0123456789);
-        testfmt("1.0123", "%.4f", 1.0123456789);
-        testfmt("1.012", "%.4g", 1.0123456789);
-        testfmt("1.2346e-02", "%.4e", 0.0123456789);
-        testfmt("0.0123", "%.4f", 0.0123456789);
-        testfmt("0.01235", "%.4g", 0.0123456789);
-
-        /*
-         * Signed conversions
-         */
-        testfmt("+2.500000e-01", "%+e", 0.25);
-        testfmt("+0.000000", "%+F", 0.0);
-        testfmt("-1", "%+g", -1.0);
-
-        testfmt("-1.000000e+00", "% e", -1.0);
-        testfmt("+1.000000", "% +f", 1.0);
-        testfmt(" 1", "% g", 1.0);
-        testfmt(" 0", "% g", 0.0);
-
-        /*
-         * ``Alternate form''
-         */
-        testfmt("1.250e+00", "%#.3e", 1.25);
-        testfmt("123.000000", "%#f", 123.0);
-        testfmt(" 12345.", "%#7.5g", 12345.0);
-        testfmt(" 1.00000", "%#8g", 1.0);
-        testfmt("0.0", "%#.2g", 0.0);
-
-        /*
-         * Padding and decimal point placement
-         */
-        testfmt("03.2E+00", "%08.1E", 3.25);
-        testfmt("003.25", "%06.2F", 3.25);
-        testfmt("0003.25", "%07.4G", 3.25);
-
-        testfmt("3.14159e-05", "%g", 3.14159e-5);
-        testfmt("0.000314159", "%g", 3.14159e-4);
-        testfmt("3.14159e+06", "%g", 3.14159e6);
-        testfmt("314159", "%g", 3.14159e5);
-        testfmt("314159.", "%#g", 3.14159e5);
-
-        testfmt(" 9.000000e+03", "%13e", 9000.0);
-        testfmt(" 9000.000000", "%12f", 9000.0);
-        testfmt(" 9000", "%5g", 9000.0);
-        testfmt(" 900000.", "%#8g", 900000.0);
-        testfmt(" 9e+06", "%6g", 9000000.0);
-        testfmt(" 9.000000e-04", "%13e", 0.0009);
-        testfmt(" 0.000900", "%9f", 0.0009);
-        testfmt(" 0.0009", "%7g", 0.0009);
-        testfmt(" 9e-05", "%6g", 0.00009);
-        testfmt(" 9.00000e-05", "%#12g", 0.00009);
-        testfmt(" 9.e-05", "%#7.1g", 0.00009);
-
-        testfmt(" 0.0", "%4.1f", 0.0);
-        testfmt("90.0", "%4.1f", 90.0);
-        testfmt(" 100", "%4.0f", 100.0);
-        testfmt("9.0e+01", "%4.1e", 90.0);
-        testfmt("1e+02", "%4.0e", 100.0);
-
-        /*
-         * Hexadecimal floating point (%a, %A) tests.  Some of these
-         * are only valid if the implementation converts to hex digits
-         * on nibble boundaries.
-         */
-        testfmt("0x0p+0", "%a", 0x0.0p0);
-        testfmt("0X0.P+0", "%#LA", 0x0.0p0L);
-#ifdef NAN
-        testfmt("inf", "%La", (long double)INFINITY);
-        testfmt("+INF", "%+A", INFINITY);
-        testfmt("nan", "%La", (long double)NAN);
-        testfmt("NAN", "%A", NAN);
-#endif /* NAN */
-
-        testfmt(" 0x1.23p+0", "%10a", 0x1.23p0);
-        testfmt(" 0x1.23p-500", "%12a", 0x1.23p-500);
-        testfmt(" 0x1.2p+40", "%10.1a", 0x1.23p40);
-        testfmt(" 0X1.230000000000000000000000P-4", "%32.24A", 0x1.23p-4);
-        testfmt("0x1p-1074", "%a", 0x1p-1074);
-        testfmt("0x1.2345p-1024", "%a", 0x1.2345p-1024);
-
-        return (0);
-}
-
-void
-smash_stack(void)
-{
-        static uint32_t junk = 0xdeadbeef;
-        uint32_t buf[512];
-        int i;
-
-        for (i = 0; i < sizeof(buf) / sizeof(buf[0]); i++)
-                buf[i] = junk;
-}
-
-void
-_testfmt(const char *result, int line, const char *argstr, const char *fmt,...)
-{
-        char s[100];
-        va_list ap;
-
-        va_start(ap, fmt);
-        smash_stack();
-        vsnprintf(s, sizeof(s), fmt, ap);
-        if (strcmp(result, s) != 0) {
-                fprintf(stderr,
-                    "%d: printf(\"%s\", %s) ==> [%s], expected [%s]\n",
-                    line, fmt, argstr, s, result);
-                abort();
-        }
-}
diff --git a/src/regress/lib/libc/qsort/Makefile b/src/regress/lib/libc/qsort/Makefile
deleted file mode 100644
index 473432f423..0000000000
--- a/src/regress/lib/libc/qsort/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2017/05/22 17:16:43 millert Exp $
-
-PROG=   qsort_test
-SRCS=   qsort_test.c antiqsort.c
-CFLAGS+=-Wall
-
-qsort-regress: ${PROG}
-        ./${PROG}
-
-REGRESS_TARGETS=qsort-regress
-.PHONY: ${REGRESS_TARGETS}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/qsort/antiqsort.c b/src/regress/lib/libc/qsort/antiqsort.c
deleted file mode 100644
index cb3b7b2525..0000000000
--- a/src/regress/lib/libc/qsort/antiqsort.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * A Killer Adversary for Quicksort
- * M. D. MCILROY
- * http://www.cs.dartmouth.edu/~doug/mdmspe.pdf
- *
- * For comparison:
- *  Bentley & McIlroy: 4096 items, 1645585 compares
- *  random pivot:      4096 items, 8388649 compares
- *  introsort:         4096 items, 151580 compares
- *  heapsort:          4096 items, 48233 compares
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-static int *val;                                /* item values */
-static int ncmp;                                /* number of comparisons */
-static int nsolid;                              /* number of solid items */
-static int candidate;                           /* pivot candidate */
-static int gas;                                 /* gas value */
-
-#define freeze(x)       (val[(x)] = nsolid++)
-
-static int
-cmp(const void *px, const void *py)
-{
-        const int x = *(const int *)px;
-        const int y = *(const int *)py;
-
-        ncmp++;
-        if (val[x] == gas && val[y] == gas) {
-                if (x == candidate)
-                        freeze(x);
-                else
-                        freeze(y);
-        }
-        if (val[x] == gas)
-                candidate = x;
-        else if (val[y] == gas)
-                candidate = y;
-        return val[x] > val[y] ? 1 : val[x] < val[y] ? -1 : 0;
-}
-
-int
-antiqsort(int n, int *a, int *ptr)
-{
-        int i;
-
-        val = a;
-        gas = n - 1;
-        nsolid = ncmp = candidate = 0;
-        for (i = 0; i < n; i++) {
-                ptr[i] = i;
-                val[i] = gas;
-        }
-        qsort(ptr, n, sizeof(*ptr), cmp);
-        return ncmp;
-}
diff --git a/src/regress/lib/libc/qsort/qsort_test.c b/src/regress/lib/libc/qsort/qsort_test.c
deleted file mode 100644
index 8ab3d9f50d..0000000000
--- a/src/regress/lib/libc/qsort/qsort_test.c
+++ /dev/null
@@ -1,777 +0,0 @@
-/*
- * Copyright (c) 2017 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/time.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <setjmp.h>
-#include <time.h>
-#include <unistd.h>
-#include <err.h>
-
-/*
- * Test program based on Bentley & McIlroy's "Engineering a Sort Function".
- * Uses mergesort(3) to check the results.
- *
- * Additional "killer" input taken from:
- *  David R. Musser's "Introspective Sorting and Selection Algorithms"
- *  http://calmerthanyouare.org/2014/06/11/algorithmic-complexity-attacks-and-libc-qsort.html
- *  M. D. McIlroy's "A Killer Adversary for Quicksort"
- */
-
-/*
- * TODO:
- *      test with unaligned elements (char[]?)
- */
-struct test_distribution {
-        const char *name;
-        void (*fill)(void *x, int n, int m);
-        int (*test)(struct test_distribution *d, int n, void *x, void *y, void *z);
-        int (*cmp)(const void *v1, const void *v2);
-        int (*cmp_checked)(const void *v1, const void *v2);
-};
-
-#define MINIMUM(a, b)   (((a) < (b)) ? (a) : (b))
-#define MAXIMUM(a, b)   (((a) > (b)) ? (a) : (b))
-
-static size_t compares;
-static size_t max_compares;
-static size_t abrt_compares;
-static sigjmp_buf cmpjmp;
-static bool dump_table, timing, verbose;
-
-extern int antiqsort(int n, int *a, int *ptr);
-
-static int
-cmp_i(const void *v1, const void *v2)
-{
-        const int a = *(const int *)v1;
-        const int b = *(const int *)v2;
-
-        return a > b ? 1 : a < b ? -1 : 0;
-}
-
-static int
-cmp_checked_i(const void *v1, const void *v2)
-{
-        const int a = *(const int *)v1;
-        const int b = *(const int *)v2;
-
-        compares++;
-        if (compares > abrt_compares)
-                siglongjmp(cmpjmp, 1);
-        return a > b ? 1 : a < b ? -1 : 0;
-}
-
-static int
-cmp_ll(const void *v1, const void *v2)
-{
-        const long long a = *(const long long *)v1;
-        const long long b = *(const long long *)v2;
-
-        return a > b ? 1 : a < b ? -1 : 0;
-}
-
-static int
-cmp_checked_ll(const void *v1, const void *v2)
-{
-        const long long a = *(const long long *)v1;
-        const long long b = *(const long long *)v2;
-
-        compares++;
-        if (compares > abrt_compares)
-                siglongjmp(cmpjmp, 1);
-        return a > b ? 1 : a < b ? -1 : 0;
-}
-
-static int
-cmp_d(const void *v1, const void *v2)
-{
-        const double a = *(const double *)v1;
-        const double b = *(const double *)v2;
-
-        return a > b ? 1 : a < b ? -1 : 0;
-}
-
-static int
-cmp_checked_d(const void *v1, const void *v2)
-{
-        const double a = *(const double *)v1;
-        const double b = *(const double *)v2;
-
-        compares++;
-        if (compares > abrt_compares)
-                siglongjmp(cmpjmp, 1);
-        return a > b ? 1 : a < b ? -1 : 0;
-}
-
-static int
-check_result(char *sub, size_t es, char *got, char *expected, struct test_distribution *d,
-    int m, int n)
-{
-        int i;
-
-        if (verbose || compares > max_compares) {
-                if (sub != NULL) {
-                        if (m != 0) {
-                                warnx("%s (%s): m: %d, n: %d, %zu compares, "
-                                    "max %zu(%zu)", d->name, sub, m, n,
-                                    compares, max_compares, abrt_compares);
-                        } else {
-                                warnx("%s (%s): n: %d, %zu compares, "
-                                    "max %zu(%zu)", d->name, sub, n,
-                                    compares, max_compares, abrt_compares);
-                        }
-                } else {
-                        if (m != 0) {
-                                warnx("%s: m: %d, n: %d, %zu compares, "
-                                    "max %zu(%zu)", d->name, m, n,
-                                    compares, max_compares, abrt_compares);
-                        } else {
-                                warnx("%s: n: %d, %zu compares, "
-                                    "max %zu(%zu)", d->name, n,
-                                    compares, max_compares, abrt_compares);
-                        }
-                }
-        }
-
-        for (i = 0; i < n; i++) {
-                if (memcmp(got, expected, es) != 0)
-                        break;
-                got += es;
-                expected += es;
-        }
-        if (i == n)
-                return 0;
-
-        if (sub != NULL) {
-                warnx("%s (%s): failure at %d, m: %d, n: %d",
-                    d->name, sub, i, m, n);
-        } else {
-                warnx("%s: failure at %d, m: %d, n: %d",
-                    d->name, i, m, n);
-        }
-        return 1;
-}
-
-#define FILL_SAWTOOTH(x, n, m)  do {                                    \
-        int i;                                                          \
-                                                                        \
-        for (i = 0; i < n; i++)                                         \
-                x[i] = i % m;                                           \
-} while (0)
-
-static void
-fill_sawtooth_i(void *v, int n, int m)
-{
-        int *x = v;
-        FILL_SAWTOOTH(x, n, m);
-}
-
-static void
-fill_sawtooth_ll(void *v, int n, int m)
-{
-        long long *x = v;
-        FILL_SAWTOOTH(x, n, m);
-}
-
-static void
-fill_sawtooth_double(void *v, int n, int m)
-{
-        double *x = v;
-        FILL_SAWTOOTH(x, n, m);
-}
-
-#define FILL_RANDOM(x, n, m)    do {                                    \
-        int i;                                                          \
-                                                                        \
-        for (i = 0; i < n; i++)                                         \
-                x[i] = arc4random_uniform(m);                           \
-} while (0)
-
-
-static void
-fill_random_i(void *v, int n, int m)
-{
-        int *x = v;
-        FILL_RANDOM(x, n, m);
-}
-
-static void
-fill_random_ll(void *v, int n, int m)
-{
-        long long *x = v;
-        FILL_RANDOM(x, n, m);
-}
-
-static void
-fill_random_double(void *v, int n, int m)
-{
-        double *x = v;
-        FILL_RANDOM(x, n, m);
-}
-
-#define FILL_STAGGER(x, n, m)   do {                                    \
-        int i;                                                          \
-                                                                        \
-        for (i = 0; i < n; i++)                                         \
-                x[i] = (i * m + i) % n;                                 \
-} while (0)
-
-
-static void
-fill_stagger_i(void *v, int n, int m)
-{
-        int *x = v;
-        FILL_STAGGER(x, n, m);
-}
-
-static void
-fill_stagger_ll(void *v, int n, int m)
-{
-        long long *x = v;
-        FILL_STAGGER(x, n, m);
-}
-
-static void
-fill_stagger_double(void *v, int n, int m)
-{
-        double *x = v;
-        FILL_STAGGER(x, n, m);
-}
-
-#define FILL_PLATEAU(x, n, m)   do {                                    \
-        int i;                                                          \
-                                                                        \
-        for (i = 0; i < n; i++)                                         \
-                x[i] = MINIMUM(i, m);                                   \
-} while (0)
-
-static void
-fill_plateau_i(void *v, int n, int m)
-{
-        int *x = v;
-        FILL_PLATEAU(x, n, m);
-}
-
-static void
-fill_plateau_ll(void *v, int n, int m)
-{
-        long long *x = v;
-        FILL_PLATEAU(x, n, m);
-}
-
-static void
-fill_plateau_double(void *v, int n, int m)
-{
-        double *x = v;
-        FILL_PLATEAU(x, n, m);
-}
-
-#define FILL_SHUFFLE(x, n, m)   do {                                    \
-        int i, j, k;                                                    \
-                                                                        \
-        for (i = 0, j = 0, k = 1; i < n; i++)                           \
-                x[i] = arc4random_uniform(m) ? (j += 2) : (k += 2);     \
-} while (0)
-
-static void
-fill_shuffle_i(void *v, int n, int m)
-{
-        int *x = v;
-        FILL_SHUFFLE(x, n, m);
-}
-
-static void
-fill_shuffle_ll(void *v, int n, int m)
-{
-        long long *x = v;
-        FILL_SHUFFLE(x, n, m);
-}
-
-static void
-fill_shuffle_double(void *v, int n, int m)
-{
-        double *x = v;
-        FILL_SHUFFLE(x, n, m);
-}
-
-#define FILL_BSD_KILLER(x, n, m)        do {                            \
-        int i, k;                                                       \
-                                                                        \
-        /* 4.4BSD insertion sort optimization killer, Mats Linander */  \
-        k = n / 2;                                                      \
-        for (i = 0; i < n; i++) {                                       \
-                if (i < k)                                              \
-                        x[i] = k - i;                                   \
-                else if (i > k)                                         \
-                        x[i] = n + k + 1 - i;                           \
-                else                                                    \
-                        x[i] = k + 1;                                   \
-        }                                                               \
-} while (0)
-
-static void
-fill_bsd_killer_i(void *v, int n, int m)
-{
-        int *x = v;
-        FILL_BSD_KILLER(x, n, m);
-
-}
-
-static void
-fill_bsd_killer_ll(void *v, int n, int m)
-{
-        long long *x = v;
-        FILL_BSD_KILLER(x, n, m);
-
-}
-
-static void
-fill_bsd_killer_double(void *v, int n, int m)
-{
-        double *x = v;
-        FILL_BSD_KILLER(x, n, m);
-
-}
-
-#define FILL_MED3_KILLER(x, n, m)       do {                            \
-        int i, k;                                                       \
-                                                                        \
-        /*                                                              \
-         * Median of 3 killer, as seen in David R Musser's              \
-         * "Introspective Sorting and Selection Algorithms"             \
-         */                                                             \
-        if (n & 1) {                                                    \
-                /* odd size, store last at end and make even. */        \
-                x[n - 1] = n;                                           \
-                n--;                                                    \
-        }                                                               \
-        k = n / 2;                                                      \
-        for (i = 0; i < n; i++) {                                       \
-                if (i & 1) {                                            \
-                        x[i] = k + x[i - 1];                            \
-                } else {                                                \
-                        x[i] = i + 1;                                   \
-                }                                                       \
-        }                                                               \
-} while (0)
-
-static void
-fill_med3_killer_i(void *v, int n, int m)
-{
-        int *x = v;
-        FILL_MED3_KILLER(x, n, m);
-}
-
-static void
-fill_med3_killer_ll(void *v, int n, int m)
-{
-        long long *x = v;
-        FILL_MED3_KILLER(x, n, m);
-}
-
-static void
-fill_med3_killer_double(void *v, int n, int m)
-{
-        double *x = v;
-        FILL_MED3_KILLER(x, n, m);
-}
-
-static void
-print_timing(struct test_distribution *d, char *sub, int m, int n, double elapsed)
-{
-        if (sub != NULL) {
-                if (m != 0) {
-                        warnx("%s (%s): m: %d, n: %d, %f seconds",
-                            d->name, sub, m, n, elapsed);
-                } else {
-                        warnx("%s (%s): n: %d, %f seconds",
-                            d->name, sub, n, elapsed);
-                }
-        } else {
-                if (m != 0) {
-                        warnx("%s: m: %d, n: %d, %f seconds",
-                            d->name, m, n, elapsed);
-                } else {
-                        warnx("%s: n: %d, %f seconds",
-                            d->name, n, elapsed);
-                }
-        }
-}
-
-static int
-do_test(struct test_distribution *d, char *sub, int m, int n, size_t es, void *y, void *z)
-{
-        int ret = 0;
-        struct timespec before, after;
-
-        compares = 0;
-        if (sigsetjmp(cmpjmp, 1) != 0) {
-                if (sub != NULL) {
-                        warnx("%s (%s): qsort aborted after %zu compares, m: %d, n: %d",
-                            d->name, sub, compares, m, n);
-                } else {
-                        warnx("%s: qsort aborted after %zu compares, m: %d, n: %d",
-                            d->name, compares, m, n);
-                }
-                ret = 1;
-        } else {
-                if (timing)
-                        clock_gettime(CLOCK_MONOTONIC, &before);
-                qsort(y, n, es, d->cmp_checked);
-                if (timing) {
-                        double elapsed;
-                        clock_gettime(CLOCK_MONOTONIC, &after);
-                        timespecsub(&after, &before, &after);
-                        elapsed = after.tv_sec + after.tv_nsec / 1000000000.0;
-                        print_timing(d, sub, m, n, elapsed);
-                }
-                if (check_result(sub, es, y, z, d, m, n) != 0)
-                        ret = 1;
-        }
-        return ret;
-}
-
-#define TEST_PERTURBED(d, n, x, y, z)   do {                            \
-        int i, j, m;                                                    \
-        const int es = sizeof(x[0]);                                    \
-                                                                        \
-        for (m = 1; m < 2 * n; m *= 2) {                                \
-                /* Fill in x[n] modified by m */                        \
-                d->fill(x, n, m);                                       \
-                                                                        \
-                /* Test on copy of x[] */                               \
-                for (i = 0; i < n; i++)                                 \
-                        y[i] = z[i] = x[i];                             \
-                if (mergesort(z, n, es, d->cmp) != 0)                   \
-                        err(1, NULL);                                   \
-                if (do_test(d, "copy", m, n, es, y, z) != 0)            \
-                        ret = 1;                                        \
-                                                                        \
-                /* Test on reversed copy of x[] */                      \
-                for (i = 0, j = n - 1; i < n; i++, j--)                 \
-                        y[i] = z[i] = x[j];                             \
-                if (mergesort(z, n, es, d->cmp) != 0)                   \
-                        err(1, NULL);                                   \
-                if (do_test(d, "reversed", m, n, es, y, z) != 0)        \
-                        ret = 1;                                        \
-                                                                        \
-                /* Test with front half of x[] reversed */              \
-                for (i = 0, j = (n / 2) - 1; i < n / 2; i++, j--)       \
-                        y[i] = z[i] = x[j];                             \
-                for (; i < n; i++)                                      \
-                        y[i] = z[i] = x[i];                             \
-                if (mergesort(z, n, es, d->cmp) != 0)                   \
-                        err(1, NULL);                                   \
-                if (do_test(d, "front reversed", m, n, es, y, z) != 0)  \
-                        ret = 1;                                        \
-                                                                        \
-                /* Test with back half of x[] reversed */               \
-                for (i = 0; i < n / 2; i++)                             \
-                        y[i] = z[i] = x[i];                             \
-                for (j = n - 1; i < n; i++, j--)                        \
-                        y[i] = z[i] = x[j];                             \
-                if (mergesort(z, n, es, d->cmp) != 0)                   \
-                        err(1, NULL);                                   \
-                if (do_test(d, "back reversed", m, n, es, y, z) != 0)   \
-                        ret = 1;                                        \
-                                                                        \
-                /* Test on sorted copy of x[] */                        \
-                if (mergesort(x, n, es, d->cmp) != 0)                   \
-                        err(1, NULL);                                   \
-                for (i = 0; i < n; i++)                                 \
-                        y[i] = x[i];                                    \
-                if (do_test(d, "sorted", m, n, es, y, x) != 0)          \
-                        ret = 1;                                        \
-                                                                        \
-                /* Test with i%5 added to x[i] (dither) */              \
-                for (i = 0, j = n - 1; i < n; i++, j--)                 \
-                        y[i] = z[i] = x[j] + (i % 5);                   \
-                if (mergesort(z, n, es, d->cmp) != 0)                   \
-                        err(1, NULL);                                   \
-                if (do_test(d, "dithered", m, n, es, y, z) != 0)        \
-                        ret = 1;                                        \
-        }                                                               \
-} while (0)
-
-static int
-test_perturbed_i(struct test_distribution *d, int n, void *vx, void *vy, void *vz)
-{
-        int *x = vx;
-        int *y = vx;
-        int *z = vz;
-        int ret = 0;
-
-        TEST_PERTURBED(d, n, x, y, z);
-        return ret;
-}
-
-static int
-test_perturbed_ll(struct test_distribution *d, int n, void *vx, void *vy, void *vz)
-{
-        long long *x = vx;
-        long long *y = vx;
-        long long *z = vz;
-        int ret = 0;
-
-        TEST_PERTURBED(d, n, x, y, z);
-        return ret;
-}
-
-static int
-test_perturbed_double(struct test_distribution *d, int n, void *vx, void *vy, void *vz)
-{
-        double *x = vx;
-        double *y = vx;
-        double *z = vz;
-        int ret = 0;
-
-        TEST_PERTURBED(d, n, x, y, z);
-        return ret;
-}
-
-/*
- * Like TEST_PERTURBED but because the input is tailored to cause
- * quicksort to go quadratic we don't perturb the input.
- */
-#define TEST_SIMPLE(d, n, x, y, z)      do {                            \
-        int i, ret = 0;                                                 \
-                                                                        \
-        /* Fill in x[n] */                                              \
-        d->fill(x, n, 0);                                               \
-                                                                        \
-        /* Make a copy of x[] */                                        \
-        for (i = 0; i < n; i++)                                         \
-                y[i] = z[i] = x[i];                                     \
-        if (mergesort(z, n, sizeof(z[0]), d->cmp) != 0)                 \
-                err(1, NULL);                                           \
-        if (do_test(d, NULL, 0, n, sizeof(x[0]), y, z) != 0)            \
-                ret = 1;                                                \
-} while (0)
-
-static int
-test_simple_i(struct test_distribution *d, int n, void *vx, void *vy, void *vz)
-{
-        int *x = vx;
-        int *y = vx;
-        int *z = vz;
-        int ret = 0;
-
-        TEST_SIMPLE(d, n, x, y, z);
-        return ret;
-}
-
-static int
-test_simple_ll(struct test_distribution *d, int n, void *vx, void *vy, void *vz)
-{
-        long long *x = vx;
-        long long *y = vx;
-        long long *z = vz;
-        int ret = 0;
-
-        TEST_SIMPLE(d, n, x, y, z);
-        return ret;
-}
-
-static int
-test_simple_double(struct test_distribution *d, int n, void *vx, void *vy, void *vz)
-{
-        double *x = vx;
-        double *y = vx;
-        double *z = vz;
-        int ret = 0;
-
-        TEST_SIMPLE(d, n, x, y, z);
-        return ret;
-}
-
-/*
- * Use D. McIlroy's "Killer Adversary for Quicksort"
- * We don't compare the results in this case.
- */
-static int
-test_antiqsort(struct test_distribution *d, int n, void *vx, void *vy, void *vz)
-{
-        struct timespec before, after;
-        int *x = vx;
-        int *y = vx;
-        int i, ret = 0;
-
-        /*
-         * We expect antiqsort to generate > 1.5 * nlgn compares.
-         * If introspection is not used, it will be > 10 * nlgn compares.
-         */
-        if (timing)
-                clock_gettime(CLOCK_MONOTONIC, &before);
-        i = antiqsort(n, x, y);
-        if (timing)
-                clock_gettime(CLOCK_MONOTONIC, &after);
-        if (i > abrt_compares)
-                ret = 1;
-        if (dump_table) {
-                printf("/* %d items, %d compares */\n", n, i);
-                printf("static const int table_%d[] = {", n);
-                for (i = 0; i < n - 1; i++) {
-                        if ((i % 12) == 0)
-                                printf("\n\t");
-                        printf("%4d, ", x[i]);
-                }
-                printf("%4d\n};\n", x[i]);
-        } else {
-                if (timing) {
-                        double elapsed;
-                        timespecsub(&after, &before, &after);
-                        elapsed = after.tv_sec + after.tv_nsec / 1000000000.0;
-                        print_timing(d, NULL, 0, n, elapsed);
-                }
-                if (verbose || ret != 0) {
-                        warnx("%s: n: %d, %d compares, max %zu(%zu)",
-                            d->name, n, i, max_compares, abrt_compares);
-                }
-        }
-
-        return ret;
-}
-
-static struct test_distribution distributions[] = {
-        { "sawtooth_i", fill_sawtooth_i, test_perturbed_i, cmp_i, cmp_checked_i },
-        { "sawtooth_ll", fill_sawtooth_ll, test_perturbed_ll, cmp_ll, cmp_checked_ll },
-        { "sawtooth_d", fill_sawtooth_double, test_perturbed_double, cmp_d, cmp_checked_d },
-        { "random_i", fill_random_i, test_perturbed_i, cmp_i, cmp_checked_i },
-        { "random_ll", fill_random_ll, test_perturbed_ll, cmp_ll, cmp_checked_ll },
-        { "random_d", fill_random_double, test_perturbed_double, cmp_d, cmp_checked_d },
-        { "stagger_i", fill_stagger_i, test_perturbed_i, cmp_i, cmp_checked_i },
-        { "stagger_ll", fill_stagger_ll, test_perturbed_ll, cmp_ll, cmp_checked_ll },
-        { "stagger_d", fill_stagger_double, test_perturbed_double, cmp_d, cmp_checked_d },
-        { "plateau_i", fill_plateau_i, test_perturbed_i, cmp_i, cmp_checked_i },
-        { "plateau_ll", fill_plateau_ll, test_perturbed_ll, cmp_ll, cmp_checked_ll },
-        { "plateau_d", fill_plateau_double, test_perturbed_double, cmp_d, cmp_checked_d },
-        { "shuffle_i", fill_shuffle_i, test_perturbed_i, cmp_i, cmp_checked_i },
-        { "shuffle_ll", fill_shuffle_ll, test_perturbed_ll, cmp_ll, cmp_checked_ll },
-        { "shuffle_d", fill_shuffle_double, test_perturbed_double, cmp_d, cmp_checked_d },
-        { "bsd_killer_i", fill_bsd_killer_i, test_simple_i, cmp_i, cmp_checked_i },
-        { "bsd_killer_ll", fill_bsd_killer_ll, test_simple_ll, cmp_ll, cmp_checked_ll },
-        { "bsd_killer_d", fill_bsd_killer_double, test_simple_double, cmp_d, cmp_checked_d },
-        { "med3_killer_i", fill_med3_killer_i, test_simple_i, cmp_i, cmp_checked_i },
-        { "med3_killer_ll", fill_med3_killer_ll, test_simple_ll, cmp_ll, cmp_checked_ll },
-        { "med3_killer_d", fill_med3_killer_double, test_simple_double, cmp_d, cmp_checked_d },
-        { "antiqsort", NULL, test_antiqsort, cmp_i, cmp_checked_i },
-        { NULL }
-};
-
-static int
-run_tests(int n, const char *name)
-{
-        void *x, *y, *z;
-        int i, nlgn = 0;
-        int ret = 0;
-        size_t es;
-        struct test_distribution *d;
-
-        /*
-         * We expect A*n*lg(n) compares where A is between 1 and 2.
-         * For A > 1.5, print a warning.
-         * For A > 10 abort the test since qsort has probably gone quadratic.
-         */
-        for (i = n - 1; i > 0; i >>= 1)
-            nlgn++;
-        nlgn *= n;
-        max_compares = nlgn * 1.5;
-        abrt_compares = nlgn * 10;
-
-        /* Allocate enough space to store ints or doubles. */
-        es = MAXIMUM(sizeof(int), sizeof(double));
-        x = reallocarray(NULL, n, es);
-        y = reallocarray(NULL, n, es);
-        z = reallocarray(NULL, n, es);
-        if (x == NULL || y == NULL || z == NULL)
-                err(1, NULL);
-
-        for (d = distributions; d->name != NULL; d++) {
-                if (name != NULL && strncmp(name, d->name, strlen(name)) != 0)
-                        continue;
-                if (d->test(d, n, x, y, z) != 0)
-                        ret = 1;
-        }
-
-        free(x);
-        free(y);
-        free(z);
-        return ret;
-}
-
-__dead void
-usage(void)
-{
-        fprintf(stderr, "usage: qsort_test [-dvt] [-n test_name] [num ...]\n");
-        exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        char *nums[] = { "100", "1023", "1024", "1025", "4095", "4096", "4097" };
-        struct test_distribution *d;
-        int ch, n, ret = 0;
-        char *name = NULL;
-
-        while ((ch = getopt(argc, argv, "dn:tv")) != -1) {
-                switch (ch) {
-                case 'd':
-                        dump_table = true;
-                        break;
-                case 'n':
-                        for (d = distributions; d->name != NULL; d++) {
-                                if (strncmp(optarg, d->name, strlen(optarg)) == 0)
-                                        break;
-                        }
-                        if (d->name == NULL)
-                                errx(1, "unknown test %s", optarg);
-                        name = optarg;
-                        break;
-                case 't':
-                        timing = true;
-                        break;
-                case 'v':
-                        verbose = true;
-                        break;
-                default:
-                        usage();
-                        break;
-                }
-        }
-        argc -= optind;
-        argv += optind;
-
-        if (argc == 0) {
-                argv = nums;
-                argc = sizeof(nums) / sizeof(nums[0]);
-        }
-
-        while (argc > 0) {
-                n = atoi(*argv);
-                if (run_tests(n, name) != 0)
-                        ret = 1;
-                argc--;
-                argv++;
-        }
-
-        return ret;
-}
diff --git a/src/regress/lib/libc/regex/Makefile b/src/regress/lib/libc/regex/Makefile
deleted file mode 100644
index 5b9a080209..0000000000
--- a/src/regress/lib/libc/regex/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#       $OpenBSD: Makefile,v 1.11 2017/04/16 16:01:05 kettenis Exp $
-#       $NetBSD: Makefile,v 1.2 1995/02/16 19:38:45 cgd Exp $
-
-PROG=   re
-SRCS=   main.c split.c debug.c regcomp.c regerror.c regexec.c regfree.c
-.PATH: ${.CURDIR}/../../../../lib/libc/regex
-CLEANFILES += t_exhaust
-
-CFLAGS+= -I${.CURDIR}/../../../../lib/libc/regex -DREDEBUG -DPOSIX_MISTAKE
-CFLAGS+= -D'DEF_WEAK(x)=asm("")'
-
-TESTS=  ${.CURDIR}/tests
-
-REGRESS_TARGETS = do-reg do-reg-long do-reg-backref
-# cannot run with large limits
-#REGRESS_TARGETS += do-t_exhaust
-
-do-reg: ${PROG}
-        ./re < ${TESTS}
-do-reg-long: ${PROG}
-        ./re -el < ${TESTS}
-do-reg-backref: ${PROG}
-        ./re -er < ${TESTS}
-#do-t_exhaust: t_exhaust
-#       ./t_exhaust
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/regex/debug.c b/src/regress/lib/libc/regex/debug.c
deleted file mode 100644
index 11129e7249..0000000000
--- a/src/regress/lib/libc/regex/debug.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*      $OpenBSD: debug.c,v 1.4 2003/07/31 21:48:03 deraadt Exp $       */
-/*      $NetBSD: debug.c,v 1.2 1995/04/20 22:39:42 cgd Exp $    */
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <regex.h>
-
-#include "utils.h"
-#include "regex2.h"
-#include "debug.ih"
-
-/*
- - regprint - print a regexp for debugging
- == void regprint(regex_t *r, FILE *d);
- */
-void
-regprint(r, d)
-regex_t *r;
-FILE *d;
-{
-        register struct re_guts *g = r->re_g;
-        register int i;
-        register int c;
-        register int last;
-        int nincat[NC];
-
-        fprintf(d, "%ld states, %d categories", (long)g->nstates,
-                                                        g->ncategories);
-        fprintf(d, ", first %ld last %ld", (long)g->firststate,
-                                                (long)g->laststate);
-        if (g->iflags&USEBOL)
-                fprintf(d, ", USEBOL");
-        if (g->iflags&USEEOL)
-                fprintf(d, ", USEEOL");
-        if (g->iflags&BAD)
-                fprintf(d, ", BAD");
-        if (g->nsub > 0)
-                fprintf(d, ", nsub=%ld", (long)g->nsub);
-        if (g->must != NULL)
-                fprintf(d, ", must(%ld) `%*s'", (long)g->mlen, (int)g->mlen,
-                                                                g->must);
-        if (g->backrefs)
-                fprintf(d, ", backrefs");
-        if (g->nplus > 0)
-                fprintf(d, ", nplus %ld", (long)g->nplus);
-        fprintf(d, "\n");
-        s_print(g, d);
-        for (i = 0; i < g->ncategories; i++) {
-                nincat[i] = 0;
-                for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-                        if (g->categories[c] == i)
-                                nincat[i]++;
-        }
-        fprintf(d, "cc0#%d", nincat[0]);
-        for (i = 1; i < g->ncategories; i++)
-                if (nincat[i] == 1) {
-                        for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-                                if (g->categories[c] == i)
-                                        break;
-                        fprintf(d, ", %d=%s", i, regchar(c));
-                }
-        fprintf(d, "\n");
-        for (i = 1; i < g->ncategories; i++)
-                if (nincat[i] != 1) {
-                        fprintf(d, "cc%d\t", i);
-                        last = -1;
-                        for (c = CHAR_MIN; c <= CHAR_MAX+1; c++)        /* +1 does flush */
-                                if (c <= CHAR_MAX && g->categories[c] == i) {
-                                        if (last < 0) {
-                                                fprintf(d, "%s", regchar(c));
-                                                last = c;
-                                        }
-                                } else {
-                                        if (last >= 0) {
-                                                if (last != c-1)
-                                                        fprintf(d, "-%s",
-                                                                regchar(c-1));
-                                                last = -1;
-                                        }
-                                }
-                        fprintf(d, "\n");
-                }
-}
-
-/*
- - s_print - print the strip for debugging
- == static void s_print(register struct re_guts *g, FILE *d);
- */
-static void
-s_print(g, d)
-register struct re_guts *g;
-FILE *d;
-{
-        register sop *s;
-        register cset *cs;
-        register int i;
-        register int done = 0;
-        register sop opnd;
-        register int col = 0;
-        register int last;
-        register sopno offset = 2;
-#       define  GAP()   {       if (offset % 5 == 0) { \
-                                        if (col > 40) { \
-                                                fprintf(d, "\n\t"); \
-                                                col = 0; \
-                                        } else { \
-                                                fprintf(d, " "); \
-                                                col++; \
-                                        } \
-                                } else \
-                                        col++; \
-                                offset++; \
-                        }
-
-        if (OP(g->strip[0]) != OEND)
-                fprintf(d, "missing initial OEND!\n");
-        for (s = &g->strip[1]; !done; s++) {
-                opnd = OPND(*s);
-                switch (OP(*s)) {
-                case OEND:
-                        fprintf(d, "\n");
-                        done = 1;
-                        break;
-                case OCHAR:
-                        if (strchr("\\|()^$.[+*?{}!<> ", (char)opnd) != NULL)
-                                fprintf(d, "\\%c", (char)opnd);
-                        else
-                                fprintf(d, "%s", regchar((char)opnd));
-                        break;
-                case OBOL:
-                        fprintf(d, "^");
-                        break;
-                case OEOL:
-                        fprintf(d, "$");
-                        break;
-                case OBOW:
-                        fprintf(d, "\\{");
-                        break;
-                case OEOW:
-                        fprintf(d, "\\}");
-                        break;
-                case OANY:
-                        fprintf(d, ".");
-                        break;
-                case OANYOF:
-                        fprintf(d, "[(%ld)", (long)opnd);
-                        cs = &g->sets[opnd];
-                        last = -1;
-                        for (i = 0; i < g->csetsize+1; i++)     /* +1 flushes */
-                                if (CHIN(cs, i) && i < g->csetsize) {
-                                        if (last < 0) {
-                                                fprintf(d, "%s", regchar(i));
-                                                last = i;
-                                        }
-                                } else {
-                                        if (last >= 0) {
-                                                if (last != i-1)
-                                                        fprintf(d, "-%s",
-                                                                regchar(i-1));
-                                                last = -1;
-                                        }
-                                }
-                        fprintf(d, "]");
-                        break;
-                case OBACK_:
-                        fprintf(d, "(\\<%ld>", (long)opnd);
-                        break;
-                case O_BACK:
-                        fprintf(d, "<%ld>\\)", (long)opnd);
-                        break;
-                case OPLUS_:
-                        fprintf(d, "(+");
-                        if (OP(*(s+opnd)) != O_PLUS)
-                                fprintf(d, "<%ld>", (long)opnd);
-                        break;
-                case O_PLUS:
-                        if (OP(*(s-opnd)) != OPLUS_)
-                                fprintf(d, "<%ld>", (long)opnd);
-                        fprintf(d, "+)");
-                        break;
-                case OQUEST_:
-                        fprintf(d, "(?");
-                        if (OP(*(s+opnd)) != O_QUEST)
-                                fprintf(d, "<%ld>", (long)opnd);
-                        break;
-                case O_QUEST:
-                        if (OP(*(s-opnd)) != OQUEST_)
-                                fprintf(d, "<%ld>", (long)opnd);
-                        fprintf(d, "?)");
-                        break;
-                case OLPAREN:
-                        fprintf(d, "((<%ld>", (long)opnd);
-                        break;
-                case ORPAREN:
-                        fprintf(d, "<%ld>))", (long)opnd);
-                        break;
-                case OCH_:
-                        fprintf(d, "<");
-                        if (OP(*(s+opnd)) != OOR2)
-                                fprintf(d, "<%ld>", (long)opnd);
-                        break;
-                case OOR1:
-                        if (OP(*(s-opnd)) != OOR1 && OP(*(s-opnd)) != OCH_)
-                                fprintf(d, "<%ld>", (long)opnd);
-                        fprintf(d, "|");
-                        break;
-                case OOR2:
-                        fprintf(d, "|");
-                        if (OP(*(s+opnd)) != OOR2 && OP(*(s+opnd)) != O_CH)
-                                fprintf(d, "<%ld>", (long)opnd);
-                        break;
-                case O_CH:
-                        if (OP(*(s-opnd)) != OOR1)
-                                fprintf(d, "<%ld>", (long)opnd);
-                        fprintf(d, ">");
-                        break;
-                default:
-                        fprintf(d, "!%ld(%ld)!", (long)OP(*s), (long)opnd);
-                        break;
-                }
-                if (!done)
-                        GAP();
-        }
-}
-
-/*
- - regchar - make a character printable
- == static char *regchar(int ch);
- */
-static char *                   /* -> representation */
-regchar(ch)
-int ch;
-{
-        static char buf[10];
-
-        if (isprint(ch) || ch == ' ')
-                snprintf(buf, sizeof buf, "%c", ch);
-        else
-                snprintf(buf, sizeof buf, "\\%o", ch);
-        return(buf);
-}
diff --git a/src/regress/lib/libc/regex/debug.ih b/src/regress/lib/libc/regex/debug.ih
deleted file mode 100644
index 9eb313af23..0000000000
--- a/src/regress/lib/libc/regex/debug.ih
+++ /dev/null
@@ -1,17 +0,0 @@
-/*      $OpenBSD: debug.ih,v 1.3 2002/02/16 21:27:32 millert Exp $      */
-/*      $NetBSD: debug.ih,v 1.2 1995/04/20 22:39:47 cgd Exp $   */
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === debug.c === */
-void regprint(regex_t *r, FILE *d);
-static void s_print(register struct re_guts *g, FILE *d);
-static char *regchar(int ch);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
diff --git a/src/regress/lib/libc/regex/main.c b/src/regress/lib/libc/regex/main.c
deleted file mode 100644
index d6787d88fc..0000000000
--- a/src/regress/lib/libc/regex/main.c
+++ /dev/null
@@ -1,519 +0,0 @@
-/*      $OpenBSD: main.c,v 1.10 2016/07/13 06:17:11 guenther Exp $      */
-/*      $NetBSD: main.c,v 1.2 1995/04/20 22:39:51 cgd Exp $     */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <assert.h>
-#include <unistd.h>
-
-#include "main.ih"
-
-char *progname;
-int debug = 0;
-int line = 0;
-int status = 0;
-
-int copts = REG_EXTENDED;
-int eopts = 0;
-regoff_t startoff = 0;
-regoff_t endoff = 0;
-
-
-extern int split(char *, char *[], int, char *);
-extern void regprint(regex_t *, FILE *);
-
-/*
- - main - do the simple case, hand off to regress() for regression
- */
-int
-main(int argc, char *argv[])
-
-{
-        regex_t re;
-#       define  NS      10
-        regmatch_t subs[NS];
-        char erbuf[100];
-        int err;
-        size_t len;
-        int c;
-        int errflg = 0;
-        register int i;
-        extern int optind;
-        extern char *optarg;
-
-        progname = argv[0];
-
-        while ((c = getopt(argc, argv, "c:E:e:S:x")) != -1)
-                switch (c) {
-                case 'c':       /* compile options */
-                        copts = options('c', optarg);
-                        break;
-                case 'E':       /* end offset */
-                        endoff = (regoff_t)atoi(optarg);
-                        break;
-                case 'e':       /* execute options */
-                        eopts = options('e', optarg);
-                        break;
-                case 'S':       /* start offset */
-                        startoff = (regoff_t)atoi(optarg);
-                        break;
-                case 'x':       /* Debugging. */
-                        debug++;
-                        break;
-                case '?':
-                default:
-                        errflg++;
-                        break;
-                }
-        if (errflg) {
-                fprintf(stderr, "usage: %s ", progname);
-                fprintf(stderr, "[-x] [-c copt] [-E endoff] [-e eopt] [-S startoff] [re]\n");
-                exit(2);
-        }
-
-        if (optind >= argc) {
-                regress(stdin);
-                exit(status);
-        }
-
-        err = regcomp(&re, argv[optind++], copts);
-        if (err) {
-                len = regerror(err, &re, erbuf, sizeof(erbuf));
-                fprintf(stderr, "error %s, %zu/%zu `%s'\n",
-                        eprint(err), len, sizeof(erbuf), erbuf);
-                exit(status);
-        }
-        regprint(&re, stdout);  
-
-        if (optind >= argc) {
-                regfree(&re);
-                exit(status);
-        }
-
-        if (eopts&REG_STARTEND) {
-                subs[0].rm_so = startoff;
-                subs[0].rm_eo = strlen(argv[optind]) - endoff;
-        }
-        err = regexec(&re, argv[optind], (size_t)NS, subs, eopts);
-        if (err) {
-                len = regerror(err, &re, erbuf, sizeof(erbuf));
-                fprintf(stderr, "error %s, %zu/%zu `%s'\n",
-                        eprint(err), len, sizeof(erbuf), erbuf);
-                exit(status);
-        }
-        if (!(copts&REG_NOSUB)) {
-                len = (size_t)(subs[0].rm_eo - subs[0].rm_so);
-                if (subs[0].rm_so != -1) {
-                        if (len != 0)
-                                printf("match `%.*s'\n", (int)len,
-                                        argv[optind] + subs[0].rm_so);
-                        else
-                                printf("match `'@%.1s\n",
-                                        argv[optind] + subs[0].rm_so);
-                }
-                for (i = 1; i < NS; i++)
-                        if (subs[i].rm_so != -1)
-                                printf("(%d) `%.*s'\n", i,
-                                        (int)(subs[i].rm_eo - subs[i].rm_so),
-                                        argv[optind] + subs[i].rm_so);
-        }
-        exit(status);
-}
-
-/*
- - regress - main loop of regression test
- == void regress(FILE *in);
- */
-void
-regress(in)
-FILE *in;
-{
-        char inbuf[1000];
-#       define  MAXF    10
-        char *f[MAXF];
-        int nf;
-        int i;
-        char erbuf[100];
-        size_t ne;
-        char *badpat = "invalid regular expression";
-#       define  SHORT   10
-        char *bpname = "REG_BADPAT";
-        regex_t re;
-
-        while (fgets(inbuf, sizeof(inbuf), in) != NULL) {
-                line++;
-                if (inbuf[0] == '#' || inbuf[0] == '\n')
-                        continue;                       /* NOTE CONTINUE */
-                inbuf[strcspn(inbuf, "\n")] = '\0';     /* get rid of stupid \n */
-                if (debug)
-                        fprintf(stdout, "%d:\n", line);
-                nf = split(inbuf, f, MAXF, "\t\t");
-                if (nf < 3) {
-                        fprintf(stderr, "bad input, line %d\n", line);
-                        exit(1);
-                }
-                for (i = 0; i < nf; i++)
-                        if (strcmp(f[i], "\"\"") == 0)
-                                f[i] = "";
-                if (nf <= 3)
-                        f[3] = NULL;
-                if (nf <= 4)
-                        f[4] = NULL;
-                try(f[0], f[1], f[2], f[3], f[4], options('c', f[1]));
-                if (opt('&', f[1]))     /* try with either type of RE */
-                        try(f[0], f[1], f[2], f[3], f[4],
-                                        options('c', f[1]) &~ REG_EXTENDED);
-        }
-
-        ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
-        if (strcmp(erbuf, badpat) != 0 || ne != strlen(badpat)+1) {
-                fprintf(stderr, "end: regerror() test gave `%s' not `%s'\n",
-                                                        erbuf, badpat);
-                status = 1;
-        }
-        ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, (size_t)SHORT);
-        if (strncmp(erbuf, badpat, SHORT-1) != 0 || erbuf[SHORT-1] != '\0' ||
-                                                ne != strlen(badpat)+1) {
-                fprintf(stderr, "end: regerror() short test gave `%s' not `%.*s'\n",
-                                                erbuf, SHORT-1, badpat);
-                status = 1;
-        }
-        ne = regerror(REG_ITOA|REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
-        if (strcmp(erbuf, bpname) != 0 || ne != strlen(bpname)+1) {
-                fprintf(stderr, "end: regerror() ITOA test gave `%s' not `%s'\n",
-                                                erbuf, bpname);
-                status = 1;
-        }
-        re.re_endp = bpname;
-        ne = regerror(REG_ATOI, &re, erbuf, sizeof(erbuf));
-        if (atoi(erbuf) != (int)REG_BADPAT) {
-                fprintf(stderr, "end: regerror() ATOI test gave `%s' not `%ld'\n",
-                                                erbuf, (long)REG_BADPAT);
-                status = 1;
-        } else if (ne != strlen(erbuf)+1) {
-                fprintf(stderr, "end: regerror() ATOI test len(`%s') = %ld\n",
-                                                erbuf, (long)REG_BADPAT);
-                status = 1;
-        }
-}
-
-/*
- - try - try it, and report on problems
- == void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
- */
-void
-try(f0, f1, f2, f3, f4, opts)
-char *f0;
-char *f1;
-char *f2;
-char *f3;
-char *f4;
-int opts;                       /* may not match f1 */
-{
-        regex_t re;
-#       define  NSUBS   10
-        regmatch_t subs[NSUBS];
-#       define  NSHOULD 15
-        char *should[NSHOULD];
-        int nshould;
-        char erbuf[100];
-        int err;
-        int len;
-        char *type = (opts & REG_EXTENDED) ? "ERE" : "BRE";
-        register int i;
-        char *grump;
-        char f0copy[1000];
-        char f2copy[1000];
-
-        strlcpy(f0copy, f0, sizeof f0copy);
-        re.re_endp = (opts&REG_PEND) ? f0copy + strlen(f0copy) : NULL;
-        fixstr(f0copy);
-        err = regcomp(&re, f0copy, opts);
-        if (err != 0 && (!opt('C', f1) || err != efind(f2))) {
-                /* unexpected error or wrong error */
-                len = regerror(err, &re, erbuf, sizeof(erbuf));
-                fprintf(stderr, "%d: %s error %s, %d/%zu `%s'\n",
-                                        line, type, eprint(err), len,
-                                        sizeof(erbuf), erbuf);
-                status = 1;
-        } else if (err == 0 && opt('C', f1)) {
-                /* unexpected success */
-                fprintf(stderr, "%d: %s should have given REG_%s\n",
-                                                line, type, f2);
-                status = 1;
-                err = 1;        /* so we won't try regexec */
-        }
-
-        if (err != 0) {
-                regfree(&re);
-                return;
-        }
-
-        strlcpy(f2copy, f2, sizeof f2copy);
-        fixstr(f2copy);
-
-        if (options('e', f1)&REG_STARTEND) {
-                if (strchr(f2, '(') == NULL || strchr(f2, ')') == NULL)
-                        fprintf(stderr, "%d: bad STARTEND syntax\n", line);
-                subs[0].rm_so = strchr(f2, '(') - f2 + 1;
-                subs[0].rm_eo = strchr(f2, ')') - f2;
-                /* the preceding character is relevant with REG_NOTBOL */
-                f2copy[subs[0].rm_so - 1] = subs[0].rm_so > 1 ?
-                    f2copy[subs[0].rm_so - 2] : 'X';
-        }
-        err = regexec(&re, f2copy, NSUBS, subs, options('e', f1));
-
-        if (err != 0 && (f3 != NULL || err != REG_NOMATCH)) {
-                /* unexpected error or wrong error */
-                len = regerror(err, &re, erbuf, sizeof(erbuf));
-                fprintf(stderr, "%d: %s exec error %s, %d/%zu `%s'\n",
-                                        line, type, eprint(err), len,
-                                        sizeof(erbuf), erbuf);
-                status = 1;
-        } else if (err != 0) {
-                /* nothing more to check */
-        } else if (f3 == NULL) {
-                /* unexpected success */
-                fprintf(stderr, "%d: %s exec should have failed\n",
-                                                line, type);
-                status = 1;
-                err = 1;                /* just on principle */
-        } else if (opts&REG_NOSUB) {
-                /* nothing more to check */
-        } else if ((grump = check(f2, subs[0], f3)) != NULL) {
-                fprintf(stderr, "%d: %s %s\n", line, type, grump);
-                status = 1;
-                err = 1;
-        }
-
-        if (err != 0 || f4 == NULL) {
-                regfree(&re);
-                return;
-        }
-
-        for (i = 1; i < NSHOULD; i++)
-                should[i] = NULL;
-        nshould = split(f4, should+1, NSHOULD-1, ",");
-        if (nshould == 0) {
-                nshould = 1;
-                should[1] = "";
-        }
-        for (i = 1; i < NSUBS; i++) {
-                grump = check(f2, subs[i], should[i]);
-                if (grump != NULL) {
-                        fprintf(stderr, "%d: %s $%d %s\n", line,
-                                                        type, i, grump);
-                        status = 1;
-                        err = 1;
-                }
-        }
-
-        regfree(&re);
-}
-
-/*
- - options - pick options out of a regression-test string
- == int options(int type, char *s);
- */
-int
-options(type, s)
-int type;                       /* 'c' compile, 'e' exec */
-char *s;
-{
-        register char *p;
-        register int o = (type == 'c') ? copts : eopts;
-        register char *legal = (type == 'c') ? "bisnmp" : "^$#tl";
-
-        for (p = s; *p != '\0'; p++)
-                if (strchr(legal, *p) != NULL)
-                        switch (*p) {
-                        case 'b':
-                                o &= ~REG_EXTENDED;
-                                break;
-                        case 'i':
-                                o |= REG_ICASE;
-                                break;
-                        case 's':
-                                o |= REG_NOSUB;
-                                break;
-                        case 'n':
-                                o |= REG_NEWLINE;
-                                break;
-                        case 'm':
-                                o &= ~REG_EXTENDED;
-                                o |= REG_NOSPEC;
-                                break;
-                        case 'p':
-                                o |= REG_PEND;
-                                break;
-                        case '^':
-                                o |= REG_NOTBOL;
-                                break;
-                        case '$':
-                                o |= REG_NOTEOL;
-                                break;
-                        case '#':
-                                o |= REG_STARTEND;
-                                break;
-                        case 't':       /* trace */
-                                o |= REG_TRACE;
-                                break;
-                        case 'l':       /* force long representation */
-                                o |= REG_LARGE;
-                                break;
-                        case 'r':       /* force backref use */
-                                o |= REG_BACKR;
-                                break;
-                        }
-        return(o);
-}
-
-/*
- - opt - is a particular option in a regression string?
- == int opt(int c, char *s);
- */
-int                             /* predicate */
-opt(c, s)
-int c;
-char *s;
-{
-        return(strchr(s, c) != NULL);
-}
-
-/*
- - fixstr - transform magic characters in strings
- == void fixstr(register char *p);
- */
-void
-fixstr(p)
-register char *p;
-{
-        if (p == NULL)
-                return;
-
-        for (; *p != '\0'; p++)
-                if (*p == 'N')
-                        *p = '\n';
-                else if (*p == 'T')
-                        *p = '\t';
-                else if (*p == 'S')
-                        *p = ' ';
-                else if (*p == 'Z')
-                        *p = '\0';
-}
-
-/*
- - check - check a substring match
- == char *check(char *str, regmatch_t sub, char *should);
- */
-char *                          /* NULL or complaint */
-check(str, sub, should)
-char *str;
-regmatch_t sub;
-char *should;
-{
-        register int len;
-        register int shlen;
-        register char *p;
-        static char grump[500];
-        register char *at = NULL;
-
-        if (should != NULL && strcmp(should, "-") == 0)
-                should = NULL;
-        if (should != NULL && should[0] == '@') {
-                at = should + 1;
-                should = "";
-        }
-
-        /* check rm_so and rm_eo for consistency */
-        if (sub.rm_so > sub.rm_eo || (sub.rm_so == -1 && sub.rm_eo != -1) ||
-                                (sub.rm_so != -1 && sub.rm_eo == -1) ||
-                                (sub.rm_so != -1 && sub.rm_so < 0) ||
-                                (sub.rm_eo != -1 && sub.rm_eo < 0) ) {
-                snprintf(grump, sizeof grump,
-                    "start %ld end %ld", (long)sub.rm_so,
-                    (long)sub.rm_eo);
-                return(grump);
-        }
-
-        /* check for no match */
-        if (sub.rm_so == -1 && should == NULL)
-                return(NULL);
-        if (sub.rm_so == -1)
-                return("did not match");
-
-        /* check for in range */
-        if (sub.rm_eo > strlen(str)) {
-                snprintf(grump, sizeof grump,
-                        "start %ld end %ld, past end of string",
-                        (long)sub.rm_so, (long)sub.rm_eo);
-                return(grump);
-        }
-
-        len = (int)(sub.rm_eo - sub.rm_so);
-        p = str + sub.rm_so;
-
-        /* check for not supposed to match */
-        if (should == NULL) {
-                snprintf(grump, sizeof grump, "matched `%.*s'", len, p);
-                return(grump);
-        }
-
-        /* check for wrong match */
-        shlen = (int)strlen(should);
-        if (len != shlen || strncmp(p, should, (size_t)shlen) != 0) {
-                snprintf(grump, sizeof grump, "matched `%.*s' instead", len, p);
-                return(grump);
-        }
-        if (shlen > 0)
-                return(NULL);
-
-        /* check null match in right place */
-        if (at == NULL)
-                return(NULL);
-        shlen = strlen(at);
-        if (shlen == 0)
-                shlen = 1;      /* force check for end-of-string */
-        if (strncmp(p, at, shlen) != 0) {
-                snprintf(grump, sizeof grump, "matched null at `%.20s'", p);
-                return(grump);
-        }
-        return(NULL);
-}
-
-/*
- - eprint - convert error number to name
- == static char *eprint(int err);
- */
-static char *
-eprint(err)
-int err;
-{
-        static char epbuf[100];
-        size_t len;
-
-        len = regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
-        assert(len <= sizeof(epbuf));
-        return(epbuf);
-}
-
-/*
- - efind - convert error name to number
- == static int efind(char *name);
- */
-static int
-efind(name)
-char *name;
-{
-        static char efbuf[100];
-        regex_t re;
-
-        snprintf(efbuf, sizeof efbuf, "REG_%s", name);
-        assert(strlen(efbuf) < sizeof(efbuf));
-        re.re_endp = efbuf;
-        (void) regerror(REG_ATOI, &re, efbuf, sizeof(efbuf));
-        return(atoi(efbuf));
-}
diff --git a/src/regress/lib/libc/regex/main.ih b/src/regress/lib/libc/regex/main.ih
deleted file mode 100644
index 0860e26333..0000000000
--- a/src/regress/lib/libc/regex/main.ih
+++ /dev/null
@@ -1,22 +0,0 @@
-/*      $OpenBSD: main.ih,v 1.3 2002/02/16 21:27:32 millert Exp $       */
-/*      $NetBSD: main.ih,v 1.2 1995/04/20 22:39:55 cgd Exp $    */
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === main.c === */
-void regress(FILE *in);
-void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
-int options(int type, char *s);
-int opt(int c, char *s);
-void fixstr(register char *p);
-char *check(char *str, regmatch_t sub, char *should);
-static char *eprint(int err);
-static int efind(char *name);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
diff --git a/src/regress/lib/libc/regex/split.c b/src/regress/lib/libc/regex/split.c
deleted file mode 100644
index fcd81a3503..0000000000
--- a/src/regress/lib/libc/regex/split.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/*      $OpenBSD: split.c,v 1.5 2007/09/09 23:25:12 chl Exp $   */
-/*      $NetBSD: split.c,v 1.2 1995/04/20 22:39:57 cgd Exp $    */
-
-#include <stdio.h>
-#include <string.h>
-
-int split(char *string, char *fields[], int nfields, char *sep);
-
-/*
- - split - divide a string into fields, like awk split()
- = int split(char *string, char *fields[], int nfields, char *sep);
- */
-int                             /* number of fields, including overflow */
-split(char *string, char *fields[], int nfields, char *sep)
-{
-        register char *p = string;
-        register char c;                        /* latest character */
-        register char sepc = sep[0];
-        register char sepc2;
-        register int fn;
-        register char **fp = fields;
-        register char *sepp;
-        register int trimtrail;
-
-        /* white space */
-        if (sepc == '\0') {
-                while ((c = *p++) == ' ' || c == '\t')
-                        continue;
-                p--;
-                trimtrail = 1;
-                sep = " \t";    /* note, code below knows this is 2 long */
-                sepc = ' ';
-        } else
-                trimtrail = 0;
-        sepc2 = sep[1];         /* now we can safely pick this up */
-
-        /* catch empties */
-        if (*p == '\0')
-                return(0);
-
-        /* single separator */
-        if (sepc2 == '\0') {
-                fn = nfields;
-                for (;;) {
-                        *fp++ = p;
-                        fn--;
-                        if (fn == 0)
-                                break;
-                        while ((c = *p++) != sepc)
-                                if (c == '\0')
-                                        return(nfields - fn);
-                        *(p-1) = '\0';
-                }
-                /* we have overflowed the fields vector -- just count them */
-                fn = nfields;
-                for (;;) {
-                        while ((c = *p++) != sepc)
-                                if (c == '\0')
-                                        return(fn);
-                        fn++;
-                }
-                /* not reached */
-        }
-
-        /* two separators */
-        if (sep[2] == '\0') {
-                fn = nfields;
-                for (;;) {
-                        *fp++ = p;
-                        fn--;
-                        while ((c = *p++) != sepc && c != sepc2)
-                                if (c == '\0') {
-                                        if (trimtrail && **(fp-1) == '\0')
-                                                fn++;
-                                        return(nfields - fn);
-                                }
-                        if (fn == 0)
-                                break;
-                        *(p-1) = '\0';
-                        while ((c = *p++) == sepc || c == sepc2)
-                                continue;
-                        p--;
-                }
-                /* we have overflowed the fields vector -- just count them */
-                fn = nfields;
-                while (c != '\0') {
-                        while ((c = *p++) == sepc || c == sepc2)
-                                continue;
-                        p--;
-                        fn++;
-                        while ((c = *p++) != '\0' && c != sepc && c != sepc2)
-                                continue;
-                }
-                /* might have to trim trailing white space */
-                if (trimtrail) {
-                        p--;
-                        while ((c = *--p) == sepc || c == sepc2)
-                                continue;
-                        p++;
-                        if (*p != '\0') {
-                                if (fn == nfields+1)
-                                        *p = '\0';
-                                fn--;
-                        }
-                }
-                return(fn);
-        }
-
-        /* n separators */
-        fn = 0;
-        for (;;) {
-                if (fn < nfields)
-                        *fp++ = p;
-                fn++;
-                for (;;) {
-                        c = *p++;
-                        if (c == '\0')
-                                return(fn);
-                        sepp = sep;
-                        while ((sepc = *sepp++) != '\0' && sepc != c)
-                                continue;
-                        if (sepc != '\0')       /* it was a separator */
-                                break;
-                }
-                if (fn < nfields)
-                        *(p-1) = '\0';
-                for (;;) {
-                        c = *p++;
-                        sepp = sep;
-                        while ((sepc = *sepp++) != '\0' && sepc != c)
-                                continue;
-                        if (sepc == '\0')       /* it wasn't a separator */
-                                break;
-                }
-                p--;
-        }
-
-        /* not reached */
-}
-
-#ifdef TEST_SPLIT
-
-
-/*
- * test program
- * pgm          runs regression
- * pgm sep      splits stdin lines by sep
- * pgm str sep  splits str by sep
- * pgm str sep n        splits str by sep n times
- */
-int
-main(argc, argv)
-int argc;
-char *argv[];
-{
-        char buf[512];
-        register int n;
-#       define  MNF     10
-        char *fields[MNF];
-
-        if (argc > 4)
-                for (n = atoi(argv[3]); n > 0; n--) {
-                        (void) strlcpy(buf, argv[1], sizeof buf);
-                }
-        else if (argc > 3)
-                for (n = atoi(argv[3]); n > 0; n--) {
-                        (void) strlcpy(buf, argv[1], sizeof buf);
-                        (void) split(buf, fields, MNF, argv[2]);
-                }
-        else if (argc > 2)
-                dosplit(argv[1], argv[2]);
-        else if (argc > 1)
-                while (fgets(buf, sizeof(buf), stdin) != NULL) {
-                        buf[strcspn(buf, "\n")] = '\0'; /* stomp newline */
-                        dosplit(buf, argv[1]);
-                }
-        else
-                regress();
-
-        exit(0);
-}
-
-dosplit(string, seps)
-char *string;
-char *seps;
-{
-#       define  NF      5
-        char *fields[NF];
-        register int nf;
-
-        nf = split(string, fields, NF, seps);
-        print(nf, NF, fields);
-}
-
-print(nf, nfp, fields)
-int nf;
-int nfp;
-char *fields[];
-{
-        register int fn;
-        register int bound;
-
-        bound = (nf > nfp) ? nfp : nf;
-        printf("%d:\t", nf);
-        for (fn = 0; fn < bound; fn++)
-                printf("\"%s\"%s", fields[fn], (fn+1 < nf) ? ", " : "\n");
-}
-
-#define RNF     5               /* some table entries know this */
-struct {
-        char *str;
-        char *seps;
-        int nf;
-        char *fi[RNF];
-} tests[] = {
-        "",             " ",    0,      { "" },
-        " ",            " ",    2,      { "", "" },
-        "x",            " ",    1,      { "x" },
-        "xy",           " ",    1,      { "xy" },
-        "x y",          " ",    2,      { "x", "y" },
-        "abc def  g ",  " ",    5,      { "abc", "def", "", "g", "" },
-        "  a bcd",      " ",    4,      { "", "", "a", "bcd" },
-        "a b c d e f",  " ",    6,      { "a", "b", "c", "d", "e f" },
-        " a b c d ",    " ",    6,      { "", "a", "b", "c", "d " },
-
-        "",             " _",   0,      { "" },
-        " ",            " _",   2,      { "", "" },
-        "x",            " _",   1,      { "x" },
-        "x y",          " _",   2,      { "x", "y" },
-        "ab _ cd",      " _",   2,      { "ab", "cd" },
-        " a_b  c ",     " _",   5,      { "", "a", "b", "c", "" },
-        "a b c_d e f",  " _",   6,      { "a", "b", "c", "d", "e f" },
-        " a b c d ",    " _",   6,      { "", "a", "b", "c", "d " },
-
-        "",             " _~",  0,      { "" },
-        " ",            " _~",  2,      { "", "" },
-        "x",            " _~",  1,      { "x" },
-        "x y",          " _~",  2,      { "x", "y" },
-        "ab _~ cd",     " _~",  2,      { "ab", "cd" },
-        " a_b  c~",     " _~",  5,      { "", "a", "b", "c", "" },
-        "a b_c d~e f",  " _~",  6,      { "a", "b", "c", "d", "e f" },
-        "~a b c d ",    " _~",  6,      { "", "a", "b", "c", "d " },
-
-        "",             " _~-", 0,      { "" },
-        " ",            " _~-", 2,      { "", "" },
-        "x",            " _~-", 1,      { "x" },
-        "x y",          " _~-", 2,      { "x", "y" },
-        "ab _~- cd",    " _~-", 2,      { "ab", "cd" },
-        " a_b  c~",     " _~-", 5,      { "", "a", "b", "c", "" },
-        "a b_c-d~e f",  " _~-", 6,      { "a", "b", "c", "d", "e f" },
-        "~a-b c d ",    " _~-", 6,      { "", "a", "b", "c", "d " },
-
-        "",             "  ",   0,      { "" },
-        " ",            "  ",   2,      { "", "" },
-        "x",            "  ",   1,      { "x" },
-        "xy",           "  ",   1,      { "xy" },
-        "x y",          "  ",   2,      { "x", "y" },
-        "abc def  g ",  "  ",   4,      { "abc", "def", "g", "" },
-        "  a bcd",      "  ",   3,      { "", "a", "bcd" },
-        "a b c d e f",  "  ",   6,      { "a", "b", "c", "d", "e f" },
-        " a b c d ",    "  ",   6,      { "", "a", "b", "c", "d " },
-
-        "",             "",     0,      { "" },
-        " ",            "",     0,      { "" },
-        "x",            "",     1,      { "x" },
-        "xy",           "",     1,      { "xy" },
-        "x y",          "",     2,      { "x", "y" },
-        "abc def  g ",  "",     3,      { "abc", "def", "g" },
-        "\t a bcd",     "",     2,      { "a", "bcd" },
-        "  a \tb\t c ", "",     3,      { "a", "b", "c" },
-        "a b c d e ",   "",     5,      { "a", "b", "c", "d", "e" },
-        "a b\tc d e f", "",     6,      { "a", "b", "c", "d", "e f" },
-        " a b c d e f ",        "",     6,      { "a", "b", "c", "d", "e f " },
-
-        NULL,           NULL,   0,      { NULL },
-};
-
-regress()
-{
-        char buf[512];
-        register int n;
-        char *fields[RNF+1];
-        register int nf;
-        register int i;
-        register int printit;
-        register char *f;
-
-        for (n = 0; tests[n].str != NULL; n++) {
-                (void) strlcpy(buf, tests[n].str, sizeof buf);
-                fields[RNF] = NULL;
-                nf = split(buf, fields, RNF, tests[n].seps);
-                printit = 0;
-                if (nf != tests[n].nf) {
-                        printf("split `%s' by `%s' gave %d fields, not %d\n",
-                                tests[n].str, tests[n].seps, nf, tests[n].nf);
-                        printit = 1;
-                } else if (fields[RNF] != NULL) {
-                        printf("split() went beyond array end\n");
-                        printit = 1;
-                } else {
-                        for (i = 0; i < nf && i < RNF; i++) {
-                                f = fields[i];
-                                if (f == NULL)
-                                        f = "(NULL)";
-                                if (strcmp(f, tests[n].fi[i]) != 0) {
-                                        printf("split `%s' by `%s', field %d is `%s', not `%s'\n",
-                                                tests[n].str, tests[n].seps,
-                                                i, fields[i], tests[n].fi[i]);
-                                        printit = 1;
-                                }
-                        }
-                }
-                if (printit)
-                        print(nf, RNF, fields);
-        }
-}
-#endif
diff --git a/src/regress/lib/libc/regex/t_exhaust.c b/src/regress/lib/libc/regex/t_exhaust.c
deleted file mode 100644
index 58ac8007f2..0000000000
--- a/src/regress/lib/libc/regex/t_exhaust.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*      $OpenBSD: t_exhaust.c,v 1.3 2012/12/05 23:20:07 deraadt Exp $   */
-/*      $NetBSD: t_exhaust.c,v 1.2 2011/10/21 00:41:34 christos Exp $   */
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <regex.h>
-#include <string.h>
-#include <stdlib.h>
-#include <err.h>
-//#include <atf-c.h>
-
-
-static char *
-mkstr(const char *str, size_t len)
-{
-        size_t i, slen = strlen(str);
-        char *p = malloc(slen * len + 1);
-        if (p == NULL)
-                err(1, "malloc");
-        for (i = 0; i < len; i++)
-                strlcpy(&p[i * slen], str, slen * len + 1 - (i * slen));
-        return p;
-}
-
-static char *
-concat(const char *d, const char *s)
-{
-        size_t dlen = strlen(d);
-        size_t slen = strlen(s);
-        char *p = malloc(dlen + slen + 1);
-        strlcpy(p, d, dlen + slen + 1);
-        strlcat(p, s, dlen + slen + 1);
-        return p;
-}
-
-static char *
-p0(size_t len)
-{
-        char *d, *s1, *s2;
-        s1 = mkstr("\\(", len);
-        s2 = concat(s1, ")");
-        free(s1);
-        d = concat("(", s2);
-        free(s2);
-        return d;
-}
-
-static char *
-p1(size_t len)
-{
-        char *d, *s1, *s2, *s3;
-        s1 = mkstr("\\(", 60);
-        s2 = mkstr("(.*)", len);
-        s3 = concat(s1, s2);
-        free(s2);
-        free(s1);
-        s1 = concat(s3, ")");
-        free(s3);
-        d = concat("(", s1);
-        free(s1);
-        return d;
-}
-
-static char *
-ps(const char *m, const char *s, size_t len)
-{
-        char *d, *s1, *s2, *s3;
-        s1 = mkstr(m, len);
-        s2 = mkstr(s, len);
-        s3 = concat(s1, s2);
-        free(s2);
-        free(s1);
-        d = concat("(.?)", s3);
-        free(s3);
-        return d;
-}
-
-static char *
-p2(size_t len)
-{
-        return ps("((.*){0,255}", ")", len);
-}
-
-static char *
-p3(size_t len)
-{
-        return ps("(.\\{0,}", ")", len);
-}
-
-static char *
-p4(size_t len)
-{
-        return ps("((.*){1,255}", ")", len);
-}
-
-static char *
-p5(size_t len)
-{
-        return ps("(", "){1,100}", len);
-}
-
-static char *
-p6(size_t len)
-{
-        char *d, *s1, *s2;
-        s1 = mkstr("(?:(.*)|", len);
-        s2 = concat(s1, "(.*)");
-        free(s1);
-        s1 = mkstr(")", len);
-        d = concat(s2, s1);
-        free(s1);
-        free(s2);
-        return d;
-}
-
-static char *(*patterns[])(size_t) = {
-        p0,
-        p1,
-        p2,
-        p3,
-        p4,
-        p5,
-        p6,
-};
-
-
-main()
-{
-        regex_t re;
-        int e, ret = 0;
-        size_t i;
-
-        for (i = 0; i < sizeof(patterns) / sizeof(patterns[0]); i++) {
-                char *d = (*patterns[i])(9999);
-                e = regcomp(&re, d, i == 6 ? REG_BASIC : REG_EXTENDED);
-                free(d);
-                if (e) {
-                        if (e != REG_ESPACE) {
-                                printf("regcomp returned %d for pattern %zu", e, i);
-                                ret = 1;
-                        }
-                        continue;
-                }
-                (void)regexec(&re, "aaaaaaaa", 0, NULL, 0);
-                regfree(&re);
-        }
-        return ret;
-}
-
diff --git a/src/regress/lib/libc/regex/tests b/src/regress/lib/libc/regex/tests
deleted file mode 100644
index ee019f0a04..0000000000
--- a/src/regress/lib/libc/regex/tests
+++ /dev/null
@@ -1,594 +0,0 @@
-#       $OpenBSD: tests,v 1.8 2016/05/26 14:23:55 schwarze Exp $
-#       $NetBSD: tests,v 1.5 1995/04/20 22:40:00 cgd Exp $
-
-# regular expression test set
-# Lines are at least three fields, separated by one or more tabs.  "" stands
-# for an empty field.  First field is an RE.  Second field is flags.  If
-# C flag given, regcomp() is expected to fail, and the third field is the
-# error name (minus the leading REG_).
-#
-# Otherwise it is expected to succeed, and the third field is the string to
-# try matching it against.  If there is no fourth field, the match is
-# expected to fail.  If there is a fourth field, it is the substring that
-# the RE is expected to match.  If there is a fifth field, it is a comma-
-# separated list of what the subexpressions should match, with - indicating
-# no match for that one.  In both the fourth and fifth fields, a (sub)field
-# starting with @ indicates that the (sub)expression is expected to match
-# a null string followed by the stuff after the @; this provides a way to
-# test where null strings match.  The character `N' in REs and strings
-# is newline, `S' is space, `T' is tab, `Z' is NUL.
-#
-# The full list of flags:
-#       -       placeholder, does nothing
-#       b       RE is a BRE, not an ERE
-#       &       try it as both an ERE and a BRE
-#       C       regcomp() error expected, third field is error name
-#       i       REG_ICASE
-#       m       ("mundane") REG_NOSPEC
-#       s       REG_NOSUB (not really testable)
-#       n       REG_NEWLINE
-#       ^       REG_NOTBOL
-#       $       REG_NOTEOL
-#       #       REG_STARTEND (see below)
-#       p       REG_PEND
-#
-# For REG_STARTEND, the start/end offsets are those of the substring
-# enclosed in ().
-
-# basics
-a               &       a       a
-abc             &       abc     abc
-abc|de          -       abc     abc
-a|b|c           -       abc     a
-
-# parentheses and perversions thereof
-a(b)c           -       abc     abc
-a\(b\)c         b       abc     abc
-a(              C       EPAREN
-a(              b       a(      a(
-a\(             -       a(      a(
-a\(             bC      EPAREN
-a\(b            bC      EPAREN
-a(b             C       EPAREN
-a(b             b       a(b     a(b
-# gag me with a right parenthesis -- 1003.2 goofed here (my fault, partly)
-a)              -       a)      a)
-)               -       )       )
-# end gagging (in a just world, those *should* give EPAREN)
-a)              b       a)      a)
-a\)             bC      EPAREN
-\)              bC      EPAREN
-a()b            -       ab      ab
-a\(\)b          b       ab      ab
-
-# anchoring and REG_NEWLINE
-^abc$           &       abc     abc
-^b              &       abc
-a^b             -       a^b
-a^b             b       a^b     a^b
-a$b             -       a$b
-a$b             b       a$b     a$b
-^               &       abc     @abc
-$               &       abc     @
-^$              &       ""      @
-$^              -       ""      @
-\($\)\(^\)      b       ""      @
-# stop retching, those are legitimate (although disgusting)
-^^              -       ""      @
-$$              -       ""      @
-b$              &       abNc
-b$              &n      abNc    b
-^b              &       aNbNc
-b$              &       aNbNc
-^a              &n      aNb     a
-^b              &n      abc
-^b$             &n      aNbNc   b
-^$              &n      aNNb    @Nb
-^$              n       abc
-^$              n       abcN    @
-$^              n       aNNb    @Nb
-\($\)\(^\)      bn      aNNb    @Nb
-^^              n^      aNNb    @Nb
-$$              n       aNNb    @NN
-^a              &^      a
-a$              &$      a
-^b              &^      abc
-^b              &^      aNb
-^a              &^n     aNb
-^b              &^n     abc
-^b              &^n     aNb     b
-a$              &$n     bNa
-b$              &$n     bNa     b
-a*(^b$)c*       -       b       b
-a*\(^b$\)c*     b       b       b
-
-# certain syntax errors and non-errors
-|               C       EMPTY
-|               b       |       |
-*               C       BADRPT
-*               b       *       *
-+               C       BADRPT
-?               C       BADRPT
-""              &C      EMPTY
-()              -       abc     @abc
-\(\)            b       abc     @abc
-a||b            C       EMPTY
-|ab             C       EMPTY
-ab|             C       EMPTY
-(|a)b           C       EMPTY
-(a|)b           C       EMPTY
-(*a)            C       BADRPT
-(+a)            C       BADRPT
-(?a)            C       BADRPT
-({1}a)          C       BADRPT
-\(\{1\}a\)      bC      BADRPT
-(a|*b)          C       BADRPT
-(a|+b)          C       BADRPT
-(a|?b)          C       BADRPT
-(a|{1}b)        C       BADRPT
-^*              C       BADRPT
-^*              b       *       *
-^+              C       BADRPT
-^?              C       BADRPT
-^{1}            C       BADRPT
-^\{1\}          bC      BADRPT
-
-# metacharacters, backslashes
-a.c             &       abc     abc
-a[bc]d          &       abd     abd
-a\*c            &       a*c     a*c
-a\\b            &       a\b     a\b
-a\\\*b          &       a\*b    a\*b
-a\bc            &       abc     abc
-a\              &C      EESCAPE
-a\\bc           &       a\bc    a\bc
-\{              bC      BADRPT
-a\[b            &       a[b     a[b
-a[b             &C      EBRACK
-# trailing $ is a peculiar special case for the BRE code
-a$              &       a       a
-a$              &       a$
-a\$             &       a
-a\$             &       a$      a$
-a\\$            &       a
-a\\$            &       a$
-a\\$            &       a\$
-a\\$            &       a\      a\
-
-# back references, ugh
-a\(b\)\2c       bC      ESUBREG
-a\(b\1\)c       bC      ESUBREG
-a\(b*\)c\1d     b       abbcbbd abbcbbd bb
-a\(b*\)c\1d     b       abbcbd
-a\(b*\)c\1d     b       abbcbbbd
-^\(.\)\1        b       abc
-a\([bc]\)\1d    b       abcdabbd        abbd    b
-a\(\([bc]\)\2\)*d       b       abbccd  abbccd
-a\(\([bc]\)\2\)*d       b       abbcbd
-# actually, this next one probably ought to fail, but the spec is unclear
-a\(\(b\)*\2\)*d         b       abbbd   abbbd
-# here is a case that no NFA implementation does right
-\(ab*\)[ab]*\1  b       ababaaa ababaaa a
-# check out normal matching in the presence of back refs
-\(a\)\1bcd      b       aabcd   aabcd
-\(a\)\1bc*d     b       aabcd   aabcd
-\(a\)\1bc*d     b       aabd    aabd
-\(a\)\1bc*d     b       aabcccd aabcccd
-\(a\)\1bc*[ce]d b       aabcccd aabcccd
-^\(a\)\1b\(c\)*cd$      b       aabcccd aabcccd
-\(b*\)\(a*\1\)* b       ab      a
-\([^_]*\)\(_*\1\)*      b       foo_foo_bar_bar_bar_baz foo_foo foo,_foo
-\([^_]*\)\(_*\1\)*      b       bar_bar_bar_baz bar_bar_bar     bar,_bar
-\([^_]*\)\(_*\1\)*      b       foo_bar_baz     foo     foo
-\(.*\)\1        b       ""      ""
-\(.*\)\1        b       a       ""
-\(.*\)\1        b       aa      aa
-\(.*\)\1        b       aaa     aa
-\(.*\)\1        b       aaaa    aaaa
-\([^_]*\)\1     b       ""      ""
-\([^_]*\)\1     b       a       ""
-\([^_]*\)\1     b       aa      aa
-\([^_]*\)\1     b       aaa     aa
-\([^_]*\)\1     b       aaaa    aaaa
-foo\(.*\)bar\1  b       foolbarl        foolbarl        l
-foo\(.*\)bar\1  b       foobar  foobar  ""
-\(\(.\)b\)*\1   b       aba
-\(\(.\)b\)*\1   b       abba
-\(\(.\)b\)*\1   b       abbba
-\(\(.\)b\)*\1   b       abbbba  bbbb    bb,b
-\(\(.\)b\)*\1   b       abbbbba abbbbb  bb,b
-\(\(.\)b\)*\1   b       abbbbbba        abbbbb  bb,b
-\(\(.\)b\)*\1   b       abbbbbbbbbbbbbba        abbbbbbbbbbbbb  bb,b
-\(\(.\)b\)*\1   b       abbbbbbbbbbbbbbba       abbbbbbbbbbbbbbb        bb,b
-# these used to segfault, buffer underflow in engine.c, backref()
-\(^a\)*\(b.\)\2 b^      sbxbxe  bxbx    -,bx
-\([[:<:]]a\)*\(b.\)\2   b^      sbxbxe  bxbx    -,bx
-
-# ordinary repetitions
-ab*c            &       abc     abc
-ab+c            -       abc     abc
-ab?c            -       abc     abc
-a\(*\)b         b       a*b     a*b
-a\(**\)b        b       ab      ab
-a\(***\)b       bC      BADRPT
-*a              b       *a      *a
-**a             b       a       a
-***a            bC      BADRPT
-
-# the dreaded bounded repetitions
-{               &       {       {
-{abc            &       {abc    {abc
-{1              C       BADRPT
-{1}             C       BADRPT
-a{b             &       a{b     a{b
-a{1}b           -       ab      ab
-a\{1\}b         b       ab      ab
-a{1,}b          -       ab      ab
-a\{1,\}b        b       ab      ab
-a{1,2}b         -       aab     aab
-a\{1,2\}b       b       aab     aab
-a{1             C       EBRACE
-a\{1            bC      EBRACE
-a{1a            C       EBRACE
-a\{1a           bC      EBRACE
-a{1a}           C       BADBR
-a\{1a\}         bC      BADBR
-a{,2}           -       a{,2}   a{,2}
-a\{,2\}         bC      BADBR
-a{,}            -       a{,}    a{,}
-a\{,\}          bC      BADBR
-a{1,x}          C       BADBR
-a\{1,x\}        bC      BADBR
-a{1,x           C       EBRACE
-a\{1,x          bC      EBRACE
-a{300}          C       BADBR
-a\{300\}        bC      BADBR
-a{1,0}          C       BADBR
-a\{1,0\}        bC      BADBR
-ab{0,0}c        -       abcac   ac
-ab\{0,0\}c      b       abcac   ac
-ab{0,1}c        -       abcac   abc
-ab\{0,1\}c      b       abcac   abc
-ab{0,3}c        -       abbcac  abbc
-ab\{0,3\}c      b       abbcac  abbc
-ab{1,1}c        -       acabc   abc
-ab\{1,1\}c      b       acabc   abc
-ab{1,3}c        -       acabc   abc
-ab\{1,3\}c      b       acabc   abc
-ab{2,2}c        -       abcabbc abbc
-ab\{2,2\}c      b       abcabbc abbc
-ab{2,4}c        -       abcabbc abbc
-ab\{2,4\}c      b       abcabbc abbc
-((a{1,10}){1,10}){1,10} -       a       a       a,a
-
-# multiple repetitions
-a**             &C      BADRPT
-a++             C       BADRPT
-a??             C       BADRPT
-a*+             C       BADRPT
-a*?             C       BADRPT
-a+*             C       BADRPT
-a+?             C       BADRPT
-a?*             C       BADRPT
-a?+             C       BADRPT
-a{1}{1}         C       BADRPT
-a*{1}           C       BADRPT
-a+{1}           C       BADRPT
-a?{1}           C       BADRPT
-a{1}*           C       BADRPT
-a{1}+           C       BADRPT
-a{1}?           C       BADRPT
-a*{b}           -       a{b}    a{b}
-a\{1\}\{1\}     bC      BADRPT
-a*\{1\}         bC      BADRPT
-a\{1\}*         bC      BADRPT
-
-# brackets, and numerous perversions thereof
-a[b]c           &       abc     abc
-a[ab]c          &       abc     abc
-a[^ab]c         &       adc     adc
-a[]b]c          &       a]c     a]c
-a[[b]c          &       a[c     a[c
-a[-b]c          &       a-c     a-c
-a[^]b]c         &       adc     adc
-a[^-b]c         &       adc     adc
-a[b-]c          &       a-c     a-c
-a[b             &C      EBRACK
-a[]             &C      EBRACK
-a[1-3]c         &       a2c     a2c
-a[3-1]c         &C      ERANGE
-a[1-3-5]c       &C      ERANGE
-a[[.-.]--]c     &       a-c     a-c
-a[1-            &C      ERANGE
-a[[.            &C      EBRACK
-a[[.x           &C      EBRACK
-a[[.x.          &C      EBRACK
-a[[.x.]         &C      EBRACK
-a[[.x.]]        &       ax      ax
-a[[.x,.]]       &C      ECOLLATE
-a[[.one.]]b     &       a1b     a1b
-a[[.notdef.]]b  &C      ECOLLATE
-a[[.].]]b       &       a]b     a]b
-a[[:alpha:]]c   &       abc     abc
-a[[:notdef:]]c  &C      ECTYPE
-a[[:            &C      EBRACK
-a[[:alpha       &C      EBRACK
-a[[:alpha:]     &C      EBRACK
-a[[:alpha,:]    &C      ECTYPE
-a[[:]:]]b       &C      ECTYPE
-a[[:-:]]b       &C      ECTYPE
-a[[:alph:]]     &C      ECTYPE
-a[[:alphabet:]] &C      ECTYPE
-[[:alnum:]]+    -       -%@a0X- a0X
-[[:alpha:]]+    -       -%@aX0- aX
-[[:blank:]]+    -       aSSTb   SST
-[[:cntrl:]]+    -       aNTb    NT
-[[:digit:]]+    -       a019b   019
-[[:graph:]]+    -       Sa%bS   a%b
-[[:lower:]]+    -       AabC    ab
-[[:print:]]+    -       NaSbN   aSb
-[[:punct:]]+    -       S%-&T   %-&
-[[:space:]]+    -       aSNTb   SNT
-[[:upper:]]+    -       aBCd    BC
-[[:xdigit:]]+   -       p0f3Cq  0f3C
-a[[=b=]]c       &       abc     abc
-a[[=            &C      EBRACK
-a[[=b           &C      EBRACK
-a[[=b=          &C      EBRACK
-a[[=b=]         &C      EBRACK
-a[[=b,=]]       &C      ECOLLATE
-a[[=one=]]b     &       a1b     a1b
-
-# complexities
-a(((b)))c       -       abc     abc
-a(b|(c))d       -       abd     abd
-a(b*|c)d        -       abbd    abbd
-# just gotta have one DFA-buster, of course
-a[ab]{20}       -       aaaaabaaaabaaaabaaaab   aaaaabaaaabaaaabaaaab
-# and an inline expansion in case somebody gets tricky
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab]       -       aaaaabaaaabaaaabaaaab   aaaaabaaaabaaaabaaaab
-# and in case somebody just slips in an NFA...
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night)      -       aaaaabaaaabaaaabaaaabweeknights aaaaabaaaabaaaabaaaabweeknights
-# fish for anomalies as the number of states passes 32
-12345678901234567890123456789   -       a12345678901234567890123456789b 12345678901234567890123456789
-123456789012345678901234567890  -       a123456789012345678901234567890b        123456789012345678901234567890
-1234567890123456789012345678901 -       a1234567890123456789012345678901b       1234567890123456789012345678901
-12345678901234567890123456789012        -       a12345678901234567890123456789012b      12345678901234567890123456789012
-123456789012345678901234567890123       -       a123456789012345678901234567890123b     123456789012345678901234567890123
-# and one really big one, beyond any plausible word width
-1234567890123456789012345678901234567890123456789012345678901234567890  -       a1234567890123456789012345678901234567890123456789012345678901234567890b        1234567890123456789012345678901234567890123456789012345678901234567890
-# fish for problems as brackets go past 8
-[ab][cd][ef][gh][ij][kl][mn]    -       xacegikmoq      acegikm
-[ab][cd][ef][gh][ij][kl][mn][op]        -       xacegikmoq      acegikmo
-[ab][cd][ef][gh][ij][kl][mn][op][qr]    -       xacegikmoqy     acegikmoq
-[ab][cd][ef][gh][ij][kl][mn][op][q]     -       xacegikmoqy     acegikmoq
-
-# subtleties of matching
-abc             &       xabcy   abc
-a\(b\)?c\1d     b       acd
-aBc             i       Abc     Abc
-a[Bc]*d         i       abBCcd  abBCcd
-0[[:upper:]]1   &i      0a1     0a1
-0[[:lower:]]1   &i      0A1     0A1
-a[^b]c          &i      abc
-a[^b]c          &i      aBc
-a[^b]c          &i      adc     adc
-[a]b[c]         -       abc     abc
-[a]b[a]         -       aba     aba
-[abc]b[abc]     -       abc     abc
-[abc]b[abd]     -       abd     abd
-a(b?c)+d        -       accd    accd
-(wee|week)(knights|night)       -       weeknights      weeknights
-(we|wee|week|frob)(knights|night|day)   -       weeknights      weeknights
-a[bc]d          -       xyzaaabcaababdacd       abd
-a[ab]c          -       aaabc   abc
-abc             s       abc     abc
-a*              &       b       @b
-
-# Let's have some fun -- try to match a C comment.
-# first the obvious, which looks okay at first glance...
-/\*.*\*/        -       /*x*/   /*x*/
-# but...
-/\*.*\*/        -       /*x*/y/*z*/     /*x*/y/*z*/
-# okay, we must not match */ inside; try to do that...
-/\*([^*]|\*[^/])*\*/    -       /*x*/   /*x*/
-/\*([^*]|\*[^/])*\*/    -       /*x*/y/*z*/     /*x*/
-# but...
-/\*([^*]|\*[^/])*\*/    -       /*x**/y/*z*/    /*x**/y/*z*/
-# and a still fancier version, which does it right (I think)...
-/\*([^*]|\*+[^*/])*\*+/ -       /*x*/   /*x*/
-/\*([^*]|\*+[^*/])*\*+/ -       /*x*/y/*z*/     /*x*/
-/\*([^*]|\*+[^*/])*\*+/ -       /*x**/y/*z*/    /*x**/
-/\*([^*]|\*+[^*/])*\*+/ -       /*x****/y/*z*/  /*x****/
-/\*([^*]|\*+[^*/])*\*+/ -       /*x**x*/y/*z*/  /*x**x*/
-/\*([^*]|\*+[^*/])*\*+/ -       /*x***x/y/*z*/  /*x***x/y/*z*/
-
-# subexpressions
-a(b)(c)d        -       abcd    abcd    b,c
-a(((b)))c       -       abc     abc     b,b,b
-a(b|(c))d       -       abd     abd     b,-
-a(b*|c|e)d      -       abbd    abbd    bb
-a(b*|c|e)d      -       acd     acd     c
-a(b*|c|e)d      -       ad      ad      @d
-a(b?)c          -       abc     abc     b
-a(b?)c          -       ac      ac      @c
-a(b+)c          -       abc     abc     b
-a(b+)c          -       abbbc   abbbc   bbb
-a(b*)c          -       ac      ac      @c
-(a|ab)(bc([de]+)f|cde)  -       abcdef  abcdef  a,bcdef,de
-# the regression tester only asks for 9 subexpressions
-a(b)(c)(d)(e)(f)(g)(h)(i)(j)k   -       abcdefghijk     abcdefghijk     b,c,d,e,f,g,h,i,j
-a(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)l        -       abcdefghijkl    abcdefghijkl    b,c,d,e,f,g,h,i,j,k
-a([bc]?)c       -       abc     abc     b
-a([bc]?)c       -       ac      ac      @c
-a([bc]+)c       -       abc     abc     b
-a([bc]+)c       -       abcc    abcc    bc
-a([bc]+)bc      -       abcbc   abcbc   bc
-a(bb+|b)b       -       abb     abb     b
-a(bbb+|bb+|b)b  -       abb     abb     b
-a(bbb+|bb+|b)b  -       abbb    abbb    bb
-a(bbb+|bb+|b)bb -       abbb    abbb    b
-(.*).*          -       abcdef  abcdef  abcdef
-(a*)*           -       bc      @b      @b
-
-# do we get the right subexpression when it is used more than once?
-a(b|c)*d        -       ad      ad      -
-a(b|c)*d        -       abcd    abcd    c
-a(b|c)+d        -       abd     abd     b
-a(b|c)+d        -       abcd    abcd    c
-a(b|c?)+d       -       ad      ad      @d
-a(b|c?)+d       -       abcd    abcd    @d
-a(b|c){0,0}d    -       ad      ad      -
-a(b|c){0,1}d    -       ad      ad      -
-a(b|c){0,1}d    -       abd     abd     b
-a(b|c){0,2}d    -       ad      ad      -
-a(b|c){0,2}d    -       abcd    abcd    c
-a(b|c){0,}d     -       ad      ad      -
-a(b|c){0,}d     -       abcd    abcd    c
-a(b|c){1,1}d    -       abd     abd     b
-a(b|c){1,1}d    -       acd     acd     c
-a(b|c){1,2}d    -       abd     abd     b
-a(b|c){1,2}d    -       abcd    abcd    c
-a(b|c){1,}d     -       abd     abd     b
-a(b|c){1,}d     -       abcd    abcd    c
-a(b|c){2,2}d    -       acbd    acbd    b
-a(b|c){2,2}d    -       abcd    abcd    c
-a(b|c){2,4}d    -       abcd    abcd    c
-a(b|c){2,4}d    -       abcbd   abcbd   b
-a(b|c){2,4}d    -       abcbcd  abcbcd  c
-a(b|c){2,}d     -       abcd    abcd    c
-a(b|c){2,}d     -       abcbd   abcbd   b
-a(b+|((c)*))+d  -       abd     abd     @d,@d,-
-a(b+|((c)*))+d  -       abcd    abcd    @d,@d,-
-
-# check out the STARTEND option
-^[abc]          &#      a(b)c   b
-^[abc]          &#      a(xb)c
-^[abc]          &#      aN(b)c  b
-^[abc]          &n#     a(b)c   b
-^[abc]          &n#     a(xb)c
-^[abc]          &n#     aN(b)c  b
-^[abc]          &^#     a(b)c
-^[abc]          &^#     a(xb)c
-^[abc]          &^#     aN(b)c
-^[abc]          &n^#    a(b)c
-^[abc]          &n^#    a(xb)c
-^[abc]          &n^#    aN(b)c  b
-[abc]           &#      a(d)c
-[abc]           &#      a(bc)d  b
-[abc]           &#      a(dc)d  c
-.               &#      a()c
-b.*c            &#      b(bc)c  bc
-b.*             &#      b(bc)c  bc
-.*c             &#      b(bc)c  bc
-
-# plain strings, with the NOSPEC flag
-abc             m       abc     abc
-abc             m       xabcy   abc
-abc             m       xyz
-a*b             m       aba*b   a*b
-a*b             m       ab
-""              mC      EMPTY
-
-# cases involving NULs
-aZb             &       a       a
-aZb             &p      a
-aZb             &p#     (aZb)   aZb
-aZ*b            &p#     (ab)    ab
-a.b             &#      (aZb)   aZb
-a.*             &#      (aZb)c  aZb
-
-# word boundaries (ick)
-[[:<:]]a        &       a       a
-\<a             &       a       a
-[[:<:]]a        &       ba
-\<a             &       ba
-[[:<:]]a        &       -a      a
-\<a             &       -a      a
-[[:<:]]a        &       Na      a
-\<a             &       Na      a
-[[:<:]]a        &n      a       a
-\<a             &n      a       a
-[[:<:]]a        &n      ba
-\<a             &n      ba
-[[:<:]]a        &n      -a      a
-\<a             &n      -a      a
-[[:<:]]a        &n      Na      a
-\<a             &n      Na      a
-[[:<:]]a        &^      a
-\<a             &^      a
-[[:<:]]a        &^      ba
-\<a             &^      ba
-[[:<:]]a        &^      -a      a
-\<a             &^      -a      a
-[[:<:]]a        &^      Na      a
-\<a             &^      Na      a
-[[:<:]]a        &n^     a
-\<a             &n^     a
-[[:<:]]a        &n^     ba
-\<a             &n^     ba
-[[:<:]]a        &n^     -a      a
-\<a             &n^     -a      a
-[[:<:]]a        &n^     Na      a
-\<a             &n^     Na      a
-[[:<:]]b        &#      a(b)c   b
-\<b             &#      a(b)c   b
-[[:<:]]b        &#      a(xb)c
-\<b             &#      a(xb)c
-[[:<:]]b        &#      -(b)c   b
-\<b             &#      -(b)c   b
-[[:<:]]b        &#      aN(b)c  b
-\<b             &#      aN(b)c  b
-[[:<:]]b        &n#     a(b)c   b
-\<b             &n#     a(b)c   b
-[[:<:]]b        &n#     a(xb)c
-\<b             &n#     a(xb)c
-[[:<:]]b        &n#     -(b)c   b
-\<b             &n#     -(b)c   b
-[[:<:]]b        &n#     aN(b)c  b
-\<b             &n#     aN(b)c  b
-[[:<:]]b        &^#     a(b)c
-\<b             &^#     a(b)c
-[[:<:]]b        &^#     a(xb)c
-\<b             &^#     a(xb)c
-[[:<:]]b        &^#     -(b)c   b
-\<b             &^#     -(b)c   b
-[[:<:]]b        &^#     aN(b)c  b
-\<b             &^#     aN(b)c  b
-[[:<:]]b        &n^#    a(b)c
-\<b             &n^#    a(b)c
-[[:<:]]b        &n^#    a(xb)c
-\<b             &n^#    a(xb)c
-[[:<:]]b        &n^#    -(b)c   b
-\<b             &n^#    -(b)c   b
-[[:<:]]b        &n^#    aN(b)c  b
-\<b             &n^#    aN(b)c  b
-a[[:>:]]        &       a       a
-a\>             &       a       a
-a[[:>:]]        &       ab
-a\>             &       ab
-a[[:>:]]        &       a-      a
-a\>             &       a-      a
-[[:<:]]a.c[[:>:]]       &       axcd-dayc-dazce-abc     abc
-\<a.c\>                 &       axcd-dayc-dazce-abc     abc
-[[:<:]]a.c[[:>:]]       &       axcd-dayc-dazce-abc-q   abc
-\<a.c\>                 &       axcd-dayc-dazce-abc-q   abc
-[[:<:]]a.c[[:>:]]       &       axc-dayc-dazce-abc      axc
-\<a.c\>                 &       axc-dayc-dazce-abc      axc
-[[:<:]]b.c[[:>:]]       &       a_bxc-byc_d-bzc-q       bzc
-\<b.c\>                 &       a_bxc-byc_d-bzc-q       bzc
-[[:<:]].x..[[:>:]]      &       y_xa_-_xb_y-_xc_-axdc   _xc_
-\<.x..\>                &       y_xa_-_xb_y-_xc_-axdc   _xc_
-[[:<:]]a_b[[:>:]]       &       x_a_b
-\<a_b\>                 &       x_a_b
-
-# past problems, and suspected problems
-(A[1])|(A[2])|(A[3])|(A[4])|(A[5])|(A[6])|(A[7])|(A[8])|(A[9])|(A[A])   -       A1      A1
-abcdefghijklmnop        i       abcdefghijklmnop        abcdefghijklmnop
-abcdefghijklmnopqrstuv  i       abcdefghijklmnopqrstuv  abcdefghijklmnopqrstuv
-(ALAK)|(ALT[AB])|(CC[123]1)|(CM[123]1)|(GAMC)|(LC[23][EO ])|(SEM[1234])|(SL[ES][12])|(SLWW)|(SLF )|(SLDT)|(VWH[12])|(WH[34][EW])|(WP1[ESN])     -       CC11    CC11
-CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a    -       CC11    CC11
-Char \([a-z0-9_]*\)\[.* b       Char xyz[k      Char xyz[k      xyz
-a?b     -       ab      ab
--\{0,1\}[0-9]*$ b       -5      -5
-
diff --git a/src/regress/lib/libc/setjmp-fpu/Makefile b/src/regress/lib/libc/setjmp-fpu/Makefile
deleted file mode 100644
index 33d0f7e88a..0000000000
--- a/src/regress/lib/libc/setjmp-fpu/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2013/12/29 05:46:43 martynas Exp $
-
-PROG=   setjmp-fpu
-SRCS=   _setjmp.c main.c setjmp.c sigsetjmp.c
-
-LDADD=  -lm
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/setjmp-fpu/_setjmp.c b/src/regress/lib/libc/setjmp-fpu/_setjmp.c
deleted file mode 100644
index a2195a5ff8..0000000000
--- a/src/regress/lib/libc/setjmp-fpu/_setjmp.c
+++ /dev/null
@@ -1,7 +0,0 @@
-/*      $OpenBSD: _setjmp.c,v 1.3 2015/11/08 18:10:14 miod Exp $        */
-#define SETJMP(env, savemask)   _setjmp(env)
-#define LONGJMP(env, val)       _longjmp(env, val)
-#define TEST_SETJMP             test__setjmp
-#define JMP_BUF                 jmp_buf
-
-#include "setjmp-fpu.c"
diff --git a/src/regress/lib/libc/setjmp-fpu/main.c b/src/regress/lib/libc/setjmp-fpu/main.c
deleted file mode 100644
index 5050fee855..0000000000
--- a/src/regress/lib/libc/setjmp-fpu/main.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*      $OpenBSD: main.c,v 1.2 2015/01/20 04:41:01 krw Exp $    */
-int     test__setjmp(void);
-int     test_setjmp(void);
-int     test_sigsetjmp(void);
-
-int
-main(int argc, char *argv[])
-{
-        return (test__setjmp()
-                | test_setjmp()
-                | test_sigsetjmp());
-}
diff --git a/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c b/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
deleted file mode 100644
index 694061dcbb..0000000000
--- a/src/regress/lib/libc/setjmp-fpu/setjmp-fpu.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <fenv.h>
-#include <setjmp.h>
-
-int
-TEST_SETJMP(int argc, char *argv[])
-{
-        JMP_BUF env;
-        int rv;
-
-        /* Set up the FPU control word register. */
-        fesetround(FE_UPWARD);
-        fedisableexcept(FE_ALL_EXCEPT);
-        feenableexcept(FE_DIVBYZERO);
-
-        rv = SETJMP(env, 0);
-
-        if (rv == 0) {
-                fexcept_t flag = FE_OVERFLOW;
-
-                /* Mess with the FPU control word. */
-                fesetround(FE_DOWNWARD);
-                fedisableexcept(FE_DIVBYZERO);
-
-                /* Set the FPU exception flags. */
-                fesetexceptflag(&flag, FE_ALL_EXCEPT);
-
-                LONGJMP(env, 1);
-        } else if (rv == 1) {
-                fexcept_t flag = 0;
-
-                /* Verify that the FPU control word is preserved. */
-                if (fegetround() != FE_UPWARD
-                    || fegetexcept() != FE_DIVBYZERO)
-                        return (1);
-
-                /* Verify that the FPU exception flags weren't clobbered. */
-                fegetexceptflag(&flag, FE_ALL_EXCEPT);
-                if (flag != FE_OVERFLOW)
-                        return (1);
-
-                return (0);
-        }
-
-        /* This is not supposed to happen. */
-        return (1);
-}
diff --git a/src/regress/lib/libc/setjmp-fpu/setjmp.c b/src/regress/lib/libc/setjmp-fpu/setjmp.c
deleted file mode 100644
index 48d72056d0..0000000000
--- a/src/regress/lib/libc/setjmp-fpu/setjmp.c
+++ /dev/null
@@ -1,7 +0,0 @@
-/*      $OpenBSD: setjmp.c,v 1.3 2015/11/08 18:10:14 miod Exp $ */
-#define SETJMP(env, savemask)   setjmp(env)
-#define LONGJMP(env, val)       longjmp(env, val)
-#define TEST_SETJMP             test_setjmp
-#define JMP_BUF                 jmp_buf
-
-#include "setjmp-fpu.c"
diff --git a/src/regress/lib/libc/setjmp-fpu/sigsetjmp.c b/src/regress/lib/libc/setjmp-fpu/sigsetjmp.c
deleted file mode 100644
index 158fd83296..0000000000
--- a/src/regress/lib/libc/setjmp-fpu/sigsetjmp.c
+++ /dev/null
@@ -1,7 +0,0 @@
-/*      $OpenBSD: sigsetjmp.c,v 1.3 2015/11/08 18:10:14 miod Exp $      */
-#define SETJMP(env, savemask)   sigsetjmp(env, savemask)
-#define LONGJMP(env, val)       siglongjmp(env, val)
-#define TEST_SETJMP             test_sigsetjmp
-#define JMP_BUF                 sigjmp_buf
-
-#include "setjmp-fpu.c"
diff --git a/src/regress/lib/libc/setjmp-signal/Makefile b/src/regress/lib/libc/setjmp-signal/Makefile
deleted file mode 100644
index a9649a8abe..0000000000
--- a/src/regress/lib/libc/setjmp-signal/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2002/07/31 05:18:24 art Exp $
-
-PROG=   setjmp-signal
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/setjmp-signal/setjmp-signal.c b/src/regress/lib/libc/setjmp-signal/setjmp-signal.c
deleted file mode 100644
index b50f6b27c5..0000000000
--- a/src/regress/lib/libc/setjmp-signal/setjmp-signal.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*      $OpenBSD: setjmp-signal.c,v 1.4 2017/07/27 12:31:09 bluhm Exp $ */
-/*
- *      Written by Artur Grabowski <art@openbsd.org> 2002 Public Domain.
- */
-
-#include <setjmp.h>
-#include <signal.h>
-
-jmp_buf jb;
-
-void
-segv_handler(int signum)
-{
-        longjmp(jb, 1);
-}
-
-int
-main()
-{
-        signal(SIGSEGV, segv_handler);
-        if (setjmp(jb) == 0) {
-                *((volatile int *)0L) = 0;
-                return (1);
-        }
-        return (0);
-}
diff --git a/src/regress/lib/libc/setjmp/Makefile b/src/regress/lib/libc/setjmp/Makefile
deleted file mode 100644
index fc68e8d44c..0000000000
--- a/src/regress/lib/libc/setjmp/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2002/01/01 23:00:51 art Exp $
-#       $NetBSD: Makefile,v 1.2 1995/04/20 22:40:13 cgd Exp $
-
-PROG=   setjmptest
-SRCS=   jmptest.c
-
-CFLAGS+= -DTEST_SETJMP
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/setjmp/jmptest.c b/src/regress/lib/libc/setjmp/jmptest.c
deleted file mode 100644
index 9512c9ee34..0000000000
--- a/src/regress/lib/libc/setjmp/jmptest.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*      $OpenBSD: jmptest.c,v 1.7 2003/09/02 23:52:16 david Exp $       */
-/*      $NetBSD: jmptest.c,v 1.2 1995/01/01 20:55:35 jtc Exp $  */
-
-/*
- * Copyright (c) 1994 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *      for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <err.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#if (TEST_SETJMP + TEST_U_SETJMP + TEST_SIGSETJMP) != 1
-#error one of TEST_SETJMP, TEST_U_SETJMP, or TEST_SIGSETJMP must be defined
-#endif
-
-#ifdef TEST_SETJMP
-#define BUF             jmp_buf
-#define SET(b, m)       setjmp(b)
-#define JMP(b, v)       longjmp(b, v)
-#endif
-
-#ifdef TEST_U_SETJMP
-#define BUF             jmp_buf
-#define SET(b, m)       _setjmp(b)
-#define JMP(b, v)       _longjmp(b, v)
-#endif
-
-#ifdef TEST_SIGSETJMP
-#define BUF             sigjmp_buf
-#define SET(b, m)       sigsetjmp(b, m)
-#define JMP(b, v)       siglongjmp(b, v)
-#endif
-
-int expectsignal;
-
-static void
-aborthandler(int signo)
-{
-
-        if (expectsignal)
-                _exit(0);
-        else {
-                warnx("kill(SIGABRT) succeeded");
-                _exit(1);
-        }
-}
-
-int
-main(int argc, char *argv[])
-{
-        struct sigaction sa;
-        BUF jb;
-        sigset_t ss;
-        int i, x;
-
-        i = getpid();
-
-#ifdef TEST_SETJMP
-        expectsignal = 0;
-#endif
-#ifdef TEST_U_SETJMP
-        expectsignal = 1;
-#endif
-#ifdef TEST_SIGSETJMP
-        if (argc != 2 ||
-            (strcmp(argv[1], "save") && strcmp(argv[1], "nosave"))) {
-                fprintf(stderr, "usage: %s [save|nosave]\n", argv[0]);
-                exit(1);
-        }
-        expectsignal = (strcmp(argv[1], "save") != 0);
-#endif
-
-        sa.sa_handler = aborthandler;
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = 0;
-        if (sigaction(SIGABRT, &sa, NULL) == -1)
-                err(1, "sigaction failed");
-
-        if (sigemptyset(&ss) == -1)
-                err(1, "sigemptyset failed");
-        if (sigaddset(&ss, SIGABRT) == -1)
-                err(1, "sigaddset failed");
-        if (sigprocmask(SIG_BLOCK, &ss, NULL) == -1)
-                err(1, "sigprocmask (1) failed");
-
-        x = SET(jb, !expectsignal);
-        if (x != 0) {
-                if (x != i)
-                        errx(1, "setjmp returned wrong value");
-
-                kill(i, SIGABRT);
-                if (expectsignal)
-                        errx(1, "kill(SIGABRT) failed");
-                else
-                        exit(0);
-        }
-
-        if (sigprocmask(SIG_UNBLOCK, &ss, NULL) == -1)
-                err(1, "sigprocmask (2) failed");
-
-        JMP(jb, i);
-
-        errx(1, "jmp failed");
-}
diff --git a/src/regress/lib/libc/sigsetjmp/Makefile b/src/regress/lib/libc/sigsetjmp/Makefile
deleted file mode 100644
index f88bea3b47..0000000000
--- a/src/regress/lib/libc/sigsetjmp/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#       $OpenBSD: Makefile,v 1.5 2002/09/02 20:01:43 avsm Exp $
-
-PROG=   sigsetjmptest
-SRCS=   jmptest.c
-
-CFLAGS+= -DTEST_SIGSETJMP
-
-.PATH:  ${.CURDIR}/../setjmp
-
-REGRESS_TARGETS=sigsetjmp-save sigsetjmp-nosave
-
-sigsetjmp-save: ${PROG}
-        ./${PROG} save
-sigsetjmp-nosave: ${PROG}
-        ./${PROG} nosave
-
-.PHONY: ${REGRESS_TARGETS}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/sigthr/Makefile b/src/regress/lib/libc/sigthr/Makefile
deleted file mode 100644
index 8ae4643e1e..0000000000
--- a/src/regress/lib/libc/sigthr/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2015/10/22 05:30:18 guenther Exp $
-
-PROG=sigthr_test
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/sigthr/sigthr_test.c b/src/regress/lib/libc/sigthr/sigthr_test.c
deleted file mode 100644
index c2eaa1f779..0000000000
--- a/src/regress/lib/libc/sigthr/sigthr_test.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2015  Philip Guenther <guenther@openbsd.org>
- *
- * Public domain.
- *
- * Verify that SIGTHR can't be blocked or caught by applications.
- */
-
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-void sighandler(int sig) { }
-
-int
-main(void)
-{
-        struct sigaction sa;
-        sigset_t set, oset;
-
-        /*
-         * check sigprocmask
-         */
-        if (sigprocmask(SIG_BLOCK, NULL, &set))
-                err(1, "sigprocmask");
-        if (sigismember(&set, SIGTHR))
-                errx(1, "SIGTHR already blocked");
-        sigaddset(&set, SIGTHR);
-        if (sigprocmask(SIG_BLOCK, &set, NULL))
-                err(1, "sigprocmask");
-        if (sigprocmask(SIG_SETMASK, &set, &oset))
-                err(1, "sigprocmask");
-        if (sigismember(&oset, SIGTHR))
-                errx(1, "SIGTHR blocked with SIG_BLOCK");
-        if (sigprocmask(SIG_BLOCK, NULL, &oset))
-                err(1, "sigprocmask");
-        if (sigismember(&oset, SIGTHR))
-                errx(1, "SIGTHR blocked with SIG_SETMASK");
-
-        /*
-         * check sigaction
-         */
-        if (sigaction(SIGTHR, NULL, &sa) == 0)
-                errx(1, "sigaction(SIGTHR) succeeded");
-        else if (errno != EINVAL)
-                err(1, "sigaction(SIGTHR) didn't fail with EINVAL");
-        memset(&sa, 0, sizeof sa);
-        sa.sa_handler = sighandler;
-        sigfillset(&sa.sa_mask);
-        sa.sa_flags = 0;
-        if (sigaction(SIGTHR, &sa, NULL) == 0)
-                errx(1, "sigaction(SIGTHR) succeeded");
-        else if (errno != EINVAL)
-                err(1, "sigaction(SIGTHR) didn't fail with EINVAL");
-        if (sigaction(SIGUSR1, &sa, NULL))
-                err(1, "sigaction(SIGUSR1)");
-        if (sigaction(SIGUSR1, NULL, &sa))
-                err(1, "sigaction(SIGUSR1)");
-        if (sigismember(&sa.sa_mask, SIGTHR))
-                errx(1, "SIGTHR blocked with sigaction");
-
-        return 0;
-}
diff --git a/src/regress/lib/libc/sleep/Makefile b/src/regress/lib/libc/sleep/Makefile
deleted file mode 100644
index 3700b1662a..0000000000
--- a/src/regress/lib/libc/sleep/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2009/12/14 05:08:19 guenther Exp $
-
-NOMAN=
-PROG=sleep_test
-CPPFLAGS+=-I${.CURDIR}/../../../../lib/libc
-
-run-regress-${PROG}: ${PROG}
-        [ x$$(./${PROG} 1) = x0 ] || exit 1
-        file=$$(mktemp -t sleep.XXXXXXXXXX); ./${PROG} 4 >$$file & pid=$$!; \
-                sleep 1; kill $$pid; sleep 1; v=$$(cat $$file); rm -f $$file; \
-                { [ $$v -gt 0 ] && [ $$v -lt 4 ] ; } || exit 2
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/sleep/sleep_test.c b/src/regress/lib/libc/sleep/sleep_test.c
deleted file mode 100644
index 4c7764375d..0000000000
--- a/src/regress/lib/libc/sleep/sleep_test.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*      $OpenBSD: sleep_test.c,v 1.2 2015/10/18 23:27:43 guenther Exp $ */
-
-/*
- * Copyright (c) 2009 Philip Guenther
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - Redistributions in binary form must reproduce the above
- *      copyright notice, this list of conditions and the following
- *      disclaimer in the documentation and/or other materials provided
- *      with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Test whether sleep returns the correct value
- */
-
-#include <sys/types.h>
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <signal.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static void
-handler(int sig)
-{
-        return;
-}
-
-static void *
-garbage(void)
-{
-        char buf[20];
-        strlcpy(buf, "012354678901235467890123546789", sizeof buf);
-        return buf;
-}
-
-int
-main(int argc, char *argv[])
-{
-        struct sigaction        sa;
-        char const      *errstr;
-        int     i;
-
-        if (argc != 2)
-                return (1);
-        errno = 0;
-        i = strtonum(argv[1], 0, INT_MAX, &errstr);
-        if (i == 0 && errno != 0) {
-                fprintf(stderr, "%s\n", errstr);
-                return (1);
-        }
-
-        memset(&sa, 0, sizeof sa);
-        sa.sa_handler = &handler;
-        if (sigaction(SIGTERM, &sa, NULL))
-                err(3, "sigaction");
-        garbage();
-        printf("%d\n", sleep(i));
-        return (0);
-}
-
diff --git a/src/regress/lib/libc/sprintf/Makefile b/src/regress/lib/libc/sprintf/Makefile
deleted file mode 100644
index 514d795f2f..0000000000
--- a/src/regress/lib/libc/sprintf/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2017/07/27 15:08:37 bluhm Exp $
-
-PROG =          sprintf_test
-CFLAGS =        -Wno-format
-CPPFLAGS =      -I${.CURDIR}/../../../../lib/libc
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/sprintf/sprintf_test.c b/src/regress/lib/libc/sprintf/sprintf_test.c
deleted file mode 100644
index 61c58f2f09..0000000000
--- a/src/regress/lib/libc/sprintf/sprintf_test.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*      $OpenBSD: sprintf_test.c,v 1.4 2004/09/18 19:31:32 otto Exp $ */
-
-/*
- * Copyright (c) 2003 Theo de Raadt
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - Redistributions in binary form must reproduce the above
- *      copyright notice, this list of conditions and the following
- *      disclaimer in the documentation and/or other materials provided
- *      with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-char correct[] =
-        "|xx 01 02 03 04\n"
-        "|xx 05 06 07 08\n"
-        "|xx 09 10 11 12\n"
-        "|xx 13 14 15 16\n"
-        "|xx 17 18 19 20\n"
-        "|xx 21 22 23 24\n"
-        "|xx 25 26 27 28\n"
-        "|xx 29 30 31 32\n"
-        "|xx 33 34 35 36\n"
-        "|xx 37 38 39 40\n"
-        "|xx 41 42 43 44\n"
-        "|xx 45 -1 1 -1 1\n";
-
-char correct2[] =
-        "1 0 -1 1 1 2 1 3 -1 4 1  \n"
-        "1 -1 1 1 -1 1  \n";
-
-int
-main(int argc, char *argv[])
-{
-        char buf[1024];
-        size_t sz1, sz2, sz3, sz4;
-        ptrdiff_t p1, p2, p3, p4;
-
-        /* Test positional arguments */
-        snprintf(buf, sizeof buf,
-            "|xx %1$s %2$s %3$s %4$s\n"
-            "|xx %5$s %6$s %7$s %8$s\n"
-            "|xx %9$s %10$s %11$s %12$s\n"
-            "|xx %13$s %14$s %15$s %16$s\n"
-            "|xx %17$s %18$s %19$s %20$s\n"
-            "|xx %21$s %22$s %23$s %24$s\n"
-            "|xx %25$s %26$s %27$s %28$s\n"
-            "|xx %29$s %30$s %31$s %32$s\n"
-            "|xx %33$s %34$s %35$s %36$s\n"
-            "|xx %37$s %38$s %39$s %40$s\n"
-            "|xx %41$s %42$s %43$s %44$s\n"
-            "|xx %45$d %46$ld %47$lld %48$d %49$lld\n",
-            "01", "02", "03", "04", "05", "06",
-            "07", "08", "09", "10", "11", "12",
-            "13", "14", "15", "16", "17", "18",
-            "19", "20", "21", "22", "23", "24",
-            "25", "26", "27", "28", "29", "30",
-            "31", "32", "33", "34", "35", "36",
-            "37", "38", "39", "40", "41", "42",
-            "43", "44", 45, -1L, 1LL, -1, 1LL
-            );
-
-        if (strcmp(buf, correct) != 0)
-                exit(1);
-
-        sz1 = (size_t)1;
-        sz2 = (size_t)-1;
-        p1 = (ptrdiff_t)1;
-        p2 = (ptrdiff_t)-1;
-        snprintf(buf, sizeof buf,
-                "%zx %d %zd %d %zu %d %tx %d %td %d %tu %zn %tn\n"
-                "%1$zx %3$zd %5$zu %7$tx %9$td %11$tu %14$zn %15$tn\n",
-                sz1, 0, sz2, 1, sz1, 2, p1, 3, p2, 4, p1, &sz3, &p3, &sz4, &p4);
-        if (strcmp(buf, correct2) != 0 || sz3 != 24 || p3 != 25 ||
-            sz4 != 40 || p4 != 41)
-                exit(1);
-        exit(0);
-}
diff --git a/src/regress/lib/libc/stdio_threading/Makefile b/src/regress/lib/libc/stdio_threading/Makefile
deleted file mode 100644
index e42481afc2..0000000000
--- a/src/regress/lib/libc/stdio_threading/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIR += fopen fread fwrite fgetln fgets fputs
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/stdio_threading/fgetln/Makefile b/src/regress/lib/libc/stdio_threading/fgetln/Makefile
deleted file mode 100644
index cad51e2b23..0000000000
--- a/src/regress/lib/libc/stdio_threading/fgetln/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TOPDIR=${.CURDIR}
-PROG=fgetln_test
-CFLAGS+=-I${TOPDIR}/../include/
-LDFLAGS+=-lpthread
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/stdio_threading/fgetln/fgetln_test.c b/src/regress/lib/libc/stdio_threading/fgetln/fgetln_test.c
deleted file mode 100755
index 76d154bb2a..0000000000
--- a/src/regress/lib/libc/stdio_threading/fgetln/fgetln_test.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2008 Bret S. Lambert <blambert@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "local.h"
-
-void
-fgetln_thread(void *v)
-{
-        FILE *file = v;
-        size_t len;
-        char *buf;
-        int i;
-
-        for (i = 0; i < 4096; i++) {
-                if ((buf = fgetln(file, &len)) == NULL) {
-
-                        if (feof(file))
-                                break;
-
-                        printf("OMG!!!\n");
-                        fflush(stdout);
-                        break;
-                }
-                if (strncmp(buf, TEXT_N, sizeof(TEXT_N)))
-                        err(1, "fgetln not atomic!!!");
-        }
-}
-
-int
-main(void)
-{
-        char sfn[24];
-        FILE *sfp;
-        int fd, i;
-
-        strlcpy(sfn, "/tmp/barnacles.XXXXXXXX", sizeof(sfn));
-        if ((fd = mkstemp(sfn)) == -1 ||
-            (sfp = fdopen(fd, "w+")) == NULL) {
-                int saved_errno = errno;
-                if (fd != -1) {
-                        unlink(sfn);
-                        close(fd);
-                }
-                errc(1, saved_errno, "could not open temporary file");
-        }
-
-        for (i = 0; i < 4096 * THREAD_COUNT; i++)
-                if (fwrite(TEXT_N, sizeof(char), strlen(TEXT_N), sfp) == 0)
-                        err(1, "Could not populate test file");
-
-        run_threads(fgetln_thread, sfp);
-
-        unlink(sfn);
-        close(fd);
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/stdio_threading/fgets/Makefile b/src/regress/lib/libc/stdio_threading/fgets/Makefile
deleted file mode 100644
index 52310fd429..0000000000
--- a/src/regress/lib/libc/stdio_threading/fgets/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TOPDIR=${.CURDIR}
-PROG=fgets_test
-CFLAGS+=-I${TOPDIR}/../include/
-LDFLAGS+=-lpthread
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/stdio_threading/fgets/fgets_test.c b/src/regress/lib/libc/stdio_threading/fgets/fgets_test.c
deleted file mode 100755
index 7c5008e2ad..0000000000
--- a/src/regress/lib/libc/stdio_threading/fgets/fgets_test.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2008 Bret S. Lambert <blambert@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "local.h"
-
-void
-fgets_thread(void *v)
-{
-        char buf[sizeof(TEXT_N) + 1];
-        FILE *file = v;
-        int i;
-
-        for (i = 0; i < 4096; i++) {
-                if (fgets(buf, sizeof(buf), file) == NULL) {
-
-                        if (feof(file))
-                                break;
-
-                        printf("OMG!!!\n");
-                        fflush(stdout);
-                        break;
-                }
-                if (strncmp(buf, TEXT, sizeof(TEXT)))
-                        err(1, "Read not atomic!!!");
-        }
-}
-
-int
-main(void)
-{
-        char sfn[24];
-        FILE *sfp;
-        int fd, i;
-
-        strlcpy(sfn, "/tmp/barnacles.XXXXXXXX", sizeof(sfn));
-        if ((fd = mkstemp(sfn)) == -1 ||
-            (sfp = fdopen(fd, "w+")) == NULL) {
-                int saved_errno = errno;
-                if (fd != -1) {
-                        unlink(sfn);
-                        close(fd);
-                }
-                errc(1, saved_errno, "could not open temporary file");
-        }
-
-        for (i = 0; i < 4096 * THREAD_COUNT; i++)
-                if (fwrite(TEXT_N, sizeof(char), strlen(TEXT_N), sfp) == 0)
-                        err(1, "Could not populate test file");
-
-        run_threads(fgets_thread, sfp);
-
-        unlink(sfn);
-        close(fd);
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/stdio_threading/fopen/Makefile b/src/regress/lib/libc/stdio_threading/fopen/Makefile
deleted file mode 100644
index e51deeff1d..0000000000
--- a/src/regress/lib/libc/stdio_threading/fopen/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TOPDIR=${.CURDIR}
-PROG=fopen_test
-CFLAGS+=-I${TOPDIR}/../include/
-LDFLAGS+=-lpthread
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/stdio_threading/fopen/fopen_test.c b/src/regress/lib/libc/stdio_threading/fopen/fopen_test.c
deleted file mode 100755
index 89172d9fb7..0000000000
--- a/src/regress/lib/libc/stdio_threading/fopen/fopen_test.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*      $OpenBSD: fopen_test.c,v 1.2 2015/01/20 04:41:01 krw Exp $      */
-/*
- * Copyright (c) 2008 Bret S. Lambert <blambert@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdio.h>
-#include <pthread.h>
-#include "local.h"
-
-int
-writefn(void *cookie, const char *buf, int size)
-{
-        return 0;
-}
-
-void
-fopen_thread(void *v)
-{
-        FILE *file;
-        int i;
-
-        for (i = 0; i < 4096; i++) {
-                file = fwopen(&i, writefn);
-                if (file != NULL) {
-                        fputc('0', file);
-                        pthread_yield();
-                        fclose(file);
-                }
-        }
-}
-
-int
-main(void)
-{
-        run_threads(fopen_thread, NULL);
-        exit(0);
-}
diff --git a/src/regress/lib/libc/stdio_threading/fputs/Makefile b/src/regress/lib/libc/stdio_threading/fputs/Makefile
deleted file mode 100644
index e561745581..0000000000
--- a/src/regress/lib/libc/stdio_threading/fputs/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TOPDIR=${.CURDIR}
-PROG=fputs_test
-CFLAGS+=-I${TOPDIR}/../include/
-LDFLAGS+=-lpthread
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/stdio_threading/fputs/fputs_test.c b/src/regress/lib/libc/stdio_threading/fputs/fputs_test.c
deleted file mode 100755
index 93d0f0b6c7..0000000000
--- a/src/regress/lib/libc/stdio_threading/fputs/fputs_test.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2008 Bret S. Lambert <blambert@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "local.h"
-
-void
-fputs_thread(void *v)
-{
-        FILE *file = v;
-        int i;
-
-        for (i = 0; i < 4096; i++) {
-                if (fputs(TEXT, file) != 0) {
-
-                        if (feof(file))
-                                break;
-
-                        printf("OMG!!!\n");
-                        fflush(stdout);
-                        break;
-                }
-        }
-}
-
-int
-main(void)
-{
-        char sfn[24];
-        char buf[sizeof(TEXT)];
-        FILE *sfp;
-        int fd;
-
-        strlcpy(sfn, "/tmp/barnacles.XXXXXXXX", sizeof(sfn));
-        if ((fd = mkstemp(sfn)) == -1 ||
-            (sfp = fdopen(fd, "w+")) == NULL) {
-                int saved_errno = errno;
-                if (fd != -1) {
-                        unlink(sfn);
-                        close(fd);
-                }
-                errc(1, saved_errno, "could not open temporary file");
-        }
-
-        run_threads(fputs_thread, sfp);
-
-        while (fgets(buf, sizeof(buf), sfp) != NULL)            /* verify */
-                if (strcmp(buf, TEXT))
-                        err(1, "Thread writes were not atomic!!!");
-
-        unlink(sfn);
-        close(fd);
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/stdio_threading/fread/Makefile b/src/regress/lib/libc/stdio_threading/fread/Makefile
deleted file mode 100644
index 25196dd7ab..0000000000
--- a/src/regress/lib/libc/stdio_threading/fread/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TOPDIR=${.CURDIR}
-PROG=fread_test
-CFLAGS+=-I${TOPDIR}/../include/
-LDFLAGS+=-lpthread
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/stdio_threading/fread/fread_test.c b/src/regress/lib/libc/stdio_threading/fread/fread_test.c
deleted file mode 100755
index 6bd734b470..0000000000
--- a/src/regress/lib/libc/stdio_threading/fread/fread_test.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2008 Bret S. Lambert <blambert@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdio.h>
-#include <pthread.h>
-#include "local.h"
-
-void
-fread_thread(void *v)
-{
-        char buf[sizeof(TEXT)];
-        FILE *file = v;
-        int i;
-
-        for (i = 0; i < 4096; i++) {
-                if (fread(buf, sizeof(char), strlen(TEXT), file) == 0) {
-
-                        if (feof(file))
-                                break;
-
-                        printf("OMG!!!\n");
-                        fflush(stdout);
-                        break;
-                }
-                if (strncmp(buf, TEXT, sizeof(TEXT)))
-                        err(1, "Read not atomic!!!");
-        }
-}
-
-int
-main(void)
-{
-        char sfn[24];
-        FILE *sfp;
-        int fd, i;
-
-        strlcpy(sfn, "/tmp/barnacles.XXXXXXXX", sizeof(sfn));
-        if ((fd = mkstemp(sfn)) == -1 ||
-            (sfp = fdopen(fd, "w+")) == NULL) {
-                int saved_errno = errno;
-                if (fd != -1) {
-                        unlink(sfn);
-                        close(fd);
-                }
-                errc(1, saved_errno, "could not open temporary file");
-        }
-
-        for (i = 0; i < 4096 * THREAD_COUNT; i++)
-                if (fwrite(TEXT, sizeof(char), strlen(TEXT), sfp) == 0)
-                        err(1, "Could not populate test file");
-
-        run_threads(fread_thread, sfp);
-
-        unlink(sfn);
-        close(fd);
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/stdio_threading/fwrite/Makefile b/src/regress/lib/libc/stdio_threading/fwrite/Makefile
deleted file mode 100644
index e79899c475..0000000000
--- a/src/regress/lib/libc/stdio_threading/fwrite/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TOPDIR=${.CURDIR}
-PROG=fwrite_test
-CFLAGS+=-I${TOPDIR}/../include/
-LDFLAGS+=-lpthread
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/stdio_threading/fwrite/fwrite_test.c b/src/regress/lib/libc/stdio_threading/fwrite/fwrite_test.c
deleted file mode 100755
index 86c450cbc9..0000000000
--- a/src/regress/lib/libc/stdio_threading/fwrite/fwrite_test.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2008 Bret S. Lambert <blambert@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "local.h"
-
-void
-fwrite_thread(void *v)
-{
-        FILE *file = v;
-        int i;
-
-        for (i = 0; i < 4096; i++) {
-                if (fwrite(TEXT, sizeof(char), strlen(TEXT), file) == 0) {
-
-                        if (feof(file))
-                                break;
-
-                        printf("OMG!!!\n");
-                        fflush(stdout);
-                        break;
-                }
-        }
-}
-
-int
-main(void)
-{
-        char sfn[24];
-        char buf[sizeof(TEXT)];
-        FILE *sfp;
-        int fd;
-
-        strlcpy(sfn, "/tmp/barnacles.XXXXXXXX", sizeof(sfn));
-        if ((fd = mkstemp(sfn)) == -1 ||
-            (sfp = fdopen(fd, "w+")) == NULL) {
-                int saved_errno = errno;
-                if (fd != -1) {
-                        unlink(sfn);
-                        close(fd);
-                }
-                errc(1, saved_errno, "could not open temporary file");
-        }
-
-        run_threads(fwrite_thread, sfp);
-
-        while (fread(buf, sizeof(char), strlen(TEXT), sfp))     /* verify */
-                if (strncmp(buf, TEXT, sizeof(TEXT)))
-                        err(1, "Thread writes were not atomic!!!");
-
-        unlink(sfn);
-        close(fd);
-
-        exit(0);
-}
diff --git a/src/regress/lib/libc/stdio_threading/include/local.h b/src/regress/lib/libc/stdio_threading/include/local.h
deleted file mode 100644
index 7a7822a452..0000000000
--- a/src/regress/lib/libc/stdio_threading/include/local.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2008 Bret S. Lambert <blambert@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <pthread.h>
-
-#define THREAD_COUNT 64
-
-#define TEXT    "barnacles"
-#define TEXT_N  "barnacles\n"
-
-void    run_threads(void (*)(void *), void *);
-
-static pthread_rwlock_t start;
-static void     (*real_func)(void *);
-
-static void *
-thread(void *arg)
-{
-        int     r;
-
-        if ((r = pthread_rwlock_rdlock(&start)))
-                errc(1, r, "could not obtain lock in thread");
-        real_func(arg);
-        if ((r = pthread_rwlock_unlock(&start)))
-                errc(1, r, "could not release lock in thread");
-        return NULL;
-}
-
-void
-run_threads(void (*func)(void *), void *arg)
-{
-        pthread_t       self, pthread[THREAD_COUNT];
-        int     i, r;
-
-        self = pthread_self();
-        real_func = func;
-        if ((r = pthread_rwlock_init(&start, NULL)))
-                errc(1, r, "could not initialize lock");
-
-        if ((r = pthread_rwlock_wrlock(&start)))                /* block */
-                errc(1, r, "could not lock lock");
-
-        for (i = 0; i < THREAD_COUNT; i++)
-                if ((r = pthread_create(&pthread[i], NULL, thread, arg))) {
-                        warnc(r, "could not create thread");
-                        pthread[i] = self;
-                }
-
-
-        if ((r = pthread_rwlock_unlock(&start)))                /* unleash */
-                errc(1, r, "could not release lock");
-
-        sleep(1);
-
-        if ((r = pthread_rwlock_wrlock(&start)))                /* sync */
-                errx(1, "parent could not sync with children: %s",
-                    strerror(r));
-
-        for (i = 0; i < THREAD_COUNT; i++)
-                if (! pthread_equal(pthread[i], self) &&
-                    (r = pthread_join(pthread[i], NULL)))
-                        warnc(r, "could not join thread");
-}
-
diff --git a/src/regress/lib/libc/stpncpy/Makefile b/src/regress/lib/libc/stpncpy/Makefile
deleted file mode 100644
index 9333934da6..0000000000
--- a/src/regress/lib/libc/stpncpy/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-PROG=stpncpy_test
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/stpncpy/stpncpy_test.c b/src/regress/lib/libc/stpncpy/stpncpy_test.c
deleted file mode 100644
index 63b7d25e53..0000000000
--- a/src/regress/lib/libc/stpncpy/stpncpy_test.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $OpenBSD: stpncpy_test.c,v 1.1 2012/07/11 10:46:23 naddy Exp $ */
-
-/*
- * Public domain, 2012, Christian Weisgerber <naddy@openbsd.org>
- */
-
-#include <string.h>
-
-int main(void)
-{
-        char dst[8];
-        char *src = "abcdef";
-
-        if (stpncpy(dst, src, 5) != dst + 5)
-                return 1;
-        if (stpncpy(dst, src, 6) != dst + 6)
-                return 1;
-        if (stpncpy(dst, src, 7) != dst + 6)
-                return 1;
-        if (stpncpy(dst, src, 8) != dst + 6)
-                return 1;
-        
-        return 0;
-}
diff --git a/src/regress/lib/libc/strerror/Makefile b/src/regress/lib/libc/strerror/Makefile
deleted file mode 100644
index 448b6da903..0000000000
--- a/src/regress/lib/libc/strerror/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2004/04/30 17:15:12 espie Exp $
-
-NOMAN=
-PROG=strerror_test
-CPPFLAGS+=-I${.CURDIR}/../../../../lib/libc
-CLEANFILES+= invalid.out valid.out
-
-run-regress-strerror_test: ${PROG}
-        ./${PROG} >${.OBJDIR}/valid.out
-        cmp -s ${.OBJDIR}/valid.out ${.CURDIR}/valid.ok
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/strerror/strerror_test.c b/src/regress/lib/libc/strerror/strerror_test.c
deleted file mode 100644
index 23b542f1ee..0000000000
--- a/src/regress/lib/libc/strerror/strerror_test.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $OpenBSD: strerror_test.c,v 1.5 2015/09/14 06:31:25 guenther Exp $ */
-/*
- * Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <signal.h>
-#include <string.h>
-#include <stdio.h>
-#include <limits.h>
-#include <errno.h>
-
-void
-check_strerror_r(int val)
-{
-        char buffer[NL_TEXTMAX + 1];
-        int i, r;
-
-        memset(buffer, 'X', sizeof(buffer) - 1);
-        buffer[sizeof(buffer) - 1] = '\0';
-        (void)strerror_r(val, NULL, 0); /* XXX */
-        for (i = 0; i < 25; i++) {
-                r = strerror_r(val, buffer, i);
-                printf("%d %d %zu: %s\n", i, r, strlen(buffer), buffer);
-        }
-}
-
-void
-check_strsignal(int val)
-{
-        printf("%s\n", strsignal(val));
-}
-
-int 
-main()
-{
-        printf("%s\n", strerror(21345));
-        printf("%s\n", strerror(-21345));
-        printf("%s\n", strerror(0));
-        printf("%s\n", strerror(INT_MAX));
-        printf("%s\n", strerror(INT_MIN));
-        printf("%s\n", strerror(EPERM));
-        check_strerror_r(EPERM);
-        check_strerror_r(21345);
-        check_strsignal(-1);
-        check_strsignal(0);
-        check_strsignal(10);
-        check_strsignal(NSIG-1);
-        check_strsignal(NSIG);
-        check_strsignal(100);
-        check_strsignal(INT_MAX);
-        check_strsignal(INT_MIN);
-        check_strsignal(UINT_MAX);
-        return 0;
-}
diff --git a/src/regress/lib/libc/strerror/valid.ok b/src/regress/lib/libc/strerror/valid.ok
deleted file mode 100644
index cbc365c598..0000000000
--- a/src/regress/lib/libc/strerror/valid.ok
+++ /dev/null
@@ -1,65 +0,0 @@
-Unknown error: 21345
-Unknown error: -21345
-Undefined error: 0
-Unknown error: 2147483647
-Unknown error: -2147483648
-Operation not permitted
-0 34 255: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-1 34 0: 
-2 34 1: O
-3 34 2: Op
-4 34 3: Ope
-5 34 4: Oper
-6 34 5: Opera
-7 34 6: Operat
-8 34 7: Operati
-9 34 8: Operatio
-10 34 9: Operation
-11 34 10: Operation 
-12 34 11: Operation n
-13 34 12: Operation no
-14 34 13: Operation not
-15 34 14: Operation not 
-16 34 15: Operation not p
-17 34 16: Operation not pe
-18 34 17: Operation not per
-19 34 18: Operation not perm
-20 34 19: Operation not permi
-21 34 20: Operation not permit
-22 34 21: Operation not permitt
-23 34 22: Operation not permitte
-24 0 23: Operation not permitted
-0 34 255: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-1 34 0: 
-2 34 1: U
-3 34 2: Un
-4 34 3: Unk
-5 34 4: Unkn
-6 34 5: Unkno
-7 34 6: Unknow
-8 34 7: Unknown
-9 34 8: Unknown 
-10 34 9: Unknown e
-11 34 10: Unknown er
-12 34 11: Unknown err
-13 34 12: Unknown erro
-14 34 13: Unknown error
-15 34 14: Unknown error:
-16 34 15: Unknown error: 
-17 34 15: Unknown error: 
-18 34 15: Unknown error: 
-19 34 15: Unknown error: 
-20 34 15: Unknown error: 
-21 22 20: Unknown error: 21345
-22 22 20: Unknown error: 21345
-23 22 20: Unknown error: 21345
-24 22 20: Unknown error: 21345
-Unknown signal: 4294967295
-Signal 0
-Bus error
-Thread AST
-Unknown signal: 33
-Unknown signal: 100
-Unknown signal: 2147483647
-Unknown signal: 2147483648
-Unknown signal: 4294967295
diff --git a/src/regress/lib/libc/strlcat/Makefile b/src/regress/lib/libc/strlcat/Makefile
deleted file mode 100644
index 858cb22696..0000000000
--- a/src/regress/lib/libc/strlcat/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/12/02 17:48:34 millert Exp $
-
-PROG=   strlcattest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/strlcat/strlcattest.c b/src/regress/lib/libc/strlcat/strlcattest.c
deleted file mode 100644
index 155aa6f727..0000000000
--- a/src/regress/lib/libc/strlcat/strlcattest.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*      $OpenBSD: strlcattest.c,v 1.2 2014/12/03 18:25:18 millert Exp $ */
-
-/*
- * Copyright (c) 2014 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <unistd.h>
-
-volatile sig_atomic_t got_signal;
-sigjmp_buf jmpenv;
-
-void
-handler(int signo)
-{
-        got_signal = signo;
-        siglongjmp(jmpenv, 1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        char *buf, *cp, *ep;
-        struct sigaction sa;
-        size_t len, bufsize;
-        int failures = 0;
-
-        /* Enable malloc security options. */
-        setenv("MALLOC_OPTIONS", "S", 0);
-
-        bufsize = getpagesize(); /* trigger guard pages easily */
-        buf = malloc(bufsize);
-        if (buf == NULL) {
-                fprintf(stderr, "unable to allocate memory\n");
-                return 1;
-        }
-        memset(buf, 'z', bufsize);
-        ep = buf + bufsize;
-
-        /* Test appending to an unterminated string. */
-        len = strlcat(buf, "abcd", bufsize);
-        if (len != 4 + bufsize) {
-                fprintf(stderr,
-                    "strlcat: failed unterminated buffer test (1a)\n");
-                failures++;
-        }
-        /* Make sure we only wrote where expected. */
-        for (cp = buf; cp < ep; cp++) {
-                if (*cp != 'z') {
-                        fprintf(stderr,
-                            "strlcat: failed unterminated buffer test (1b)\n");
-                        failures++;
-                        break;
-                }
-        }
-
-        /* Test appending to a full string. */
-        ep[-1] = '\0';
-        len = strlcat(buf, "abcd", bufsize);
-        if (len != 4 + bufsize - 1) {
-                fprintf(stderr, "strlcat: failed full buffer test (2a)\n");
-                failures++;
-        }
-        /* Make sure we only wrote where expected. */
-        for (cp = buf; cp < ep - 1; cp++) {
-                if (*cp != 'z') {
-                        fprintf(stderr,
-                            "strlcat: failed full buffer test (2b)\n");
-                        failures++;
-                        break;
-                }
-        }
-
-        /* Test appending to an empty string. */
-        ep[-1] = 'z';
-        buf[0] = '\0';
-        len = strlcat(buf, "abcd", bufsize);
-        if (len != 4) {
-                fprintf(stderr, "strlcat: failed empty buffer test (3a)\n");
-                failures++;
-        }
-        /* Make sure we only wrote where expected. */
-        if (memcmp(buf, "abcd", sizeof("abcd")) != 0) {
-                fprintf(stderr, "strlcat: failed empty buffer test (3b)\n");
-                failures++;
-        }
-        for (cp = buf + len + 1; cp < ep; cp++) {
-                if (*cp != 'z') {
-                        fprintf(stderr,
-                            "strlcat: failed empty buffer test (3c)\n");
-                        failures++;
-                        break;
-                }
-        }
-
-        /* Test appending to a NUL-terminated string. */
-        memcpy(buf, "abcd", sizeof("abcd"));
-        len = strlcat(buf, "efgh", bufsize);
-        if (len != 8) {
-                fprintf(stderr, "strlcat: failed empty buffer test (4a)\n");
-                failures++;
-        }
-        /* Make sure we only wrote where expected. */
-        if (memcmp(buf, "abcdefgh", sizeof("abcdefgh")) != 0) {
-                fprintf(stderr, "strlcat: failed empty buffer test (4b)\n");
-                failures++;
-        }
-        for (cp = buf + len + 1; cp < ep; cp++) {
-                if (*cp != 'z') {
-                        fprintf(stderr,
-                            "strlcat: failed empty buffer test (4c)\n");
-                        failures++;
-                        break;
-                }
-        }
-
-        /*
-         * The following tests should result in SIGSEGV, however some
-         * systems may erroneously report SIGBUS.
-         * These tests assume that strlcat() is signal-safe.
-         */
-        memset(&sa, 0, sizeof(sa));
-        sigemptyset(&sa.sa_mask);
-        sa.sa_handler = handler;
-        sigaction(SIGSEGV, &sa, NULL);
-        sigaction(SIGBUS, &sa, NULL);
-
-        /* Test copying to a NULL buffer with non-zero size. */
-        got_signal = 0;
-        if (sigsetjmp(jmpenv, 1) == 0) {
-                len = strlcat(NULL, "abcd", sizeof(buf));
-                fprintf(stderr, "strlcat: failed NULL dst test (5a), "
-                    "expected signal %d, got len %zu\n", SIGSEGV, len);
-                failures++;
-        } else if (got_signal != SIGSEGV) {
-                fprintf(stderr, "strlcat: failed NULL dst test (5b), "
-                    "expected signal %d, got %d\n", SIGSEGV, got_signal);
-                failures++;
-        }
-
-        /* Test copying from a NULL src. */
-        memcpy(buf, "abcd", sizeof("abcd"));
-        got_signal = 0;
-        if (sigsetjmp(jmpenv, 1) == 0) {
-                len = strlcat(buf, NULL, sizeof(buf));
-                fprintf(stderr, "strlcat: failed NULL src test (6a), "
-                    "expected signal %d, got len %zu\n", SIGSEGV, len);
-                failures++;
-        } else if (got_signal != SIGSEGV) {
-                fprintf(stderr, "strlcat: failed NULL src test (6b), "
-                    "expected signal %d, got %d\n", SIGSEGV, got_signal);
-                failures++;
-        }
-
-        return failures;
-}
diff --git a/src/regress/lib/libc/strlcpy/Makefile b/src/regress/lib/libc/strlcpy/Makefile
deleted file mode 100644
index 921354432b..0000000000
--- a/src/regress/lib/libc/strlcpy/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/12/02 20:23:05 millert Exp $
-
-PROG=   strlcpytest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/strlcpy/strlcpytest.c b/src/regress/lib/libc/strlcpy/strlcpytest.c
deleted file mode 100644
index df5d36366c..0000000000
--- a/src/regress/lib/libc/strlcpy/strlcpytest.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*      $OpenBSD: strlcpytest.c,v 1.2 2014/12/03 18:25:18 millert Exp $ */
-
-/*
- * Copyright (c) 2014 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <unistd.h>
-
-volatile sig_atomic_t got_signal;
-sigjmp_buf jmpenv;
-
-void
-handler(int signo)
-{
-        got_signal = signo;
-        siglongjmp(jmpenv, 1);
-}
-
-int
-main(int argc, char *argv[])
-{
-        char *buf, *buf2, *cp, *ep;
-        struct sigaction sa;
-        size_t len, bufsize;
-        int failures = 0;
-
-        /* Enable malloc security options. */
-        setenv("MALLOC_OPTIONS", "S", 0);
-
-        bufsize = getpagesize(); /* trigger guard pages easily */
-        buf = malloc(bufsize);
-        buf2 = malloc(bufsize);
-        if (buf == NULL || buf2 == NULL) {
-                fprintf(stderr, "unable to allocate memory\n");
-                return 1;
-        }
-        memset(buf, 'z', bufsize);
-        ep = buf + bufsize;
-
-        /* Test copying to a zero-length NULL buffer. */
-        len = strlcpy(NULL, "abcd", 0);
-        if (len != 4) {
-                fprintf(stderr,
-                    "strlcpy: failed zero-length buffer test (1a)\n");
-                failures++;
-        }
-
-        /* Test copying small string to a large buffer. */
-        len = strlcpy(buf, "abcd", bufsize);
-        if (len != 4) {
-                fprintf(stderr, "strlcpy: failed large buffer test (2a)\n");
-                failures++;
-        }
-        /* Make sure we only wrote where expected. */
-        if (memcmp(buf, "abcd", sizeof("abcd")) != 0) {
-                fprintf(stderr, "strlcpy: failed large buffer test (2b)\n");
-                failures++;
-        }
-        for (cp = buf + len + 1; cp < ep; cp++) {
-                if (*cp != 'z') {
-                        fprintf(stderr,
-                            "strlcpy: failed large buffer test (2c)\n");
-                        failures++;
-                        break;
-                }
-        }
-
-        /* Test copying large string to a small buffer. */
-        memset(buf, 'z', bufsize);
-        memset(buf2, 'x', bufsize - 1);
-        buf2[bufsize - 1] = '\0';
-        len = strlcpy(buf, buf2, bufsize / 2);
-        if (len != bufsize - 1) {
-                fprintf(stderr, "strlcpy: failed small buffer test (3a)\n");
-                failures++;
-        }
-        /* Make sure we only wrote where expected. */
-        len = (bufsize / 2) - 1;
-        if (memcmp(buf, buf2, len) != 0 || buf[len] != '\0') {
-                fprintf(stderr, "strlcpy: failed small buffer test (3b)\n");
-                failures++;
-        }
-        for (cp = buf + len + 1; cp < ep; cp++) {
-                if (*cp != 'z') {
-                        fprintf(stderr,
-                            "strlcpy: failed small buffer test (3c)\n");
-                        failures++;
-                        break;
-                }
-        }
-
-        /* Test copying to a 1-byte buffer. */
-        memset(buf, 'z', bufsize);
-        len = strlcpy(buf, "abcd", 1);
-        if (len != 4) {
-                fprintf(stderr, "strlcpy: failed 1-byte buffer test (4a)\n");
-                failures++;
-        }
-        /* Make sure we only wrote where expected. */
-        if (buf[0] != '\0') {
-                fprintf(stderr, "strlcpy: failed 1-byte buffer test (4b)\n");
-                failures++;
-        }
-        for (cp = buf + 1; cp < ep; cp++) {
-                if (*cp != 'z') {
-                        fprintf(stderr,
-                            "strlcpy: failed 1-byte buffer test (4c)\n");
-                        failures++;
-                        break;
-                }
-        }
-
-        /*
-         * The following tests should result in SIGSEGV, however some
-         * systems may erroneously report SIGBUS.
-         * These tests assume that strlcpy() is signal-safe.
-         */
-        memset(&sa, 0, sizeof(sa));
-        sigemptyset(&sa.sa_mask);
-        sa.sa_handler = handler;
-        sigaction(SIGSEGV, &sa, NULL);
-        sigaction(SIGBUS, &sa, NULL);
-
-        /* Test copying to a NULL buffer with non-zero size. */
-        got_signal = 0;
-        if (sigsetjmp(jmpenv, 1) == 0) {
-                len = strlcpy(NULL, "abcd", sizeof(buf));
-                fprintf(stderr, "strlcpy: failed NULL dst test (5a), "
-                    "expected signal %d, got len %zu\n", SIGSEGV, len);
-                failures++;
-        } else if (got_signal != SIGSEGV) {
-                fprintf(stderr, "strlcpy: failed NULL dst test (5b), "
-                    "expected signal %d, got %d\n", SIGSEGV, got_signal);
-                failures++;
-        }
-
-        /* Test copying from a NULL src. */
-        got_signal = 0;
-        if (sigsetjmp(jmpenv, 1) == 0) {
-                len = strlcpy(buf, NULL, sizeof(buf));
-                fprintf(stderr, "strlcpy: failed NULL src test (6a), "
-                    "expected signal %d, got len %zu\n", SIGSEGV, len);
-                failures++;
-        } else if (got_signal != SIGSEGV) {
-                fprintf(stderr, "strlcpy: failed NULL src test (6b), "
-                    "expected signal %d, got %d\n", SIGSEGV, got_signal);
-                failures++;
-        }
-
-        return failures;
-}
diff --git a/src/regress/lib/libc/strnlen/Makefile b/src/regress/lib/libc/strnlen/Makefile
deleted file mode 100644
index e7c74972e1..0000000000
--- a/src/regress/lib/libc/strnlen/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2010/06/02 12:20:47 millert Exp $
-
-PROG=   strnlentest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/strnlen/strnlentest.c b/src/regress/lib/libc/strnlen/strnlentest.c
deleted file mode 100644
index e67e6adfb8..0000000000
--- a/src/regress/lib/libc/strnlen/strnlentest.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*      $OpenBSD: strnlentest.c,v 1.1 2010/06/02 12:20:47 millert Exp $ */
-
-/*
- * Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-int main(int argc, char *argv[])
-{
-        char *buf;
-        int failures = 0;
-        size_t len, bufsize;
-
-        /* Enable malloc security options. */
-        setenv("MALLOC_OPTIONS", "S", 0);
-
-        bufsize = getpagesize(); /* trigger guard pages easily */
-        buf = malloc(bufsize);
-        if (buf == NULL) {
-                fprintf(stderr, "unable to allocate memory\n");
-                return 1;
-        }
-        memset(buf, 'a', bufsize);
-
-        len = strnlen(buf, bufsize);
-        if (len != bufsize) {
-                fprintf(stderr, "strnlen: failed unterminated buffer test (1)");
-                failures++;
-        }
-
-        len = strnlen(buf, bufsize / 2);
-        if (len != bufsize / 2) {
-                fprintf(stderr, "strnlen: failed unterminated buffer test (2)");
-                failures++;
-        }
-
-        buf[bufsize - 1] = '\0';
-        len = strnlen(buf, bufsize);
-        if (len != bufsize - 1) {
-                fprintf(stderr, "strnlen: failed NUL-terminated buffer test (1)");
-                failures++;
-        }
-
-        len = strnlen(buf, (size_t)-1);
-        if (len != bufsize - 1) {
-                fprintf(stderr, "strnlen: failed NUL-terminated buffer test (2)");
-                failures++;
-        }
-
-        return failures;
-}
diff --git a/src/regress/lib/libc/strtod/Makefile b/src/regress/lib/libc/strtod/Makefile
deleted file mode 100644
index 030c0e7f56..0000000000
--- a/src/regress/lib/libc/strtod/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2006/09/29 11:00:24 otto Exp $
-
-PROG=   strtodtest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/strtod/strtodtest.c b/src/regress/lib/libc/strtod/strtodtest.c
deleted file mode 100644
index 570a002b18..0000000000
--- a/src/regress/lib/libc/strtod/strtodtest.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*      $OpenBSD: strtodtest.c,v 1.2 2017/02/25 07:28:32 jsg Exp $      */
-/* Public domain, Otto Moerbeek <otto@drijf.net>, 2006. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <err.h>
-
-/*
- * Checks if strtod() reports underflow.
- */
-
-int
-main()
-{
-        char *tmp="0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002";
-        double d;
-
-        d = strtod(tmp, NULL);
-        if (errno != ERANGE)
-                errx(1, "errno = %d", errno);
-        return (0);
-}
diff --git a/src/regress/lib/libc/strtol/Makefile b/src/regress/lib/libc/strtol/Makefile
deleted file mode 100644
index 3e2f4c746d..0000000000
--- a/src/regress/lib/libc/strtol/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2012/11/18 04:11:09 jsing Exp $
-
-PROG=   strtoltest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/strtol/strtoltest.c b/src/regress/lib/libc/strtol/strtoltest.c
deleted file mode 100644
index 2efd7b3ad1..0000000000
--- a/src/regress/lib/libc/strtol/strtoltest.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*      $OpenBSD: strtoltest.c,v 1.4 2017/07/15 17:08:26 jsing Exp $    */
-/*
- * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-struct strtol_test {
-        char    *input;
-        long    output;
-        char    end;
-        int     base;
-        int     err;
-};
-
-struct strtol_test strtol_tests[] = {
-        {"1234567890",  1234567890L,    '\0',   0,      0},
-        {"0755",        493L,           '\0',   0,      0},
-        {"0x7fFFffFf",  2147483647L,    '\0',   0,      0},
-        {"1234567890",  0L,             '1',    1,      EINVAL},
-        {"10101010",    170L,           '\0',   2,      0},
-        {"755",         493L,           '\0',   8,      0},
-        {"1234567890",  1234567890L,    '\0',   10,     0},
-        {"abc",         0L,             'a',    10,     0},
-        {"123xyz",      123L,           'x',    10,     0},
-        {"-080000000",  -2147483648L,   '\0',   16,     0},
-        {"deadbeefdeadbeef", LONG_MAX,  '\0',   16,     ERANGE},
-        {"deadzbeef",   57005L,         'z',    16,     0},
-        {"0xy",         0L,             'x',    16,     0},
-        {"-quitebigmchuge", LONG_MIN,   '\0',   32,     ERANGE},
-        {"zzz",         46655L,         '\0',   36,     0},
-        {"1234567890",  0L,             '1',    37,     EINVAL},
-        {"1234567890",  0L,             '1',    123,    EINVAL},
-};
-
-int
-main(int argc, char **argv)
-{
-        struct strtol_test *test;
-        int failure = 0;
-        char *end;
-        u_int i;
-        long n;
-
-        for (i = 0; i < (sizeof(strtol_tests) / sizeof(strtol_tests[0])); i++) {
-                test = &strtol_tests[i];
-                errno = 0;
-                n = strtol(test->input, &end, test->base);
-                if (n != test->output) {
-                        fprintf(stderr, "TEST %i FAILED: %s base %i: %li\n",
-                            i, test->input, test->base, n);
-                        failure = 1;
-                } else if (*end != test->end) {
-                        fprintf(stderr, "TEST %i FAILED: end is not %c: %c\n",
-                            i, test->end, *end);
-                        failure = 1;
-                } else if (errno != test->err) {
-                        fprintf(stderr, "TEST %i FAILED: errno is not %i: %i\n",
-                            i, test->err, errno);
-                        failure = 1;
-                }
-        }
-
-        return failure;
-}
diff --git a/src/regress/lib/libc/strtonum/Makefile b/src/regress/lib/libc/strtonum/Makefile
deleted file mode 100644
index e0e8ecd139..0000000000
--- a/src/regress/lib/libc/strtonum/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2004/08/03 20:38:36 otto Exp $
-
-PROG=   strtonumtest
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/strtonum/strtonumtest.c b/src/regress/lib/libc/strtonum/strtonumtest.c
deleted file mode 100644
index 7e82a007fe..0000000000
--- a/src/regress/lib/libc/strtonum/strtonumtest.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*      $OpenBSD: strtonumtest.c,v 1.1 2004/08/03 20:38:36 otto Exp $   */
-/*
- * Copyright (c) 2004 Otto Moerbeek <otto@drijf.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int fail;
-
-void
-test(const char *p, long long lb, long long ub, int ok)
-{
-        long long val;
-        const char *q;
-
-        val = strtonum(p, lb, ub, &q);
-        if (ok && q != NULL) {
-                fprintf(stderr, "%s [%lld-%lld] ", p, lb, ub);
-                fprintf(stderr, "NUMBER NOT ACCEPTED %s\n", q);
-                fail = 1;
-        } else if (!ok && q == NULL) {
-                fprintf(stderr, "%s [%lld-%lld] %lld ", p, lb, ub, val);
-                fprintf(stderr, "NUMBER ACCEPTED\n");
-                fail = 1;
-        }
-}
-
-int main(int argc, char *argv[])
-{
-        test("1", 0, 10, 1);
-        test("0", -2, 5, 1);
-        test("0", 2, 5, 0);
-        test("0", 2, LLONG_MAX, 0);
-        test("-2", 0, LLONG_MAX, 0);
-        test("0", -5, LLONG_MAX, 1);
-        test("-3", -3, LLONG_MAX, 1);
-        test("-9223372036854775808", LLONG_MIN, LLONG_MAX, 1);
-        test("9223372036854775807", LLONG_MIN, LLONG_MAX, 1);
-        test("-9223372036854775809", LLONG_MIN, LLONG_MAX, 0);
-        test("9223372036854775808", LLONG_MIN, LLONG_MAX, 0);
-        test("1000000000000000000000000", LLONG_MIN, LLONG_MAX, 0);
-        test("-1000000000000000000000000", LLONG_MIN, LLONG_MAX, 0);
-        test("-2", 10, -1, 0);
-        test("-2", -10, -1, 1);
-        test("-20", -10, -1, 0);
-        test("20", -10, -1, 0);
-
-        return (fail);
-}
-
diff --git a/src/regress/lib/libc/telldir/Makefile b/src/regress/lib/libc/telldir/Makefile
deleted file mode 100644
index 728ae90e1e..0000000000
--- a/src/regress/lib/libc/telldir/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2013/11/03 00:20:24 schwarze Exp $
-
-PROG =  telldir
-SRCS =  utils.c shortseek.c telldir.c main.c
-
-cleandir:
-        rm -rf d
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/telldir/main.c b/src/regress/lib/libc/telldir/main.c
deleted file mode 100644
index 23ffa65dbf..0000000000
--- a/src/regress/lib/libc/telldir/main.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*      $OpenBSD: main.c,v 1.1 2013/11/03 00:20:24 schwarze Exp $       */
-
-/*      Written by Ingo Schwarze, 2013,  Public domain. */
-
-void shortseek(void);
-void longseek(void);
-
-int
-main(void)
-{
-        shortseek();
-        longseek();
-        return(0);
-}
diff --git a/src/regress/lib/libc/telldir/shortseek.c b/src/regress/lib/libc/telldir/shortseek.c
deleted file mode 100644
index 9b2141ab4c..0000000000
--- a/src/regress/lib/libc/telldir/shortseek.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*      $OpenBSD: shortseek.c,v 1.1 2013/11/03 00:20:24 schwarze Exp $  */
-
-/*      Written by Otto Moerbeek, 2006,  Public domain. */
-/*      Modified by Ingo Schwarze, 2013,  Public domain. */
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <err.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "utils.h"
-
-#define NFILES 5
-
-static void
-shortloop(DIR *dp, int iend, int iback)
-{
-        struct dirent *f;
-        char fend[PATH_MAX], fback[PATH_MAX];
-        long pos, t, remember = -1;
-        int i;
-
-        rewinddir(dp);
-        snprintf(fend, sizeof fend, "%d", iend);
-        snprintf(fback, sizeof fback, "%d", iback);
-
-        /* Scan to iend, remember where iback is. */
-
-        for (;;) {
-                pos = telldir(dp);
-                f = readdir(dp);
-                if (f == NULL)
-                        errx(1, "file %s not found", fend);
-                if (strcmp(fback, f->d_name) == 0)
-                        remember = pos;
-                if (strcmp(fend, f->d_name) == 0)
-                        break;
-        }
-        if (remember == -1)
-                errx(1, "file %s not found", fback);
-
-        /* Go back to iback, checking seekdir, telldir and readdir. */
-
-        seekdir(dp, remember);
-        if ((t = telldir(dp)) != remember)
-                errx(1, "tell after seek %s %ld != %ld", fback, t, remember);
-        if ((t = telldir(dp)) != remember)
-                errx(1, "tell after tell %s %ld != %ld", fback, t, remember);
-        f = readdir(dp);
-        if (f == NULL)
-                errx(1, "readdir %s at %ld", fback, remember);
-
-        if (strcmp(f->d_name, fback))
-                errx(1, "name mismatch: %s != %s", f->d_name, fback);
-
-        /* Check that readdir can iterate the remaining files. */
-
-        for (i = iback + 1; i < NFILES; i++) {
-                f = readdir(dp);
-                if (f == NULL)
-                        errx(1, "readdir %i failed", i);
-        }
-
-        /* Check that readdir stops at the right place. */
-
-        f = readdir(dp);
-        if (f != NULL)
-                errx(1, "readdir %i returned %s", NFILES, f->d_name);
-}
-
-void
-shortseek(void)
-{
-        DIR *dp;
-        int iend, iback;
-
-        createfiles(NFILES);
-
-        dp = opendir("d");
-        if (dp == NULL)
-                err(1, "shortseek: opendir");
-
-        for (iend = 0; iend < NFILES; iend++)
-                for (iback = 0; iback <= iend; iback++)
-                        shortloop(dp, iend, iback);
-
-        closedir(dp);
-        delfiles();
-}
diff --git a/src/regress/lib/libc/telldir/telldir.c b/src/regress/lib/libc/telldir/telldir.c
deleted file mode 100644
index d2879cc701..0000000000
--- a/src/regress/lib/libc/telldir/telldir.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*      $OpenBSD: telldir.c,v 1.4 2013/11/03 00:20:24 schwarze Exp $    */
-
-/*      Written by Otto Moerbeek, 2006,  Public domain. */
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <err.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "utils.h"
-
-#define NFILES 1000
-
-static void
-longloop(DIR *dp, int i)
-{
-        struct dirent *f;
-        char file[PATH_MAX];
-        long pos, t, remember = -1;
-
-        rewinddir(dp);
-        snprintf(file, sizeof file, "%d", i);
-
-        /* Scan through all files, remember where file i is. */
-
-        for (;;) {
-                pos = telldir(dp);
-                f = readdir(dp);
-                if (f == NULL)
-                        break;
-                if (strcmp(file, f->d_name) == 0)
-                        remember = pos;
-        }
-        if (remember == -1)
-                errx(1, "remember %s", file);
-
-        /* Go back to i, checking seekdir, telldir and readdir. */
-
-        seekdir(dp, remember);
-        if ((t = telldir(dp)) != remember)
-                errx(1, "tell after seek %s %ld != %ld", file, t, remember);
-        if ((t = telldir(dp)) != remember)
-                errx(1, "tell after tell %s %ld != %ld", file, t, remember);
-        f = readdir(dp);
-        if (f == NULL)
-                errx(1, "readdir %s at %ld", file, remember);
-
-        if (strcmp(f->d_name, file) != 0)
-                errx(1, "name mismatch: %s != %s", f->d_name, file);
-}
-
-void
-longseek(void)
-{
-        DIR *dp;
-        int i;
-
-        createfiles(NFILES);
-
-        dp = opendir("d");
-        if (dp == NULL)
-                err(1, "longseek: opendir");
-
-        for (i = 0; i < NFILES; i++)
-                longloop(dp, (i + NFILES/2) % NFILES);
-
-        closedir(dp);
-        delfiles();
-}
diff --git a/src/regress/lib/libc/telldir/utils.c b/src/regress/lib/libc/telldir/utils.c
deleted file mode 100644
index 7fb0401d70..0000000000
--- a/src/regress/lib/libc/telldir/utils.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*      $OpenBSD: utils.c,v 1.2 2017/07/27 15:08:37 bluhm Exp $ */
-
-/*      Written by Otto Moerbeek, 2006,  Public domain. */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <err.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "utils.h"
-
-void
-createfiles(int nfiles)
-{
-        int i, fd;
-        char file[PATH_MAX];
-
-        mkdir("d", 0755);
-        for (i = 0; i < nfiles; i++) {
-                snprintf(file, sizeof file, "d/%d", i);
-                if ((fd = open(file, O_CREAT | O_WRONLY, 0600)) == -1)
-                        err(1, "open %s", file);
-                close(fd);
-        }
-}
-
-void
-delfiles(void)
-{
-        DIR *dp;
-        struct dirent *f;
-        char file[PATH_MAX];
-
-        dp = opendir("d");
-        if (dp == NULL)
-                err(1, "opendir");
-        while ((f = readdir(dp))) {
-                if (strcmp(f->d_name, ".") == 0 ||
-                    strcmp(f->d_name, "..") == 0)
-                        continue;
-                snprintf(file, sizeof file, "d/%s", f->d_name);
-                if (unlink(file) == -1)
-                        err(1, "unlink %s", f->d_name);
-        }
-        closedir(dp);
-        if (rmdir("d") == -1)
-                err(1, "rmdir");
-}
diff --git a/src/regress/lib/libc/telldir/utils.h b/src/regress/lib/libc/telldir/utils.h
deleted file mode 100644
index 74ffcd4641..0000000000
--- a/src/regress/lib/libc/telldir/utils.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*      $OpenBSD: utils.h,v 1.1 2013/11/03 00:20:24 schwarze Exp $      */
-
-/*      Written by Ingo Schwarze, 2013,  Public domain. */
-
-void createfiles(int);
-void delfiles(void);
diff --git a/src/regress/lib/libc/time/Makefile b/src/regress/lib/libc/time/Makefile
deleted file mode 100644
index 28b5556027..0000000000
--- a/src/regress/lib/libc/time/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2004/01/20 16:47:55 millert Exp $
-
-SUBDIR+=strptime
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libc/time/strptime/Makefile b/src/regress/lib/libc/time/strptime/Makefile
deleted file mode 100644
index 1e1565ced4..0000000000
--- a/src/regress/lib/libc/time/strptime/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2012/12/16 18:28:53 jasper Exp $
-
-PROG=           strptime_test
-SRCS=           main.c
-CLEANFILES+=    got
-
-REGRESS_TARGETS=do-reg
-do-reg: ${PROG}
-        ./${PROG} < ${.CURDIR}/tests > got
-        diff -u ${.CURDIR}/expected got
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/time/strptime/expected b/src/regress/lib/libc/time/strptime/expected
deleted file mode 100644
index 21c95de7f9..0000000000
--- a/src/regress/lib/libc/time/strptime/expected
+++ /dev/null
@@ -1,346 +0,0 @@
---- ctime --- 1
-succeeded
-46 27 23 20 0 98 2 19
-
---- ctime --- 2
-succeeded
-46 27 23 20 0 98 2 19
-
---- ctime --- 3
-succeeded
-46 27 23 20 0 98 2 19
-
---- %a --- 1
-succeeded
--1 -1 -1 -1 -1 -1 0 -1
-
---- %a --- 2
-succeeded
--1 -1 -1 -1 -1 -1 0 -1
-
---- %a --- 3
-succeeded
--1 -1 -1 -1 -1 -1 1 -1
-
---- %a --- 4
-succeeded
--1 -1 -1 -1 -1 -1 1 -1
-
---- %a --- 5
-succeeded
--1 -1 -1 -1 -1 -1 2 -1
-
---- %a --- 6
-succeeded
--1 -1 -1 -1 -1 -1 2 -1
-
---- %a --- 7
-succeeded
--1 -1 -1 -1 -1 -1 3 -1
-
---- %a --- 8
-succeeded
--1 -1 -1 -1 -1 -1 3 -1
-
---- %a --- 9
-succeeded
--1 -1 -1 -1 -1 -1 4 -1
-
---- %a --- 10
-succeeded
--1 -1 -1 -1 -1 -1 4 -1
-
---- %a --- 11
-succeeded
--1 -1 -1 -1 -1 -1 5 -1
-
---- %a --- 12
-succeeded
--1 -1 -1 -1 -1 -1 5 -1
-
---- %a --- 13
-succeeded
--1 -1 -1 -1 -1 -1 6 -1
-
---- %a --- 14
-succeeded
--1 -1 -1 -1 -1 -1 6 -1
-
---- %a --- 15
-succeeded
--1 -1 -1 -1 -1 -1 6 -1
-urn
-
---- %a --- 16
-failed
---- %A --- 1
-succeeded
--1 -1 -1 -1 -1 -1 0 -1
-
---- %A --- 2
-succeeded
--1 -1 -1 -1 -1 -1 0 -1
-
---- %A --- 3
-succeeded
--1 -1 -1 -1 -1 -1 1 -1
-
---- %A --- 4
-succeeded
--1 -1 -1 -1 -1 -1 1 -1
-
---- %A --- 5
-succeeded
--1 -1 -1 -1 -1 -1 2 -1
-
---- %A --- 6
-succeeded
--1 -1 -1 -1 -1 -1 2 -1
-
---- %A --- 7
-succeeded
--1 -1 -1 -1 -1 -1 3 -1
-
---- %A --- 8
-succeeded
--1 -1 -1 -1 -1 -1 3 -1
-
---- %A --- 9
-succeeded
--1 -1 -1 -1 -1 -1 4 -1
-
---- %A --- 10
-succeeded
--1 -1 -1 -1 -1 -1 4 -1
-
---- %A --- 11
-succeeded
--1 -1 -1 -1 -1 -1 5 -1
-
---- %A --- 12
-succeeded
--1 -1 -1 -1 -1 -1 5 -1
-
---- %A --- 13
-succeeded
--1 -1 -1 -1 -1 -1 6 -1
-
---- %A --- 14
-succeeded
--1 -1 -1 -1 -1 -1 6 -1
-
---- %A --- 15
-succeeded
--1 -1 -1 -1 -1 -1 6 -1
-urn
-
---- %A --- 16
-failed
---- %b --- 1
-succeeded
--1 -1 -1 -1 0 -1 -1 -1
-
---- %b --- 2
-succeeded
--1 -1 -1 -1 0 -1 -1 -1
-
---- %b --- 3
-succeeded
--1 -1 -1 -1 1 -1 -1 -1
-
---- %b --- 4
-succeeded
--1 -1 -1 -1 1 -1 -1 -1
-
---- %b --- 5
-succeeded
--1 -1 -1 -1 2 -1 -1 -1
-
---- %b --- 6
-succeeded
--1 -1 -1 -1 2 -1 -1 -1
-
---- %b --- 7
-succeeded
--1 -1 -1 -1 3 -1 -1 -1
-
---- %b --- 8
-succeeded
--1 -1 -1 -1 3 -1 -1 -1
-
---- %b --- 9
-succeeded
--1 -1 -1 -1 4 -1 -1 -1
-
---- %b --- 10
-succeeded
--1 -1 -1 -1 5 -1 -1 -1
-
---- %b --- 11
-succeeded
--1 -1 -1 -1 5 -1 -1 -1
-
---- %b --- 12
-succeeded
--1 -1 -1 -1 6 -1 -1 -1
-
---- %b --- 13
-succeeded
--1 -1 -1 -1 6 -1 -1 -1
-
---- %b --- 14
-succeeded
--1 -1 -1 -1 7 -1 -1 -1
-
---- %b --- 15
-succeeded
--1 -1 -1 -1 7 -1 -1 -1
-
---- %b --- 16
-succeeded
--1 -1 -1 -1 8 -1 -1 -1
-
---- %b --- 17
-succeeded
--1 -1 -1 -1 8 -1 -1 -1
-
---- %b --- 18
-succeeded
--1 -1 -1 -1 9 -1 -1 -1
-
---- %b --- 19
-succeeded
--1 -1 -1 -1 9 -1 -1 -1
-
---- %b --- 20
-succeeded
--1 -1 -1 -1 10 -1 -1 -1
-
---- %b --- 21
-succeeded
--1 -1 -1 -1 10 -1 -1 -1
-
---- %b --- 22
-succeeded
--1 -1 -1 -1 11 -1 -1 -1
-
---- %b --- 23
-succeeded
--1 -1 -1 -1 11 -1 -1 -1
-
---- %b --- 25
-succeeded
--1 -1 -1 -1 4 -1 -1 -1
-or
-
---- %b --- 24
-succeeded
--1 -1 -1 -1 2 -1 -1 -1
-s
-
---- %b --- 26
-failed
---- %B --- 1
-succeeded
--1 -1 -1 -1 0 -1 -1 -1
-
---- %B --- 2
-succeeded
--1 -1 -1 -1 0 -1 -1 -1
-
---- %B --- 3
-succeeded
--1 -1 -1 -1 1 -1 -1 -1
-
---- %B --- 4
-succeeded
--1 -1 -1 -1 1 -1 -1 -1
-
---- %B --- 5
-succeeded
--1 -1 -1 -1 2 -1 -1 -1
-
---- %B --- 6
-succeeded
--1 -1 -1 -1 2 -1 -1 -1
-
---- %B --- 7
-succeeded
--1 -1 -1 -1 3 -1 -1 -1
-
---- %B --- 8
-succeeded
--1 -1 -1 -1 3 -1 -1 -1
-
---- %B --- 9
-succeeded
--1 -1 -1 -1 4 -1 -1 -1
-
---- %B --- 10
-succeeded
--1 -1 -1 -1 5 -1 -1 -1
-
---- %B --- 11
-succeeded
--1 -1 -1 -1 5 -1 -1 -1
-
---- %B --- 12
-succeeded
--1 -1 -1 -1 6 -1 -1 -1
-
---- %B --- 13
-succeeded
--1 -1 -1 -1 6 -1 -1 -1
-
---- %B --- 14
-succeeded
--1 -1 -1 -1 7 -1 -1 -1
-
---- %B --- 15
-succeeded
--1 -1 -1 -1 7 -1 -1 -1
-
---- %B --- 16
-succeeded
--1 -1 -1 -1 8 -1 -1 -1
-
---- %B --- 17
-succeeded
--1 -1 -1 -1 8 -1 -1 -1
-
---- %B --- 18
-succeeded
--1 -1 -1 -1 9 -1 -1 -1
-
---- %B --- 19
-succeeded
--1 -1 -1 -1 9 -1 -1 -1
-
---- %B --- 20
-succeeded
--1 -1 -1 -1 10 -1 -1 -1
-
---- %B --- 21
-succeeded
--1 -1 -1 -1 10 -1 -1 -1
-
---- %B --- 22
-succeeded
--1 -1 -1 -1 11 -1 -1 -1
-
---- %B --- 23
-succeeded
--1 -1 -1 -1 11 -1 -1 -1
-
---- %B --- 25
-succeeded
--1 -1 -1 -1 4 -1 -1 -1
-or
-
---- %B --- 24
-succeeded
--1 -1 -1 -1 2 -1 -1 -1
-s
-
---- %B --- 26
-failed
diff --git a/src/regress/lib/libc/time/strptime/main.c b/src/regress/lib/libc/time/strptime/main.c
deleted file mode 100644
index c4e06a9b59..0000000000
--- a/src/regress/lib/libc/time/strptime/main.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*      $OpenBSD: main.c,v 1.2 2008/06/26 05:42:05 ray Exp $    */
-/*      $NetBSD: main.c,v 1.4 2002/02/21 07:38:18 itojun Exp $  */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-int     main(int, char *[]);
-void    die(void);
-
-void
-die(void)
-{
-
-        if (ferror(stdin))
-                err(1, "fgetln");
-        else
-                errx(1, "input is truncated");
-}
-
-int
-main(int argc, char *argv[])
-{
-        char *p, *title, *buf, *format;
-        size_t len;
-        struct tm tm;
-
-        for (;;) {
-                p = fgetln(stdin, &len);
-                if (p == 0)
-                        die();
-                title = malloc(len + 1);
-                memcpy(title, p, len);
-                title[len] = '\0';
-
-                if (!strcmp(title, "EOF\n"))
-                        return(0);
-                if (title[0] == '#' || title[0] == '\n') {
-                        free(title);
-                        continue;
-                }
-
-                p = fgetln(stdin, &len);
-                if (p == 0)
-                        die();
-                buf = malloc(len + 1);
-                memcpy(buf, p, len);
-                buf[len] = '\0';
-
-                p = fgetln(stdin, &len);
-                if (p == 0)
-                        die();
-                format = malloc(len + 1);
-                memcpy(format, p, len);
-                format[len] = '\0';
-
-                tm.tm_sec = -1;
-                tm.tm_min = -1;
-                tm.tm_hour = -1;
-                tm.tm_mday = -1;
-                tm.tm_mon = -1;
-                tm.tm_year = -1;
-                tm.tm_wday = -1;
-                tm.tm_yday = -1;
-
-                p = strptime(buf, format, &tm);
-
-                printf("%s", title);
-                if (p) {
-                        printf("succeeded\n");
-                        printf("%d %d %d %d %d %d %d %d\n",
-                            tm.tm_sec, tm.tm_min, tm.tm_hour, tm.tm_mday,
-                            tm.tm_mon, tm.tm_year, tm.tm_wday, tm.tm_yday);
-                        printf("%s\n", p);
-                } else {
-                        printf("failed\n");
-                }
-
-                free(title);
-                free(buf);
-                free(format);
-        }
-}
diff --git a/src/regress/lib/libc/time/strptime/tests b/src/regress/lib/libc/time/strptime/tests
deleted file mode 100644
index d96393b2b7..0000000000
--- a/src/regress/lib/libc/time/strptime/tests
+++ /dev/null
@@ -1,267 +0,0 @@
-# some intial checks to make sure common things work
---- ctime --- 1
-Tue Jan 20 23:27:46 1998
-%a %b %d %T %Y
---- ctime --- 2
-Tue Jan 20 23:27:46 1998
-%a %b %d %H:%M:%S %Y
---- ctime --- 3
-Tue Jan 20 23:27:46 1998
-%c
-
-# test some valid and invalid day names
---- %a --- 1
-Sun
-%a
---- %a --- 2
-Sunday
-%a
---- %a --- 3
-Mon
-%a
---- %a --- 4
-Monday
-%a
---- %a --- 5
-Tue
-%a
---- %a --- 6
-Tuesday
-%a
---- %a --- 7
-Wed
-%a
---- %a --- 8
-Wednesday
-%a
---- %a --- 9
-Thu
-%a
---- %a --- 10
-Thursday
-%a
---- %a --- 11
-Fri
-%a
---- %a --- 12
-Friday
-%a
---- %a --- 13
-Sat
-%a
---- %a --- 14
-Saturday
-%a
---- %a --- 15
-Saturn
-%a
---- %a --- 16
-Moon
-%a
---- %A --- 1
-Sun
-%A
---- %A --- 2
-Sunday
-%A
---- %A --- 3
-Mon
-%A
---- %A --- 4
-Monday
-%A
---- %A --- 5
-Tue
-%A
---- %A --- 6
-Tuesday
-%A
---- %A --- 7
-Wed
-%A
---- %A --- 8
-Wednesday
-%A
---- %A --- 9
-Thu
-%A
---- %A --- 10
-Thursday
-%A
---- %A --- 11
-Fri
-%A
---- %A --- 12
-Friday
-%A
---- %A --- 13
-Sat
-%A
---- %A --- 14
-Saturday
-%A
---- %A --- 15
-Saturn
-%A
---- %A --- 16
-Moon
-%A
-
-# test some valid and invalid month names
---- %b --- 1
-Jan
-%b
---- %b --- 2
-January
-%b
---- %b --- 3
-Feb
-%b
---- %b --- 4
-February
-%b
---- %b --- 5
-Mar
-%b
---- %b --- 6
-March
-%b
---- %b --- 7
-Apr
-%b
---- %b --- 8
-April
-%b
---- %b --- 9
-May
-%b
---- %b --- 10
-Jun
-%b
---- %b --- 11
-June
-%b
---- %b --- 12
-Jul
-%b
---- %b --- 13
-July
-%b
---- %b --- 14
-Aug
-%b
---- %b --- 15
-August
-%b
---- %b --- 16
-Sep
-%b
---- %b --- 17
-September
-%b
---- %b --- 18
-Oct
-%b
---- %b --- 19
-October
-%b
---- %b --- 20
-Nov
-%b
---- %b --- 21
-November
-%b
---- %b --- 22
-Dec
-%b
---- %b --- 23
-December
-%b
---- %b --- 25
-Mayor
-%b
---- %b --- 24
-Mars
-%b
---- %b --- 26
-Rover
-%b
---- %B --- 1
-Jan
-%B
---- %B --- 2
-January
-%B
---- %B --- 3
-Feb
-%B
---- %B --- 4
-February
-%B
---- %B --- 5
-Mar
-%B
---- %B --- 6
-March
-%B
---- %B --- 7
-Apr
-%B
---- %B --- 8
-April
-%B
---- %B --- 9
-May
-%B
---- %B --- 10
-Jun
-%B
---- %B --- 11
-June
-%B
---- %B --- 12
-Jul
-%B
---- %B --- 13
-July
-%B
---- %B --- 14
-Aug
-%B
---- %B --- 15
-August
-%B
---- %B --- 16
-Sep
-%B
---- %B --- 17
-September
-%B
---- %B --- 18
-Oct
-%B
---- %B --- 19
-October
-%B
---- %B --- 20
-Nov
-%B
---- %B --- 21
-November
-%B
---- %B --- 22
-Dec
-%B
---- %B --- 23
-December
-%B
---- %B --- 25
-Mayor
-%B
---- %B --- 24
-Mars
-%B
---- %B --- 26
-Rover
-%B
-EOF
diff --git a/src/regress/lib/libc/timingsafe/Makefile b/src/regress/lib/libc/timingsafe/Makefile
deleted file mode 100644
index 9a679b61f8..0000000000
--- a/src/regress/lib/libc/timingsafe/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/06/13 01:55:02 matthew Exp $
-
-PROG=   timingsafe
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/timingsafe/timingsafe.c b/src/regress/lib/libc/timingsafe/timingsafe.c
deleted file mode 100644
index f6605f8696..0000000000
--- a/src/regress/lib/libc/timingsafe/timingsafe.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*      $OpenBSD: timingsafe.c,v 1.3 2014/06/21 22:57:15 tedu Exp $     */
-/*
- * Copyright (c) 2014 Google Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define ASSERT_EQ(a, b) assert((a) == (b))
-
-enum {
-        N = 8
-};
-
-static unsigned char bufone[N], buftwo[N];
-
-void
-check()
-{
-        int cmp = memcmp(bufone, buftwo, N);
-
-        /* Check for reflexivity. */
-        ASSERT_EQ(0, timingsafe_bcmp(bufone, bufone, N));
-        ASSERT_EQ(0, timingsafe_bcmp(buftwo, buftwo, N));
-        ASSERT_EQ(0, timingsafe_memcmp(bufone, bufone, N));
-        ASSERT_EQ(0, timingsafe_memcmp(buftwo, buftwo, N));
-
-        /* Check that timingsafe_bcmp returns 0 iff memcmp returns 0. */
-        ASSERT_EQ(cmp == 0, timingsafe_bcmp(bufone, buftwo, N) == 0);
-
-        /* Check that timingsafe_memcmp returns cmp... */
-        ASSERT_EQ(cmp < 0, timingsafe_memcmp(bufone, buftwo, N) < 0);
-
-        /* ... or -cmp if the argument order is swapped. */
-        ASSERT_EQ(-cmp < 0, timingsafe_memcmp(buftwo, bufone, N) < 0);
-}
-
-int
-main()
-{
-        int i, j;
-
-        for (i = 0; i < 10000; i++) {
-                arc4random_buf(bufone, N);
-                arc4random_buf(buftwo, N);
-
-                check();
-                for (j = 0; j < N; j++) {
-                        buftwo[j] = bufone[j];
-                        check();
-                }
-        }
-
-        return (0);
-}
diff --git a/src/regress/lib/libc/vis/Makefile b/src/regress/lib/libc/vis/Makefile
deleted file mode 100644
index 13e560bbf7..0000000000
--- a/src/regress/lib/libc/vis/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2005/08/29 18:41:56 otto Exp $
-
-PROG=   vis_test
-CLEANFILES+= valid.out
-
-run-regress-vis_test: ${PROG}
-        ./${PROG} >${.OBJDIR}/valid.out
-        cmp -s ${.OBJDIR}/valid.out ${.CURDIR}/valid.ok
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/vis/valid.ok b/src/regress/lib/libc/vis/valid.ok
deleted file mode 100644
index f8c0efa503..0000000000
--- a/src/regress/lib/libc/vis/valid.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-\^@\^A\^B\^C\^D\^E\^F\^G\^H     
-\^K\^L\^M\^N\^O\^P\^Q\^R\^S\^T\^U\^V\^W\^X\^Y\^Z\^[\^\\^]\^^\^_ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\^?\M^@\M^A\M^B\M^C\M^D\M^E\M^F\M^G\M^H\M^I\M^J\M^K\M^L\M^M\M^N\M^O\M^P\M^Q\M^R\M^S\M^T\M^U\M^V\M^W\M^X\M^Y\M^Z\M^[\M^\\M^]\M^^\M^_\240\M-!\M-"\M-#\M-$\M-%\M-&\M-'\M-(\M-)\M-*\M-+\M-,\M--\M-.\M-/\M-0\M-1\M-2\M-3\M-4\M-5\M-6\M-7\M-8\M-9\M-:\M-;\M-<\M-=\M->\M-?\M-@\M-A\M-B\M-C\M-D\M-E\M-F\M-G\M-H\M-I\M-J\M-K\M-L\M-M\M-N\M-O\M-P\M-Q\M-R\M-S\M-T\M-U\M-V\M-W\M-X\M-Y\M-Z\M-[\M-\\M-]\M-^\M-_\M-`\M-a\M-b\M-c\M-d\M-e\M-f\M-g\M-h\M-i\M-j\M-k\M-l\M-m\M-n\M-o\M-p\M-q\M-r\M-s\M-t\M-u\M-v\M-w\M-x\M-y\M-z\M-{\M-|\M-}\M-~\M^?
diff --git a/src/regress/lib/libc/vis/vis_test.c b/src/regress/lib/libc/vis/vis_test.c
deleted file mode 100644
index 92f2cee32d..0000000000
--- a/src/regress/lib/libc/vis/vis_test.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*      $OpenBSD: vis_test.c,v 1.5 2017/07/27 15:08:37 bluhm Exp $      */
-
-/* Public domain. 2005, Otto Moerbeek */
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <vis.h>
-
-#define NTESTS  8000
-#define NCH     800
-
-char ibuf[NCH];
-char obuf[NCH * 4];
-char rbuf[NCH * 4];
-
-int flags[] = {
-        VIS_ALL,
-        VIS_GLOB,
-        VIS_TAB,
-        VIS_NL,
-        VIS_DQ,
-        VIS_WHITE,
-        VIS_SAFE
-};
-
-char *flagname[] = {
-        "VIS_ALL",
-        "VIS_GLOB",
-        "VIS_TAB",
-        "VIS_NL",
-        "VIS_DQ",
-        "VIS_WHITE",
-        "VIS_SAFE"
-};
-
-int title;
-
-void
-dotitle(int i, int j)
-{
-        if (title == 0)
-                printf("%d %s:", i, flagname[j]);
-        title = 1;
-}
-
-int
-main(int argc, char *argv[])
-{
-
-        char inp[UCHAR_MAX + 1];
-        char out[4 * UCHAR_MAX + 1];
-        int i, j, fail = 0;
-        ssize_t owant, o, r;
-
-        for (i = 0; i <= UCHAR_MAX; i++) {
-                inp[i] = i;
-        }
-        strvisx(out, inp, UCHAR_MAX + 1, 0);
-        printf("%s\n", out);
-
-        for (i = 0; i < NTESTS; i++) {
-                arc4random_buf(ibuf, sizeof(ibuf) - 1);
-                ibuf[sizeof(ibuf) - 1] = '\0';
-                title = 0;
-
-                for (j = 0; j < sizeof(flags)/sizeof(flags[0]); j++) {
-                        owant = sizeof(ibuf);
-                        o = strnvis(obuf, ibuf, owant, flags[j]);
-                        if (o >= owant) {
-                                owant = o + 1;
-                                o = strnvis(obuf, ibuf, owant, flags[j]);
-                                if (o > owant) {
-                                        dotitle(i, j);
-                                        printf("HUGE overflow\n");
-                                }
-                                if (o < owant - 1) {
-                                        dotitle(i, j);
-                                        printf("over-estimate of overflow\n");
-                                }
-                        } else if (o > strlen(ibuf) * 4) {
-                                dotitle(i, j);
-                                printf("wants too much %zd %zu\n",
-                                    o, strlen(ibuf) * 4);
-                                continue;
-                        }
-
-                        r = strnunvis(rbuf, obuf, sizeof rbuf);
-
-                        if (r == -1) {
-                                dotitle(i, j);
-                                printf("cannot decode\n");
-                                printf("%s\n", obuf);
-                                fail = 1;
-                        } else if (r != strlen(ibuf)) {
-                                dotitle(i, j);
-                                printf("rlen %zd != inlen %zu\n",
-                                    r, strlen(ibuf));
-                                printf("%s\n", obuf);
-                                printf("%s\n", rbuf);
-                                fail = 1;
-                        } else if (bcmp(ibuf, rbuf, r)) {
-                                dotitle(i, j);
-                                printf("strings are different\n");
-                                printf("%s\n", ibuf);
-                                printf("%s\n", rbuf);
-                                fail = 1;
-                        }
-                }
-        }
-        exit(fail);
-}
diff --git a/src/regress/lib/libc/wprintf/Makefile b/src/regress/lib/libc/wprintf/Makefile
deleted file mode 100644
index 7b1897f2c4..0000000000
--- a/src/regress/lib/libc/wprintf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2011/04/24 08:00:22 stsp Exp $
-
-PROG=   wfp
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/wprintf/wfp.c b/src/regress/lib/libc/wprintf/wfp.c
deleted file mode 100644
index fc3120b53c..0000000000
--- a/src/regress/lib/libc/wprintf/wfp.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*      $OpenBSD: wfp.c,v 1.1 2011/04/24 08:00:22 stsp Exp $    */
-/*-
- * Copyright (c) 2002, 2005 David Schultz <das@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Test for wprintf() floating point formats.
- */
-
-#include <assert.h>
-#include <err.h>
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#define testfmt(result, fmt, ...)       \
-        _testfmt((result), __LINE__, #__VA_ARGS__, fmt, __VA_ARGS__)
-void _testfmt(const wchar_t *, int, const char *, const wchar_t *, ...);
-void smash_stack(void);
-
-int
-main(int argc, char *argv[])
-{
-        /*
-         * Basic tests of decimal output functionality.
-         */
-        testfmt(L" 1.000000E+00", L"%13E", 1.0);
-        testfmt(L"     1.000000", L"%13f", 1.0);
-        testfmt(L"            1", L"%13G", 1.0);
-        testfmt(L" 1.000000E+00", L"%13LE", 1.0L);
-        testfmt(L"     1.000000", L"%13Lf", 1.0L);
-        testfmt(L"            1", L"%13LG", 1.0L);
-
-        testfmt(L"2.718282", L"%.*f", -2, 2.7182818);
-
-        testfmt(L"1.234568e+06", L"%e", 1234567.8);
-        testfmt(L"1234567.800000", L"%f", 1234567.8);
-        testfmt(L"1.23457E+06", L"%G", 1234567.8);
-        testfmt(L"1.234568e+06", L"%Le", 1234567.8L);
-        testfmt(L"1234567.800000", L"%Lf", 1234567.8L);
-        testfmt(L"1.23457E+06", L"%LG", 1234567.8L);
-
-#if (LDBL_MANT_DIG > DBL_MANT_DIG) && !defined(__i386__)
-        testfmt(L"123456789.864210", L"%Lf", 123456789.8642097531L);
-        testfmt(L"-1.23457E+08", L"%LG", -123456789.8642097531L);
-        testfmt(L"123456789.8642097531", L"%.10Lf", 123456789.8642097531L);
-        testfmt(L" 3.141592653589793238e-4000", L"%L27.18Le",
-            3.14159265358979323846e-4000L);
-#endif /* (LDBL_MANT_DIG > DBL_MANT_DIG) && !defined(__i386__) */
-
-        /*
-         * Infinities and NaNs
-         */
-#ifdef NAN
-        testfmt(L"nan", L"%e", NAN);
-        testfmt(L"NAN", L"%F", NAN);
-        testfmt(L"nan", L"%g", NAN);
-        testfmt(L"NAN", L"%LE", (long double)NAN);
-        testfmt(L"  nan", L"%05e", NAN);
-#endif /* NAN */
-
-        testfmt(L"INF", L"%E", HUGE_VAL);
-        testfmt(L"-inf", L"%f", -HUGE_VAL);
-        testfmt(L"+inf", L"%+g", HUGE_VAL);
-        testfmt(L" inf", L"%4.2Le", HUGE_VALL);
-        testfmt(L"-inf", L"%Lf", -HUGE_VALL);
-        testfmt(L"  inf", L"%05e", HUGE_VAL);
-        testfmt(L" -inf", L"%05e", -HUGE_VAL);
-
-        /*
-         * Padding
-         */
-        testfmt(L"0.000000e+00", L"%e", 0.0);
-        testfmt(L"0.000000", L"%F", (double)0.0);
-        testfmt(L"0", L"%G", 0.0);
-        testfmt(L"  0", L"%3.0Lg", 0.0L);
-        testfmt(L"    0", L"%5.0f", 0.001);
-
-        /*
-         * Precision specifiers
-         */
-        testfmt(L"1.0123e+00", L"%.4e", 1.0123456789);
-        testfmt(L"1.0123", L"%.4f", 1.0123456789);
-        testfmt(L"1.012", L"%.4g", 1.0123456789);
-        testfmt(L"1.2346e-02", L"%.4e", 0.0123456789);
-        testfmt(L"0.0123", L"%.4f", 0.0123456789);
-        testfmt(L"0.01235", L"%.4g", 0.0123456789);
-
-        /*
-         * Signed conversions
-         */
-        testfmt(L"+2.500000e-01", L"%+e", 0.25);
-        testfmt(L"+0.000000", L"%+F", 0.0);
-        testfmt(L"-1", L"%+g", -1.0);
-
-        testfmt(L"-1.000000e+00", L"% e", -1.0);
-        testfmt(L"+1.000000", L"% +f", 1.0);
-        testfmt(L" 1", L"% g", 1.0);
-        testfmt(L" 0", L"% g", 0.0);
-
-        /*
-         * ``Alternate form''
-         */
-        testfmt(L"1.250e+00", L"%#.3e", 1.25);
-        testfmt(L"123.000000", L"%#f", 123.0);
-        testfmt(L" 12345.", L"%#7.5g", 12345.0);
-        testfmt(L" 1.00000", L"%#8g", 1.0);
-        testfmt(L"0.0", L"%#.2g", 0.0);
-
-        /*
-         * Padding and decimal point placement
-         */
-        testfmt(L"03.2E+00", L"%08.1E", 3.25);
-        testfmt(L"003.25", L"%06.2F", 3.25);
-        testfmt(L"0003.25", L"%07.4G", 3.25);
-
-        testfmt(L"3.14159e-05", L"%g", 3.14159e-5);
-        testfmt(L"0.000314159", L"%g", 3.14159e-4);
-        testfmt(L"3.14159e+06", L"%g", 3.14159e6);
-        testfmt(L"314159", L"%g", 3.14159e5);
-        testfmt(L"314159.", L"%#g", 3.14159e5);
-
-        testfmt(L" 9.000000e+03", L"%13e", 9000.0);
-        testfmt(L" 9000.000000", L"%12f", 9000.0);
-        testfmt(L" 9000", L"%5g", 9000.0);
-        testfmt(L" 900000.", L"%#8g", 900000.0);
-        testfmt(L" 9e+06", L"%6g", 9000000.0);
-        testfmt(L" 9.000000e-04", L"%13e", 0.0009);
-        testfmt(L" 0.000900", L"%9f", 0.0009);
-        testfmt(L" 0.0009", L"%7g", 0.0009);
-        testfmt(L" 9e-05", L"%6g", 0.00009);
-        testfmt(L" 9.00000e-05", L"%#12g", 0.00009);
-        testfmt(L" 9.e-05", L"%#7.1g", 0.00009);
-
-        testfmt(L" 0.0", L"%4.1f", 0.0);
-        testfmt(L"90.0", L"%4.1f", 90.0);
-        testfmt(L" 100", L"%4.0f", 100.0);
-        testfmt(L"9.0e+01", L"%4.1e", 90.0);
-        testfmt(L"1e+02", L"%4.0e", 100.0);
-
-        /*
-         * Hexadecimal floating point (%a, %A) tests.  Some of these
-         * are only valid if the implementation converts to hex digits
-         * on nibble boundaries.
-         */
-        testfmt(L"0x0p+0", L"%a", 0x0.0p0);
-        testfmt(L"0X0.P+0", L"%#LA", 0x0.0p0L);
-#ifdef NAN
-        testfmt(L"inf", L"%La", (long double)INFINITY);
-        testfmt(L"+INF", L"%+A", INFINITY);
-        testfmt(L"nan", L"%La", (long double)NAN);
-        testfmt(L"NAN", L"%A", NAN);
-#endif /* NAN */
-
-        testfmt(L" 0x1.23p+0", L"%10a", 0x1.23p0);
-        testfmt(L" 0x1.23p-500", L"%12a", 0x1.23p-500);
-        testfmt(L" 0x1.2p+40", L"%10.1a", 0x1.23p40);
-        testfmt(L" 0X1.230000000000000000000000P-4", L"%32.24A", 0x1.23p-4);
-        testfmt(L"0x1p-1074", L"%a", 0x1p-1074);
-        testfmt(L"0x1.2345p-1024", L"%a", 0x1.2345p-1024);
-
-        return (0);
-}
-
-void
-smash_stack(void)
-{
-        static uint32_t junk = 0xdeadbeef;
-        uint32_t buf[512];
-        int i;
-
-        for (i = 0; i < sizeof(buf) / sizeof(buf[0]); i++)
-                buf[i] = junk;
-}
-
-void
-_testfmt(const wchar_t *result, int line, const char *argstr, const wchar_t *fmt,...)
-{
-        wchar_t s[100];
-        va_list ap;
-
-        va_start(ap, fmt);
-        smash_stack();
-        vswprintf(s, sizeof(s), fmt, ap);
-        if (wcscmp(result, s) != 0) {
-                fprintf(stderr,
-                    "%d: printf(\"%s\", %s) ==> [%s], expected [%s]\n",
-                    line, (char*)fmt, argstr, s, result);
-                abort();
-        }
-}
diff --git a/src/regress/lib/libcrypto/CA/Makefile b/src/regress/lib/libcrypto/CA/Makefile
deleted file mode 100644
index c31c99c946..0000000000
--- a/src/regress/lib/libcrypto/CA/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2017/01/25 10:29:34 beck Exp $
-
-TESTS = \
-        doit.sh
-
-REGRESS_TARGETS= all_tests
-
-CLEANFILES += \
-1000.pem client.cert.pem intermediate.cert.pem root.cert.pem  server.csr.pem \
-1001.pem client.csr.pem intermediate.csr.pem  root.key.pem  server.key.pem \
-chain.pem client.key.pem intermediate.key.pem  server.cert.pem \
-int.txt  int.txt.attr int.txt.old int.txt.attr.old  \
-root.txt root.txt.attr root.txt.old root.txt.attr.old \
-intserial rootserial intserial.old rootserial.old
-
-all_tests: ${TESTS}
-        @for test in $>; do \
-                ./$$test; \
-        done
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/CA/doit.sh b/src/regress/lib/libcrypto/CA/doit.sh
deleted file mode 100755
index 110d89d67f..0000000000
--- a/src/regress/lib/libcrypto/CA/doit.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-#       $OpenBSD: doit.sh,v 1.2 2018/07/17 17:06:49 tb Exp $
-
-rm -rf root intermediate certs
-echo 1000 > rootserial
-cat /dev/null > root.txt
-echo 1000 > intserial
-cat /dev/null > int.txt
-
-# Vanna Vanna make me a root cert
-openssl genrsa -out root.key.pem 4096
-if [ $? -ne 0 ]; then
-   echo "*** Fail;  Can't generate root rsa 4096 key"
-   exit 1
-fi   
-
-openssl req -batch -config root.cnf -key root.key.pem -new -x509 -days 365 -sha256 -extensions v3_ca -out root.cert.pem
-if [ $? -ne 0 ]; then
-   echo "*** Fail;  Can't generate root req"
-   exit 1
-fi   
-
-# Make intermediate
-openssl genrsa -out intermediate.key.pem 2048
-if [ $? -ne 0 ]; then
-   echo "*** Fail;  Can't generate intermediate rsa 2048 key"
-   exit 1
-fi   
-
-openssl req -batch -config intermediate.cnf -new -sha256 \
-      -key intermediate.key.pem \
-      -out intermediate.csr.pem
-if [ $? -ne 0 ]; then
-   echo "*** Fail;  Can't generate intermediate req"
-   exit 1
-fi   
-
-# Sign intermediate
-openssl ca -batch -config root.cnf -extensions v3_intermediate_ca -days 10 -notext -md sha256 -in intermediate.csr.pem -out intermediate.cert.pem 
-if [ $? -ne 0 ]; then
-   echo "*** Fail;  Can't sign intermediate"
-   exit 1
-fi   
-
-# Verify Intermediate
-openssl verify -CAfile ca.cert.pem intermediate.cert.pem
-if [ $? -ne 0]; then
-   echo "*** Fail; Intermediate CA does not validate"
-   exit 1
-fi   
-
-cat intermediate.cert.pem root.cert.pem > chain.pem
-
-# make a server certificate
-
-openssl genrsa -out server.key.pem 2048
-if [ $? -ne 0]; then
-   echo "*** Fail; genrsa server"
-   exit 1
-fi   
-
-
-openssl req -batch -config intermediate.cnf \
-      -key server.key.pem \
-      -new -sha256 -out server.csr.pem \
-      -subj '/CN=server/O=OpenBSD/OU=So and Sos/C=CA'
-if [ $? -ne 0]; then
-   echo "*** Fail; server req"
-   exit 1
-fi   
-
-# sign server key
-openssl ca -batch -config intermediate.cnf -extensions server_cert -days 5 -notext -md sha256 -in server.csr.pem -out server.cert.pem
-if [ $? -ne 0 ]; then
-   echo "*** Fail; server sign"
-   exit 1
-fi   
-
-# make a client certificate
-
-openssl genrsa -out client.key.pem 2048
-if [ $? -ne 0]; then
-   echo "*** Fail; genrsa client"
-   exit 1
-fi   
-
-openssl req -batch -config intermediate.cnf \
-      -key client.key.pem \
-      -new -sha256 -out client.csr.pem \
-      -subj '/CN=client/O=OpenBSD/OU=So and Sos/C=CA'
-if [ $? -ne 0]; then
-   echo "*** Fail; client req"
-   exit 1
-fi   
-
-# sign client key
-openssl ca -batch -config intermediate.cnf -extensions usr_cert -days 5 -notext -md sha256 -in client.csr.pem -out client.cert.pem
-if [ $? -ne 0 ]; then
-   echo "*** Fail; client sign"
-   exit 1
-fi
-
-# Verify Intermediate
-openssl verify -purpose sslserver -CAfile chain.pem server.cert.pem
-if [ $? -ne 0 ]; then
-   echo "*** Fail; server cert does not validate"
-   exit 1
-fi   
-
-# Verify Intermediate
-openssl verify -purpose sslclient -CAfile chain.pem client.cert.pem
-if [ $? -ne 0 ]; then
-   echo "*** Fail; client cert does not validate"
-   exit 1
-fi   
-
diff --git a/src/regress/lib/libcrypto/CA/intermediate.cnf b/src/regress/lib/libcrypto/CA/intermediate.cnf
deleted file mode 100644
index 9a95487c00..0000000000
--- a/src/regress/lib/libcrypto/CA/intermediate.cnf
+++ /dev/null
@@ -1,130 +0,0 @@
-#       $OpenBSD: intermediate.cnf,v 1.2 2018/07/17 17:06:49 tb Exp $
-# For regression tests
-default_ca = CA_regress
-
-[ CA_regress ]
-# Directory and file locations.
-dir               = .
-certs             = $dir
-crl_dir           = $dir
-database          = $dir/int.txt
-serial            = $dir/intserial
-new_certs_dir     = $dir
-
-# The root key and root certificate.
-private_key       = $dir/intermediate.key.pem
-certificate       = $dir/intermediate.cert.pem
-
-# For certificate revocation lists.
-crlnumber         = $dir/crlnumber
-crl               = $dir/ca.crl.pem
-crl_extensions    = crl_ext
-default_crl_days  = 30
-
-# SHA-1 is deprecated, so use SHA-2 instead.
-default_md        = sha256
-
-name_opt          = ca_default
-cert_opt          = ca_default
-default_days      = 10
-preserve          = no
-policy            = policy_loose
-
-[ policy_strict ]
-# The root CA should only sign intermediate certificates that match.
-# See the POLICY FORMAT section of `man ca`.
-countryName             = match
-stateOrProvinceName     = match
-organizationName        = match
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-
-[ policy_loose ]
-# Allow the intermediate CA to sign a more diverse range of certificates.
-# See the POLICY FORMAT section of the `ca` man page.
-countryName             = optional
-stateOrProvinceName     = optional
-localityName            = optional
-organizationName        = optional
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-
-[ req ]
-# Options for the `req` tool (`man req`).
-default_bits        = 2048
-distinguished_name  = req_distinguished_name
-string_mask         = utf8only
-
-# SHA-1 is deprecated, so use SHA-2 instead.
-default_md          = sha256
-
-# Extension to add when the -x509 option is used.
-x509_extensions     = v3_ca
-
-[ req_distinguished_name ]
-# See <https://en.wikipedia.org/wiki/Certificate_signing_request>.
-countryName                     = Country Name (2 letter code)
-stateOrProvinceName             = State or Province Name
-localityName                    = Locality Name
-0.organizationName              = Organization Name
-organizationalUnitName          = Organizational Unit Name
-commonName                      = Common Name
-emailAddress                    = Email Address
-
-# Optionally, specify some defaults.
-countryName_default             = CA
-stateOrProvinceName_default     = Alberta
-localityName_default            = Edmonton
-0.organizationName_default      = OpenBSD
-organizationalUnitName_default  = So and Sos
-emailAddress_default            = evilsoandsos@openbsd.org
-commonName_default              = Regress Intermediate CA
-
-[ v3_ca ]
-# Extensions for a typical CA (`man x509v3_config`).
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer
-basicConstraints = critical, CA:true
-keyUsage = critical, digitalSignature, cRLSign, keyCertSign
-
-[ v3_intermediate_ca ]
-# Extensions for a typical intermediate CA (`man x509v3_config`).
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer
-basicConstraints = critical, CA:true, pathlen:0
-keyUsage = critical, digitalSignature, cRLSign, keyCertSign
-
-[ usr_cert ]
-# Extensions for client certificates (`man x509v3_config`).
-basicConstraints = CA:FALSE
-nsCertType = client, email
-nsComment = "OpenSSL Generated Client Certificate"
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer
-keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
-extendedKeyUsage = clientAuth, emailProtection
-
-[ server_cert ]
-# Extensions for server certificates (`man x509v3_config`).
-basicConstraints = CA:FALSE
-nsCertType = server
-nsComment = "OpenSSL Generated Server Certificate"
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer:always
-keyUsage = critical, digitalSignature, keyEncipherment
-extendedKeyUsage = serverAuth
-
-[ crl_ext ]
-# Extension for CRLs (`man x509v3_config`).
-authorityKeyIdentifier=keyid:always
-
-[ ocsp ]
-# Extension for OCSP signing certificates (`man ocsp`).
-basicConstraints = CA:FALSE
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer
-keyUsage = critical, digitalSignature
-extendedKeyUsage = critical, OCSPSigning
-
diff --git a/src/regress/lib/libcrypto/CA/root.cnf b/src/regress/lib/libcrypto/CA/root.cnf
deleted file mode 100644
index b22e161476..0000000000
--- a/src/regress/lib/libcrypto/CA/root.cnf
+++ /dev/null
@@ -1,130 +0,0 @@
-#       $OpenBSD: root.cnf,v 1.2 2018/07/17 17:06:49 tb Exp $
-# For regression tests
-default_ca = CA_regress
-
-[ CA_regress ]
-# Directory and file locations.
-dir               = .
-certs             = $dir
-crl_dir           = $dir
-database          = $dir/root.txt
-serial            = $dir/rootserial
-new_certs_dir     = $dir
-
-# The root key and root certificate.
-private_key       = $dir/root.key.pem
-certificate       = $dir/root.cert.pem
-
-# For certificate revocation lists.
-crlnumber         = $dir/crlnumber
-crl               = $dir/ca.crl.pem
-crl_extensions    = crl_ext
-default_crl_days  = 30
-
-# SHA-1 is deprecated, so use SHA-2 instead.
-default_md        = sha256
-
-name_opt          = ca_default
-cert_opt          = ca_default
-default_days      = 375
-preserve          = no
-policy            = policy_strict
-
-[ policy_strict ]
-# The root CA should only sign intermediate certificates that match.
-# See the POLICY FORMAT section of `man ca`.
-countryName             = match
-stateOrProvinceName     = match
-organizationName        = match
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-
-[ policy_loose ]
-# Allow the intermediate CA to sign a more diverse range of certificates.
-# See the POLICY FORMAT section of the `ca` man page.
-countryName             = optional
-stateOrProvinceName     = optional
-localityName            = optional
-organizationName        = optional
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-
-[ req ]
-# Options for the `req` tool (`man req`).
-default_bits        = 2048
-distinguished_name  = req_distinguished_name
-string_mask         = utf8only
-
-# SHA-1 is deprecated, so use SHA-2 instead.
-default_md          = sha256
-
-# Extension to add when the -x509 option is used.
-x509_extensions     = v3_ca
-
-[ req_distinguished_name ]
-# See <https://en.wikipedia.org/wiki/Certificate_signing_request>.
-countryName                     = Country Name (2 letter code)
-stateOrProvinceName             = State or Province Name
-localityName                    = Locality Name
-0.organizationName              = Organization Name
-organizationalUnitName          = Organizational Unit Name
-commonName                      = Common Name
-emailAddress                    = Email Address
-
-# Optionally, specify some defaults.
-countryName_default             = CA
-stateOrProvinceName_default     = Alberta
-localityName_default            = Edmonton
-0.organizationName_default      = OpenBSD
-organizationalUnitName_default  = So and Sos
-emailAddress_default            = evilsoandsos@openbsd.org
-commonName_default              = Regress Root CA
-
-[ v3_ca ]
-# Extensions for a typical CA (`man x509v3_config`).
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer
-basicConstraints = critical, CA:true
-keyUsage = critical, digitalSignature, cRLSign, keyCertSign
-
-[ v3_intermediate_ca ]
-# Extensions for a typical intermediate CA (`man x509v3_config`).
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer
-basicConstraints = critical, CA:true, pathlen:0
-keyUsage = critical, digitalSignature, cRLSign, keyCertSign
-
-[ usr_cert ]
-# Extensions for client certificates (`man x509v3_config`).
-basicConstraints = CA:FALSE
-nsCertType = client, email
-nsComment = "OpenSSL Generated Client Certificate"
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer
-keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
-extendedKeyUsage = clientAuth, emailProtection
-
-[ server_cert ]
-# Extensions for server certificates (`man x509v3_config`).
-basicConstraints = CA:FALSE
-nsCertType = server
-nsComment = "OpenSSL Generated Server Certificate"
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer:always
-keyUsage = critical, digitalSignature, keyEncipherment
-extendedKeyUsage = serverAuth
-
-[ crl_ext ]
-# Extension for CRLs (`man x509v3_config`).
-authorityKeyIdentifier=keyid:always
-
-[ ocsp ]
-# Extension for OCSP signing certificates (`man ocsp`).
-basicConstraints = CA:FALSE
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer
-keyUsage = critical, digitalSignature
-extendedKeyUsage = critical, OCSPSigning
-
diff --git a/src/regress/lib/libcrypto/Makefile b/src/regress/lib/libcrypto/Makefile
deleted file mode 100644
index 38e3304eb4..0000000000
--- a/src/regress/lib/libcrypto/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#       $OpenBSD: Makefile,v 1.32 2018/07/25 18:04:09 jsing Exp $
-
-SUBDIR= \
-        aead \
-        aeswrap \
-        asn1 \
-        base64 \
-        bf \
-        bio \
-        bn \
-        cast \
-        chacha \
-        cts128 \
-        curve25519 \
-        des \
-        dh \
-        dsa \
-        ec \
-        ecdh \
-        ecdsa \
-        engine \
-        evp \
-        exp \
-        free \
-        gcm128 \
-        gost \
-        hkdf \
-        hmac \
-        idea \
-        ige \
-        init \
-        md4 \
-        md5 \
-        pbkdf2 \
-        pkcs7 \
-        poly1305 \
-        rand \
-        rc2 \
-        rc4 \
-        rmd \
-        rsa \
-        sha1 \
-        sha2 \
-        sha256 \
-        sha512 \
-        utf8 \
-        wycheproof \
-        x509
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libcrypto/Makefile.inc b/src/regress/lib/libcrypto/Makefile.inc
deleted file mode 100644
index 88fe5aca41..0000000000
--- a/src/regress/lib/libcrypto/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#       $OpenBSD: Makefile.inc,v 1.2 2018/07/17 17:06:49 tb Exp $
-# Use this variable when the test needs internal symbols from libcrypto
-CRYPTO_INT=  -Wl,-Bstatic -lcrypto -Wl,-Bdynamic
diff --git a/src/regress/lib/libcrypto/aead/Makefile b/src/regress/lib/libcrypto/aead/Makefile
deleted file mode 100644
index 344bdcbbf1..0000000000
--- a/src/regress/lib/libcrypto/aead/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   aeadtest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-REGRESS_TARGETS=regress-aeadtest
-
-regress-aeadtest: ${PROG}
-        ./${PROG} ${.CURDIR}/aeadtests.txt
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/aead/aeadtest.c b/src/regress/lib/libcrypto/aead/aeadtest.c
deleted file mode 100644
index 4f0ab9fa3a..0000000000
--- a/src/regress/lib/libcrypto/aead/aeadtest.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*      $OpenBSD: aeadtest.c,v 1.11 2018/07/17 17:06:49 tb Exp $        */
-/* ====================================================================
- * Copyright (c) 2011-2013 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-
-#include <openssl/evp.h>
-
-/* This program tests an AEAD against a series of test vectors from a file. The
- * test vector file consists of key-value lines where the key and value are
- * separated by a colon and optional whitespace. The keys are listed in
- * NAMES, below. The values are hex-encoded data.
- *
- * After a number of key-value lines, a blank line indicates the end of the
- * test case.
- *
- * For example, here's a valid test case:
- *
- *   AEAD: chacha20-poly1305
- *   KEY: bcb2639bf989c6251b29bf38d39a9bdce7c55f4b2ac12a39c8a37b5d0a5cc2b5
- *   NONCE: 1e8b4c510f5ca083
- *   IN: 8c8419bc27
- *   AD: 34ab88c265
- *   CT: 1a7c2f33f5
- *   TAG: 2875c659d0f2808de3a40027feff91a4
- */
-
-#define BUF_MAX 1024
-
-/* These are the different types of line that are found in the input file. */
-enum {
-        AEAD = 0,       /* name of the AEAD algorithm. */
-        KEY,            /* hex encoded key. */
-        NONCE,          /* hex encoded nonce. */
-        IN,             /* hex encoded plaintext. */
-        AD,             /* hex encoded additional data. */
-        CT,             /* hex encoded ciphertext (not including the
-                         * authenticator, which is next. */
-        TAG,            /* hex encoded authenticator. */
-        NUM_TYPES
-};
-
-static const char NAMES[NUM_TYPES][6] = {
-        "AEAD",
-        "KEY",
-        "NONCE",
-        "IN",
-        "AD",
-        "CT",
-        "TAG",
-};
-
-static unsigned char
-hex_digit(char h)
-{
-        if (h >= '0' && h <= '9')
-                return h - '0';
-        else if (h >= 'a' && h <= 'f')
-                return h - 'a' + 10;
-        else if (h >= 'A' && h <= 'F')
-                return h - 'A' + 10;
-        else
-                return 16;
-}
-
-static int
-aead_from_name(const EVP_AEAD **aead, const char *name)
-{
-        *aead = NULL;
-
-        if (strcmp(name, "aes-128-gcm") == 0) {
-#ifndef OPENSSL_NO_AES
-                *aead = EVP_aead_aes_128_gcm();
-#else
-                fprintf(stderr, "No AES support.\n");
-#endif
-        } else if (strcmp(name, "aes-256-gcm") == 0) {
-#ifndef OPENSSL_NO_AES
-                *aead = EVP_aead_aes_256_gcm();
-#else
-                fprintf(stderr, "No AES support.\n");
-#endif
-        } else if (strcmp(name, "chacha20-poly1305") == 0) {
-#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
-                *aead = EVP_aead_chacha20_poly1305();
-#else
-                fprintf(stderr, "No chacha20-poly1305 support.\n");
-#endif
-        } else {
-                fprintf(stderr, "Unknown AEAD: %s\n", name);
-                return -1;
-        }
-
-        if (*aead == NULL)
-                return 0;
-
-        return 1;
-}
-
-static int
-run_test_case(const EVP_AEAD* aead, unsigned char bufs[NUM_TYPES][BUF_MAX],
-    const unsigned int lengths[NUM_TYPES], unsigned int line_no)
-{
-        EVP_AEAD_CTX ctx;
-        unsigned char out[BUF_MAX + EVP_AEAD_MAX_TAG_LENGTH], out2[BUF_MAX];
-        size_t out_len, out_len2;
-
-        if (!EVP_AEAD_CTX_init(&ctx, aead, bufs[KEY], lengths[KEY],
-            lengths[TAG], NULL)) {
-                fprintf(stderr, "Failed to init AEAD on line %u\n", line_no);
-                return 0;
-        }
-
-        if (!EVP_AEAD_CTX_seal(&ctx, out, &out_len, sizeof(out), bufs[NONCE],
-            lengths[NONCE], bufs[IN], lengths[IN], bufs[AD], lengths[AD])) {
-                fprintf(stderr, "Failed to run AEAD on line %u\n", line_no);
-                return 0;
-        }
-
-        if (out_len != lengths[CT] + lengths[TAG]) {
-                fprintf(stderr, "Bad output length on line %u: %zu vs %u\n",
-                    line_no, out_len, (unsigned)(lengths[CT] + lengths[TAG]));
-                return 0;
-        }
-
-        if (memcmp(out, bufs[CT], lengths[CT]) != 0) {
-                fprintf(stderr, "Bad output on line %u\n", line_no);
-                return 0;
-        }
-
-        if (memcmp(out + lengths[CT], bufs[TAG], lengths[TAG]) != 0) {
-                fprintf(stderr, "Bad tag on line %u\n", line_no);
-                return 0;
-        }
-
-        if (!EVP_AEAD_CTX_open(&ctx, out2, &out_len2, lengths[IN], bufs[NONCE],
-            lengths[NONCE], out, out_len, bufs[AD], lengths[AD])) {
-                fprintf(stderr, "Failed to decrypt on line %u\n", line_no);
-                return 0;
-        }
-
-        if (out_len2 != lengths[IN]) {
-                fprintf(stderr, "Bad decrypt on line %u: %zu\n",
-                    line_no, out_len2);
-                return 0;
-        }
-
-        if (memcmp(out2, bufs[IN], out_len2) != 0) {
-                fprintf(stderr, "Plaintext mismatch on line %u\n", line_no);
-                return 0;
-        }
-
-        out[0] ^= 0x80;
-        if (EVP_AEAD_CTX_open(&ctx, out2, &out_len2, lengths[IN], bufs[NONCE],
-            lengths[NONCE], out, out_len, bufs[AD], lengths[AD])) {
-                fprintf(stderr, "Decrypted bad data on line %u\n", line_no);
-                return 0;
-        }
-
-        EVP_AEAD_CTX_cleanup(&ctx);
-        return 1;
-}
-
-int
-main(int argc, char **argv)
-{
-        FILE *f;
-        const EVP_AEAD *aead = NULL;
-        unsigned int line_no = 0, num_tests = 0, j;
-
-        unsigned char bufs[NUM_TYPES][BUF_MAX];
-        unsigned int lengths[NUM_TYPES];
-
-        if (argc != 2) {
-                fprintf(stderr, "%s <test file.txt>\n", argv[0]);
-                return 1;
-        }
-
-        f = fopen(argv[1], "r");
-        if (f == NULL) {
-                perror("failed to open input");
-                return 1;
-        }
-
-        for (j = 0; j < NUM_TYPES; j++)
-                lengths[j] = 0;
-
-        for (;;) {
-                char line[4096];
-                unsigned int i, type_len = 0;
-
-                unsigned char *buf = NULL;
-                unsigned int *buf_len = NULL;
-
-                if (!fgets(line, sizeof(line), f))
-                        break;
-
-                line_no++;
-                if (line[0] == '#')
-                        continue;
-
-                if (line[0] == '\n' || line[0] == 0) {
-                        /* Run a test, if possible. */
-                        char any_values_set = 0;
-                        for (j = 0; j < NUM_TYPES; j++) {
-                                if (lengths[j] != 0) {
-                                        any_values_set = 1;
-                                        break;
-                                }
-                        }
-
-                        if (!any_values_set)
-                                continue;
-
-                        switch (aead_from_name(&aead, bufs[AEAD])) {
-                        case 0:
-                                fprintf(stderr, "Skipping test...\n");
-                                continue;
-                        case -1:
-                                fprintf(stderr, "Aborting...\n");
-                                return 4;
-                        }
-
-                        if (!run_test_case(aead, bufs, lengths, line_no))
-                                return 4;
-
-                        for (j = 0; j < NUM_TYPES; j++)
-                                lengths[j] = 0;
-
-                        num_tests++;
-                        continue;
-                }
-
-                /* Each line looks like:
-                 *   TYPE: 0123abc
-                 * Where "TYPE" is the type of the data on the line,
-                 * e.g. "KEY". */
-                for (i = 0; line[i] != 0 && line[i] != '\n'; i++) {
-                        if (line[i] == ':') {
-                                type_len = i;
-                                break;
-                        }
-                }
-                i++;
-
-                if (type_len == 0) {
-                        fprintf(stderr, "Parse error on line %u\n", line_no);
-                        return 3;
-                }
-
-                /* After the colon, there's optional whitespace. */
-                for (; line[i] != 0 && line[i] != '\n'; i++) {
-                        if (line[i] != ' ' && line[i] != '\t')
-                                break;
-                }
-
-                line[type_len] = 0;
-                for (j = 0; j < NUM_TYPES; j++) {
-                        if (strcmp(line, NAMES[j]) != 0)
-                                continue;
-                        if (lengths[j] != 0) {
-                                fprintf(stderr, "Duplicate value on line %u\n",
-                                    line_no);
-                                return 3;
-                        }
-                        buf = bufs[j];
-                        buf_len = &lengths[j];
-                        break;
-                }
-
-                if (buf == NULL) {
-                        fprintf(stderr, "Unknown line type on line %u\n",
-                            line_no);
-                        return 3;
-                }
-
-                if (j == AEAD) {
-                        *buf_len = strlcpy(buf, line + i, BUF_MAX);
-                        for (j = 0; j < BUF_MAX; j++) {
-                                if (buf[j] == '\n')
-                                        buf[j] = '\0';
-                        }
-                        continue;
-                }
-
-                for (j = 0; line[i] != 0 && line[i] != '\n'; i++) {
-                        unsigned char v, v2;
-                        v = hex_digit(line[i++]);
-                        if (line[i] == 0 || line[i] == '\n') {
-                                fprintf(stderr, "Odd-length hex data on "
-                                    "line %u\n", line_no);
-                                return 3;
-                        }
-                        v2 = hex_digit(line[i]);
-                        if (v > 15 || v2 > 15) {
-                                fprintf(stderr, "Invalid hex char on line %u\n",
-                                    line_no);
-                                return 3;
-                        }
-                        v <<= 4;
-                        v |= v2;
-
-                        if (j == BUF_MAX) {
-                                fprintf(stderr, "Too much hex data on line %u "
-                                    "(max is %u bytes)\n",
-                                    line_no, (unsigned) BUF_MAX);
-                                return 3;
-                        }
-                        buf[j++] = v;
-                        *buf_len = *buf_len + 1;
-                }
-        }
-
-        printf("Completed %u test cases\n", num_tests);
-        printf("PASS\n");
-        fclose(f);
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/aead/aeadtests.txt b/src/regress/lib/libcrypto/aead/aeadtests.txt
deleted file mode 100644
index 18cee7e579..0000000000
--- a/src/regress/lib/libcrypto/aead/aeadtests.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-#       $OpenBSD: aeadtests.txt,v 1.7 2018/07/17 17:06:49 tb Exp $
-#
-# MACsec GCM-AES Test Vectors (bn-randall-test-vectors-0511-v1.pdf)
-#
-
-# 2.5.1 65-byte Packet Authentication Using GCM-AES-128
-AEAD: aes-128-gcm
-KEY: 013FE00B5F11BE7F866D0CBBC55A7A90
-NONCE: 7CFDE9F9E33724C68932D612
-IN:
-AD: 84C5D513D2AAF6E5BBD2727788E523008932D6127CFDE9F9E33724C608000F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F0005
-CT:
-TAG: 217867E50C2DAD74C28C3B50ABDF695A
-
-# 2.5.2 65-byte Packet Authentication Using GCM-AES-256
-AEAD: aes-256-gcm
-KEY: 83C093B58DE7FFE1C0DA926AC43FB3609AC1C80FEE1B624497EF942E2F79A823
-NONCE: 7CFDE9F9E33724C68932D612
-IN:
-AD: 84C5D513D2AAF6E5BBD2727788E523008932D6127CFDE9F9E33724C608000F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F0005
-CT:
-TAG: 6EE160E8FAECA4B36C86B234920CA975
-
-# 2.8.1 75-byte Packet Encryption Using GCM-AES-128
-AEAD: aes-128-gcm
-KEY: 88EE087FD95DA9FBF6725AA9D757B0CD
-NONCE: 7AE8E2CA4EC500012E58495C
-IN: 08000F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748490008
-AD: 68F2E77696CE7AE8E2CA4EC588E54D002E58495C
-CT: C31F53D99E5687F7365119B832D2AAE70741D593F1F9E2AB3455779B078EB8FEACDFEC1F8E3E5277F8180B43361F6512ADB16D2E38548A2C719DBA7228D840
-TAG: 88F8757ADB8AA788D8F65AD668BE70E7
-
-# 2.8.2 75-byte Packet Encryption Using GCM-AES-256
-AEAD: aes-256-gcm
-KEY: 4C973DBC7364621674F8B5B89E5C15511FCED9216490FB1C1A2CAA0FFE0407E5
-NONCE: 7AE8E2CA4EC500012E58495C
-IN: 08000F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748490008
-AD: 68F2E77696CE7AE8E2CA4EC588E54D002E58495C
-CT: BA8AE31BC506486D6873E4FCE460E7DC57591FF00611F31C3834FE1C04AD80B66803AFCF5B27E6333FA67C99DA47C2F0CED68D531BD741A943CFF7A6713BD0
-TAG: 2611CD7DAA01D61C5C886DC1A8170107
-
-# Test vector from RFC7539 2.8.2
-AEAD: chacha20-poly1305
-KEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f
-NONCE: 070000004041424344454647
-IN: 4c616469657320616e642047656e746c656d656e206f662074686520636c617373206f66202739393a204966204920636f756c64206f6666657220796f75206f6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73637265656e20776f756c642062652069742e
-AD: 50515253c0c1c2c3c4c5c6c7
-CT: d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d63dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b3692ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc3ff4def08e4b7a9de576d26586cec64b6116
-TAG: 1ae10b594f09e26a7e902ecbd0600691
-
-# Test vector from RFC7539 Appendix A.5
-AEAD: chacha20-poly1305
-KEY: 1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0
-NONCE: 000000000102030405060708
-IN: 496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67726573732e2fe2809d
-AD: f33388860000000000004e91
-CT: 64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb24c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c8559797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523eaf4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a1049e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c29a6ad5cb4022b02709b
-TAG: eead9d67890cbb22392336fea1851f38
-
-# Test vector from RFC7634 Appendix A
-AEAD: chacha20-poly1305
-KEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f
-NONCE: a0a1a2a31011121314151617
-IN: 45000054a6f200004001e778c6336405c000020508005b7a3a080000553bec100007362708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363701020204
-AD: 0102030400000005
-CT: 24039428b97f417e3c13753a4f05087b67c352e6a7fab1b982d466ef407ae5c614ee8099d52844eb61aa95dfab4c02f72aa71e7c4c4f64c9befe2facc638e8f3cbec163fac469b502773f6fb94e664da9165b82829f641e0
-TAG: 76aaa8266b7fb0f7b11b369907e1ad43
-
-# Test vector from RFC7634 Appendix B
-AEAD: chacha20-poly1305
-KEY: 808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f
-NONCE: a0a1a2a31011121314151617
-IN: 0000000c000040010000000a00
-AD: c0c1c2c3c4c5c6c7d0d1d2d3d4d5d6d72e202500000000090000004529000029
-CT: 610394701f8d017f7c12924889
-TAG: 6b71bfe25236efd7cdc67066906315b2
-
diff --git a/src/regress/lib/libcrypto/aeswrap/Makefile b/src/regress/lib/libcrypto/aeswrap/Makefile
deleted file mode 100644
index dbdf48d183..0000000000
--- a/src/regress/lib/libcrypto/aeswrap/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   aes_wrap
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/aeswrap/aes_wrap.c b/src/regress/lib/libcrypto/aeswrap/aes_wrap.c
deleted file mode 100644
index b48c7ae6e0..0000000000
--- a/src/regress/lib/libcrypto/aeswrap/aes_wrap.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*      $OpenBSD: aes_wrap.c,v 1.4 2018/07/17 17:06:49 tb Exp $ */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
- */
-/* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/aes.h>
-
-int AES_wrap_unwrap_test(const unsigned char *, int, const unsigned char *,
-        const unsigned char *, const unsigned char *, int);
-
-int
-AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
-    const unsigned char *iv, const unsigned char *eout,
-    const unsigned char *key, int keylen)
-{
-        unsigned char *otmp = NULL, *ptmp = NULL;
-        int r, ret = 0;
-        AES_KEY wctx;
-
-        otmp = malloc(keylen + 8);
-        ptmp = malloc(keylen);
-        if (otmp == NULL || ptmp == NULL)
-                goto err;
-        if (AES_set_encrypt_key(kek, keybits, &wctx))
-                goto err;
-        r = AES_wrap_key(&wctx, iv, otmp, key, keylen);
-        if (r <= 0)
-                goto err;
-
-        if (eout && memcmp(eout, otmp, keylen))
-                goto err;
-
-        if (AES_set_decrypt_key(kek, keybits, &wctx))
-                goto err;
-        r = AES_unwrap_key(&wctx, iv, ptmp, otmp, r);
-
-        if (memcmp(key, ptmp, keylen))
-                goto err;
-
-        ret = 1;
-
-err:
-        free(otmp);
-        free(ptmp);
-
-        return ret;
-}
-
-int
-main(int argc, char **argv)
-{
-        static const unsigned char kek[] = {
-                0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-                0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-                0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-        };
-
-        static const unsigned char key[] = {
-                0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-                0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-                0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
-        };
-
-        static const unsigned char e1[] = {
-                0x1f, 0xa6, 0x8b, 0x0a, 0x81, 0x12, 0xb4, 0x47,
-                0xae, 0xf3, 0x4b, 0xd8, 0xfb, 0x5a, 0x7b, 0x82,
-                0x9d, 0x3e, 0x86, 0x23, 0x71, 0xd2, 0xcf, 0xe5
-        };
-
-        static const unsigned char e2[] = {
-                0x96, 0x77, 0x8b, 0x25, 0xae, 0x6c, 0xa4, 0x35,
-                0xf9, 0x2b, 0x5b, 0x97, 0xc0, 0x50, 0xae, 0xd2,
-                0x46, 0x8a, 0xb8, 0xa1, 0x7a, 0xd8, 0x4e, 0x5d
-        };
-
-        static const unsigned char e3[] = {
-                0x64, 0xe8, 0xc3, 0xf9, 0xce, 0x0f, 0x5b, 0xa2,
-                0x63, 0xe9, 0x77, 0x79, 0x05, 0x81, 0x8a, 0x2a,
-                0x93, 0xc8, 0x19, 0x1e, 0x7d, 0x6e, 0x8a, 0xe7
-        };
-
-        static const unsigned char e4[] = {
-                0x03, 0x1d, 0x33, 0x26, 0x4e, 0x15, 0xd3, 0x32,
-                0x68, 0xf2, 0x4e, 0xc2, 0x60, 0x74, 0x3e, 0xdc,
-                0xe1, 0xc6, 0xc7, 0xdd, 0xee, 0x72, 0x5a, 0x93,
-                0x6b, 0xa8, 0x14, 0x91, 0x5c, 0x67, 0x62, 0xd2
-        };
-
-        static const unsigned char e5[] = {
-                0xa8, 0xf9, 0xbc, 0x16, 0x12, 0xc6, 0x8b, 0x3f,
-                0xf6, 0xe6, 0xf4, 0xfb, 0xe3, 0x0e, 0x71, 0xe4,
-                0x76, 0x9c, 0x8b, 0x80, 0xa3, 0x2c, 0xb8, 0x95,
-                0x8c, 0xd5, 0xd1, 0x7d, 0x6b, 0x25, 0x4d, 0xa1
-        };
-
-        static const unsigned char e6[] = {
-                0x28, 0xc9, 0xf4, 0x04, 0xc4, 0xb8, 0x10, 0xf4,
-                0xcb, 0xcc, 0xb3, 0x5c, 0xfb, 0x87, 0xf8, 0x26,
-                0x3f, 0x57, 0x86, 0xe2, 0xd8, 0x0e, 0xd3, 0x26,
-                0xcb, 0xc7, 0xf0, 0xe7, 0x1a, 0x99, 0xf4, 0x3b,
-                0xfb, 0x98, 0x8b, 0x9b, 0x7a, 0x02, 0xdd, 0x21
-        };
-
-        int ret, nfailures = 0;
-        ret = AES_wrap_unwrap_test(kek, 128, NULL, e1, key, 16);
-        if (ret == 0)
-                nfailures++;
-        fprintf(stderr, "Key test result %d\n", ret);
-        ret = AES_wrap_unwrap_test(kek, 192, NULL, e2, key, 16);
-        if (ret == 0)
-                nfailures++;
-        fprintf(stderr, "Key test result %d\n", ret);
-        ret = AES_wrap_unwrap_test(kek, 256, NULL, e3, key, 16);
-        if (ret == 0)
-                nfailures++;
-        fprintf(stderr, "Key test result %d\n", ret);
-        ret = AES_wrap_unwrap_test(kek, 192, NULL, e4, key, 24);
-        if (ret == 0)
-                nfailures++;
-        fprintf(stderr, "Key test result %d\n", ret);
-        ret = AES_wrap_unwrap_test(kek, 256, NULL, e5, key, 24);
-        if (ret == 0)
-                nfailures++;
-        fprintf(stderr, "Key test result %d\n", ret);
-        ret = AES_wrap_unwrap_test(kek, 256, NULL, e6, key, 32);
-        if (ret == 0)
-                nfailures++;
-        fprintf(stderr, "Key test result %d\n", ret);
-
-        return nfailures;
-}
diff --git a/src/regress/lib/libcrypto/asn1/Makefile b/src/regress/lib/libcrypto/asn1/Makefile
deleted file mode 100644
index 2dae70e9e5..0000000000
--- a/src/regress/lib/libcrypto/asn1/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#       $OpenBSD: Makefile,v 1.5 2018/08/31 17:35:21 tb Exp $
-
-TESTS = \
-        asn1evp \
-        asn1time \
-        rfc5280time
-
-PROGS = ${TESTS}
-
-REGRESS_TARGETS= all_tests
-
-LDADD=          -lcrypto
-DPADD=          ${LIBCRYPTO} ${LIBSSL}
-WARNINGS=       Yes
-LDFLAGS+=       -lcrypto
-CFLAGS+=        -DLIBRESSL_INTERNAL -Wall -Wundef -Werror
-
-all_tests: ${TESTS}
-        @for test in $>; do \
-                ./$$test; \
-        done
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/asn1/asn1evp.c b/src/regress/lib/libcrypto/asn1/asn1evp.c
deleted file mode 100644
index d1870f9acc..0000000000
--- a/src/regress/lib/libcrypto/asn1/asn1evp.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* $OpenBSD: asn1evp.c,v 1.2 2017/12/09 14:34:09 jsing Exp $ */
-/*
- * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <openssl/asn1.h>
-
-#define TEST_NUM 0x7fffffffL
-
-unsigned char asn1_atios[] = {
-        0x30, 0x10, 0x02, 0x04, 0x7f, 0xff, 0xff, 0xff,
-        0x04, 0x08, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
-        0x06, 0x07,
-};
-
-unsigned char test_octetstring[] = {
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-};
-
-static void
-hexdump(const unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 1; i <= len; i++)
-                fprintf(stderr, " 0x%02hhx,%s", buf[i - 1], i % 8 ? "" : "\n");
-
-        fprintf(stderr, "\n");
-}
-
-static int
-compare_data(const char *label, const unsigned char *d1, size_t d1_len,
-    const unsigned char *d2, size_t d2_len)
-{
-        if (d1_len != d2_len) {
-                fprintf(stderr, "FAIL: got %s with length %zu, want %zu\n",
-                    label, d1_len, d2_len);
-                return -1;
-        }
-        if (memcmp(d1, d2, d1_len) != 0) {
-                fprintf(stderr, "FAIL: %s differs\n", label);
-                fprintf(stderr, "got:\n");
-                hexdump(d1, d1_len);
-                fprintf(stderr, "want:\n");
-                hexdump(d2, d2_len);
-                return -1;
-        }
-        return 0;
-}
-
-int
-main(int argc, char **argv)
-{
-        unsigned char data[16];
-        long num = TEST_NUM;
-        int failed = 1;
-        ASN1_TYPE at;
-        int len;
-
-        memset(&at, 0, sizeof(at));
-
-        if (!ASN1_TYPE_set_int_octetstring(&at, num, test_octetstring,
-            sizeof(test_octetstring))) {
-                fprintf(stderr, "FAIL: ASN1_TYPE_set_int_octetstring failed\n");
-                goto done;
-        }
-        if (at.type != V_ASN1_SEQUENCE) {
-                fprintf(stderr, "FAIL: not a V_ASN1_SEQUENCE (%i != %i)\n",
-                    at.type, V_ASN1_SEQUENCE);
-                goto done;
-        }
-        if (at.value.sequence->type != V_ASN1_OCTET_STRING) {
-                fprintf(stderr, "FAIL: not a V_ASN1_OCTET_STRING (%i != %i)\n",
-                    at.type, V_ASN1_OCTET_STRING);
-                goto done;
-        }
-        if (compare_data("sequence", at.value.sequence->data,
-            at.value.sequence->length, asn1_atios, sizeof(asn1_atios)) == -1)
-                goto done;
-
-        memset(&data, 0, sizeof(data));
-        num = 0;
-
-        if ((len = ASN1_TYPE_get_int_octetstring(&at, &num, data,
-            sizeof(data))) < 0) {
-                fprintf(stderr, "FAIL: ASN1_TYPE_get_int_octetstring failed\n");
-                goto done;
-        }
-        if (num != TEST_NUM) {
-                fprintf(stderr, "FAIL: got num %li, want %li\n", num, TEST_NUM);
-                goto done;
-        }
-        if (compare_data("octet string", data, len,
-            test_octetstring, sizeof(test_octetstring)) == -1)
-                goto done;
-        if (data[len] != 0) {
-                fprintf(stderr, "FAIL: octet string overflowed buffer\n");
-                goto done;
-        }
-
-        memset(&data, 0, sizeof(data));
-        num = 0;
-
-        /* With a limit buffer, the output should be truncated... */
-        if ((len = ASN1_TYPE_get_int_octetstring(&at, &num, data, 4)) < 0) {
-                fprintf(stderr, "FAIL: ASN1_TYPE_get_int_octetstring failed\n");
-                goto done;
-        }
-        if (num != TEST_NUM) {
-                fprintf(stderr, "FAIL: got num %li, want %li\n", num, TEST_NUM);
-                goto done;
-        }
-        if (len != sizeof(test_octetstring)) {
-                fprintf(stderr, "FAIL: got length mismatch (%i != %zu)\n",
-                    len, sizeof(test_octetstring));
-                goto done;
-        }
-        if (compare_data("octet string", data, 4, test_octetstring, 4) == -1)
-                goto done;
-        if (data[4] != 0) {
-                fprintf(stderr, "FAIL: octet string overflowed buffer\n");
-                goto done;
-        }
-
-        failed = 0;
-
- done:
-        return failed;
-}
diff --git a/src/regress/lib/libcrypto/asn1/asn1time.c b/src/regress/lib/libcrypto/asn1/asn1time.c
deleted file mode 100644
index 6a3921bd9c..0000000000
--- a/src/regress/lib/libcrypto/asn1/asn1time.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/* $OpenBSD: asn1time.c,v 1.8 2015/12/28 14:18:38 bcook Exp $ */
-/*
- * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/asn1.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-struct asn1_time_test {
-        const char *str;
-        const char *data;
-        const unsigned char der[32];
-        time_t time;
-};
-
-struct asn1_time_test asn1_invtime_tests[] = {
-        {
-                .str = "",
-        },
-        {
-                .str = "2015",
-        },
-        {
-                .str = "201509",
-        },
-        {
-                .str = "20150923",
-        },
-        {
-                .str = "20150923032700",
-        },
-        {
-                .str = "20150923032700.Z",
-        },
-        {
-                .str = "20150923032700.123",
-        },
-        {
-                .str = "20150923032700+1.09",
-        },
-        {
-                .str = "20150923032700+1100Z",
-        },
-        {
-                .str = "20150923032700-11001",
-        },
-        {
-                /* UTC time cannot have fractional seconds. */
-                .str = "150923032700.123Z",
-        },
-        {
-                .str = "aaaaaaaaaaaaaaZ",
-        },
-};
-
-struct asn1_time_test asn1_gentime_tests[] = {
-        {
-                .str = "19700101000000Z",
-                .data = "19700101000000Z",
-                .time = 0,
-                .der = {
-                        0x18, 0x0f, 0x31, 0x39, 0x37, 0x30, 0x30, 0x31,
-                        0x30, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-                        0x5a,
-                },
-        },
-        {
-                .str = "20150923032700Z",
-                .data = "20150923032700Z",
-                .time = 1442978820,
-                .der = {
-                        0x18, 0x0f, 0x32, 0x30, 0x31, 0x35, 0x30, 0x39,
-                        0x32, 0x33, 0x30, 0x33, 0x32, 0x37, 0x30, 0x30,
-                        0x5a,
-                },
-        },
-};
-
-struct asn1_time_test asn1_utctime_tests[] = {
-        {
-                .str = "700101000000Z",
-                .data = "700101000000Z",
-                .time = 0,
-                .der = {
-                        0x17, 0x0d, 0x37, 0x30, 0x30, 0x31, 0x30, 0x31,
-                        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a,
-                },
-        },
-        {
-                .str = "150923032700Z",
-                .data = "150923032700Z",
-                .time = 1442978820,
-                .der = {
-                        0x17, 0x0d, 0x31, 0x35, 0x30, 0x39, 0x32, 0x33,
-                        0x30, 0x33, 0x32, 0x37, 0x30, 0x30, 0x5a,
-                },
-        },
-        {
-                .str = "140524144512Z",
-                .data = "140524144512Z",
-                .time = 1400942712,
-                .der = {
-                        0x17, 0x0d, 0x31, 0x34, 0x30, 0x35, 0x32, 0x34,
-                        0x31, 0x34, 0x34, 0x35, 0x31, 0x32, 0x5a,
-                },
-        },
-        {
-                .str = "240401144512Z",
-                .data = "240401144512Z",
-                .time = 1711982712,
-                .der = {
-                        0x17, 0x0d, 0x32, 0x34, 0x30, 0x34, 0x30, 0x31,
-                        0x31, 0x34, 0x34, 0x35, 0x31, 0x32, 0x5a
-                },
-        },
-};
-
-#define N_INVTIME_TESTS \
-    (sizeof(asn1_invtime_tests) / sizeof(*asn1_invtime_tests))
-#define N_GENTIME_TESTS \
-    (sizeof(asn1_gentime_tests) / sizeof(*asn1_gentime_tests))
-#define N_UTCTIME_TESTS \
-    (sizeof(asn1_utctime_tests) / sizeof(*asn1_utctime_tests))
-
-static void
-hexdump(const unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 1; i <= len; i++)
-                fprintf(stderr, " 0x%02hhx,%s", buf[i - 1], i % 8 ? "" : "\n");
-
-        fprintf(stderr, "\n");
-}
-
-static int
-asn1_compare_bytes(int test_no, const unsigned char *d1,
-    const unsigned char *d2, int len1, int len2)
-{
-        if (len1 != len2) {
-                fprintf(stderr, "FAIL: test %i - byte lengths differ "
-                    "(%i != %i)\n", test_no, len1, len2);
-                return (1);
-        }
-        if (memcmp(d1, d2, len1) != 0) {
-                fprintf(stderr, "FAIL: test %i - bytes differ\n", test_no);
-                fprintf(stderr, "Got:\n");
-                hexdump(d1, len1);
-                fprintf(stderr, "Want:\n");
-                hexdump(d2, len2);
-        }
-        return (0);
-}
-
-static int
-asn1_compare_str(int test_no, struct asn1_string_st *asn1str, const char *str)
-{
-        int length = strlen(str);
-
-        if (asn1str->length != length) {
-                fprintf(stderr, "FAIL: test %i - string lengths differ "
-                    "(%i != %i)\n", test_no, asn1str->length, length);
-                return (1);
-        }
-        if (strncmp(asn1str->data, str, length) != 0) {
-                fprintf(stderr, "FAIL: test %i - strings differ "
-                    "('%s' != '%s')\n", test_no, asn1str->data, str);
-                return (1);
-        }
-
-        return (0);
-}
-
-static int
-asn1_invtime_test(int test_no, struct asn1_time_test *att)
-{
-        ASN1_GENERALIZEDTIME *gt = NULL;
-        ASN1_UTCTIME *ut = NULL;
-        ASN1_TIME *t = NULL;
-        int failure = 1;
-
-        if ((gt = ASN1_GENERALIZEDTIME_new()) == NULL)
-                goto done;
-        if ((ut = ASN1_UTCTIME_new()) == NULL)
-                goto done;
-        if ((t = ASN1_TIME_new()) == NULL)
-                goto done;
-
-        if (ASN1_GENERALIZEDTIME_set_string(gt, att->str) != 0) {
-                fprintf(stderr, "FAIL: test %i - successfully set "
-                    "GENERALIZEDTIME string '%s'\n", test_no, att->str);
-                goto done;
-        }
-        if (ASN1_UTCTIME_set_string(ut, att->str) != 0) {
-                fprintf(stderr, "FAIL: test %i - successfully set UTCTIME "
-                    "string '%s'\n", test_no, att->str);
-                goto done;
-        }
-        if (ASN1_TIME_set_string(t, att->str) != 0) {
-                fprintf(stderr, "FAIL: test %i - successfully set TIME "
-                    "string '%s'\n", test_no, att->str);
-                goto done;
-        }
-
-        failure = 0;
-
- done:
-        ASN1_GENERALIZEDTIME_free(gt);
-        ASN1_UTCTIME_free(ut);
-        ASN1_TIME_free(t);
-
-        return (failure);
-}
-
-static int
-asn1_gentime_test(int test_no, struct asn1_time_test *att)
-{
-        const unsigned char *der;
-        unsigned char *p = NULL;
-        ASN1_GENERALIZEDTIME *gt = NULL;
-        int failure = 1;
-        int len;
-
-        if (ASN1_GENERALIZEDTIME_set_string(NULL, att->str) != 1) {
-                fprintf(stderr, "FAIL: test %i - failed to set string '%s'\n",
-                    test_no, att->str);
-                goto done;
-        }
-
-        if ((gt = ASN1_GENERALIZEDTIME_new()) == NULL)
-                goto done;
-
-        if (ASN1_GENERALIZEDTIME_set_string(gt, att->str) != 1) {
-                fprintf(stderr, "FAIL: test %i - failed to set string '%s'\n",
-                    test_no, att->str);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, gt, att->str) != 0)
-                goto done;
-
-        if ((len = i2d_ASN1_GENERALIZEDTIME(gt, &p)) <= 0) {
-                fprintf(stderr, "FAIL: test %i - i2d_ASN1_GENERALIZEDTIME "
-                    "failed\n", test_no);
-                goto done;
-        }
-        der = att->der;
-        if (asn1_compare_bytes(test_no, p, der, len, strlen(der)) != 0)
-                goto done;
-
-        len = strlen(att->der);
-        if (d2i_ASN1_GENERALIZEDTIME(&gt, &der, len) == NULL) {
-                fprintf(stderr, "FAIL: test %i - d2i_ASN1_GENERALIZEDTIME "
-                    "failed\n", test_no);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, gt, att->str) != 0)
-                goto done;
-
-        ASN1_GENERALIZEDTIME_free(gt);
-
-        if ((gt = ASN1_GENERALIZEDTIME_set(NULL, att->time)) == NULL) {
-                fprintf(stderr, "FAIL: test %i - failed to set time %lli\n",
-                    test_no, (long long)att->time);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, gt, att->data) != 0)
-                goto done;
-
-        failure = 0;
-
- done:
-        ASN1_GENERALIZEDTIME_free(gt);
-        free(p);
-
-        return (failure);
-}
-
-static int
-asn1_utctime_test(int test_no, struct asn1_time_test *att)
-{
-        const unsigned char *der;
-        unsigned char *p = NULL;
-        ASN1_UTCTIME *ut = NULL;
-        int failure = 1;
-        int len;
-
-        if (ASN1_UTCTIME_set_string(NULL, att->str) != 1) {
-                fprintf(stderr, "FAIL: test %i - failed to set string '%s'\n",
-                    test_no, att->str);
-                goto done;
-        }
-
-        if ((ut = ASN1_UTCTIME_new()) == NULL)
-                goto done;
-
-        if (ASN1_UTCTIME_set_string(ut, att->str) != 1) {
-                fprintf(stderr, "FAIL: test %i - failed to set string '%s'\n",
-                    test_no, att->str);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, ut, att->str) != 0)
-                goto done;
-
-        if ((len = i2d_ASN1_UTCTIME(ut, &p)) <= 0) {
-                fprintf(stderr, "FAIL: test %i - i2d_ASN1_UTCTIME failed\n",
-                    test_no);
-                goto done;
-        }
-        der = att->der;
-        if (asn1_compare_bytes(test_no, p, der, len, strlen(der)) != 0)
-                goto done;
-
-        len = strlen(att->der);
-        if (d2i_ASN1_UTCTIME(&ut, &der, len) == NULL) {
-                fprintf(stderr, "FAIL: test %i - d2i_ASN1_UTCTIME failed\n",
-                    test_no);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, ut, att->str) != 0)
-                goto done;
-
-        ASN1_UTCTIME_free(ut);
-
-        if ((ut = ASN1_UTCTIME_set(NULL, att->time)) == NULL) {
-                fprintf(stderr, "FAIL: test %i - failed to set time %lli\n",
-                    test_no, (long long)att->time);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, ut, att->data) != 0)
-                goto done;
-
-        failure = 0;
-
- done:
-        ASN1_UTCTIME_free(ut);
-        free(p);
-
-        return (failure);
-}
-
-static int
-asn1_time_test(int test_no, struct asn1_time_test *att, int type)
-{
-        ASN1_TIME *t = NULL;
-        int failure = 1;
-
-        if (ASN1_TIME_set_string(NULL, att->str) != 1) {
-                fprintf(stderr, "FAIL: test %i - failed to set string '%s'\n",
-                    test_no, att->str);
-                goto done;
-        }
-
-        if ((t = ASN1_TIME_new()) == NULL)
-                goto done;
-
-        if (ASN1_TIME_set_string(t, att->str) != 1) {
-                fprintf(stderr, "FAIL: test %i - failed to set string '%s'\n",
-                    test_no, att->str);
-                goto done;
-        }
-
-        if (t->type != type) {
-                fprintf(stderr, "FAIL: test %i - got type %i, want %i\n",
-                    test_no, t->type, type);
-                goto done;
-        }
-
-        failure = 0;
-
- done:
-
-        ASN1_TIME_free(t);
-
-        return (failure);
-}
-
-int
-main(int argc, char **argv)
-{
-        struct asn1_time_test *att;
-        int failed = 0;
-        size_t i;
-
-        fprintf(stderr, "Invalid time tests...\n");
-        for (i = 0; i < N_INVTIME_TESTS; i++) {
-                att = &asn1_invtime_tests[i];
-                failed |= asn1_invtime_test(i, att);
-        }
-
-        fprintf(stderr, "GENERALIZEDTIME tests...\n");
-        for (i = 0; i < N_GENTIME_TESTS; i++) {
-                att = &asn1_gentime_tests[i];
-                failed |= asn1_gentime_test(i, att);
-        }
-
-        fprintf(stderr, "UTCTIME tests...\n");
-        for (i = 0; i < N_UTCTIME_TESTS; i++) {
-                att = &asn1_utctime_tests[i];
-                failed |= asn1_utctime_test(i, att);
-        }
-
-        fprintf(stderr, "TIME tests...\n");
-        for (i = 0; i < N_UTCTIME_TESTS; i++) {
-                att = &asn1_utctime_tests[i];
-                failed |= asn1_time_test(i, att, V_ASN1_UTCTIME);
-        }
-        for (i = 0; i < N_GENTIME_TESTS; i++) {
-                att = &asn1_gentime_tests[i];
-                failed |= asn1_time_test(i, att, V_ASN1_GENERALIZEDTIME);
-        }
-
-        return (failed);
-}
diff --git a/src/regress/lib/libcrypto/asn1/rfc5280time.c b/src/regress/lib/libcrypto/asn1/rfc5280time.c
deleted file mode 100644
index 34e40439dc..0000000000
--- a/src/regress/lib/libcrypto/asn1/rfc5280time.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* $OpenBSD: rfc5280time.c,v 1.4 2015/10/30 15:52:55 miod Exp $ */
-/*
- * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
- * Copyright (c) 2015 Bob Beck <beck@opebsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/asn1.h>
-#include <openssl/x509.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-struct rfc5280_time_test {
-        const char *str;
-        const char *data;
-        time_t time;
-};
-
-struct rfc5280_time_test rfc5280_invtime_tests[] = {
-        {
-                .str = "",
-        },
-        {
-                .str = "2015",
-        },
-        {
-                .str = "201509",
-        },
-        {
-                .str = "20150923",
-        },
-        {
-                .str = "20150923032700",
-        },
-        {
-                /* UTC time must have seconds */
-                .str = "7001010000Z",
-        },
-        {
-                .str = "201509230327Z",
-        },
-        {
-                .str = "20150923032700.Z",
-        },
-        {
-                .str = "20150923032700.123",
-        },
-        {
-                .str = "20150923032700+1100Z",
-        },
-        {
-                .str = "20150923032700-11001",
-        },
-        {
-                /* UTC time cannot have fractional seconds. */
-                .str = "150923032700.123Z",
-        },
-        {
-                /* Gen time cannot have +- TZ. */
-                .str = "20150923032712+1115",
-        },
-        {
-                /* Gen time cannot have fractional seconds */
-                .str = "20150923032712.123Z",
-        },
-        {
-                .str = "aaaaaaaaaaaaaaZ",
-        },
-        {
-                /* Must be a UTC time per RFC 5280 */
-                .str = "19700101000000Z",
-                .data = "19700101000000Z",
-                .time = 0,
-        },
-        {
-                /* (times before 2050 must be UTCTIME) Per RFC 5280 4.1.2.5 */
-                .str = "20150923032700Z",
-                .data = "20150923032700Z",
-                .time = 1442978820,
-        },
-        {
-                /* (times before 2050 must be UTCTIME) Per RFC 5280 4.1.2.5 */
-                .str = "00000101000000Z",
-                .data = "00000101000000Z",
-                .time = -62167219200LL,
-        },
-        {
-                /* (times before 2050 must be UTCTIME) Per RFC 5280 4.1.2.5 */
-                .str = "20491231235959Z",
-                .data = "20491231235959Z",
-                .time = 2524607999LL,
-        },
-        {
-                /* (times before 2050 must be UTCTIME) Per RFC 5280 4.1.2.5 */
-                .str = "19500101000000Z",
-                .data = "19500101000000Z",
-                .time = -631152000LL,
-        },
-};
-
-struct rfc5280_time_test rfc5280_gentime_tests[] = {
-        {
-                /* Biggest RFC 5280 time */
-                .str = "99991231235959Z",
-                .data = "99991231235959Z",
-                .time = 253402300799LL,
-        },
-        {
-                .str = "21600218104000Z",
-                .data = "21600218104000Z",
-                .time = 6000000000LL,
-        },
-        {
-                /* Smallest RFC 5280 gen time */
-                .str = "20500101000000Z",
-                .data = "20500101000000Z",
-                .time =  2524608000LL,
-        },
-};
-struct rfc5280_time_test rfc5280_utctime_tests[] = {
-        {
-                .str = "500101000000Z",
-                .data = "500101000000Z",
-                .time = -631152000,
-        },
-        {
-                .str = "540226230640Z",
-                .data = "540226230640Z",
-                .time = -500000000,
-        },
-        {
-                .str = "491231235959Z",
-                .data = "491231235959Z",
-                .time = 2524607999LL,
-        },
-        {
-                .str = "700101000000Z",
-                .data = "700101000000Z",
-                .time = 0,
-        },
-        {
-                .str = "150923032700Z",
-                .data = "150923032700Z",
-                .time = 1442978820,
-        },
-        {
-                .str = "150923102700Z",
-                .data = "150923102700Z",
-                .time = 1443004020,
-        },
-        {
-                .str = "150922162712Z",
-                .data = "150922162712Z",
-                .time = 1442939232,
-        },
-        {
-                .str = "140524144512Z",
-                .data = "140524144512Z",
-                .time = 1400942712,
-        },
-        {
-                .str = "240401144512Z",
-                .data = "240401144512Z",
-                .time = 1711982712,
-        },
-};
-
-#define N_INVTIME_TESTS \
-    (sizeof(rfc5280_invtime_tests) / sizeof(*rfc5280_invtime_tests))
-#define N_GENTIME_TESTS \
-    (sizeof(rfc5280_gentime_tests) / sizeof(*rfc5280_gentime_tests))
-#define N_UTCTIME_TESTS \
-    (sizeof(rfc5280_utctime_tests) / sizeof(*rfc5280_utctime_tests))
-
-static int
-asn1_compare_str(int test_no, struct asn1_string_st *asn1str, const char *str)
-{
-        int length = strlen(str);
-
-        if (asn1str->length != length) {
-                fprintf(stderr, "FAIL: test %i - string lengths differ "
-                    "(%i != %i)\n", test_no, asn1str->length, length);
-                return (1);
-        }
-        if (strncmp(asn1str->data, str, length) != 0) {
-                fprintf(stderr, "FAIL: test %i - strings differ "
-                    "('%s' != '%s')\n", test_no, asn1str->data, str);
-                return (1);
-        }
-
-        return (0);
-}
-
-static int
-rfc5280_invtime_test(int test_no, struct rfc5280_time_test *att)
-{
-        ASN1_GENERALIZEDTIME *gt = NULL;
-        ASN1_UTCTIME *ut = NULL;
-        ASN1_TIME *t = NULL;
-        int failure = 1;
-        time_t now = time(NULL);
-
-        if ((gt = ASN1_GENERALIZEDTIME_new()) == NULL)
-                goto done;
-        if ((ut = ASN1_UTCTIME_new()) == NULL)
-                goto done;
-        if ((t = ASN1_TIME_new()) == NULL)
-                goto done;
-
-        if (ASN1_GENERALIZEDTIME_set_string(gt, att->str) != 0) {
-                if (X509_cmp_time(gt, &now) != 0) {
-                        fprintf(stderr, "FAIL: test %i - successfully parsed as GENTIME "
-                            "string '%s'\n", test_no, att->str);
-                        goto done;
-                }
-        }
-        if (ASN1_UTCTIME_set_string(ut, att->str) != 0) {
-                if (X509_cmp_time(ut, &now) != 0) {
-                        fprintf(stderr, "FAIL: test %i - successfully parsed as UTCTIME "
-                            "string '%s'\n", test_no, att->str);
-                        goto done;
-                }
-        }
-        if (ASN1_TIME_set_string(t, att->str) != 0) {
-                if (X509_cmp_time(t, &now) != 0) {
-                        fprintf(stderr, "FAIL: test %i - successfully parsed as UTCTIME "
-                            "string '%s'\n", test_no, att->str);
-                        goto done;
-                }
-        }
-
-        failure = 0;
-
- done:
-        ASN1_GENERALIZEDTIME_free(gt);
-        ASN1_UTCTIME_free(ut);
-        ASN1_TIME_free(t);
-
-        return (failure);
-}
-
-static int
-rfc5280_gentime_test(int test_no, struct rfc5280_time_test *att)
-{
-        unsigned char *p = NULL;
-        ASN1_GENERALIZEDTIME *gt;
-        int failure = 1;
-        int i;
-
-        if ((gt = ASN1_GENERALIZEDTIME_new()) == NULL)
-                goto done;
-
-        if (ASN1_GENERALIZEDTIME_set_string(gt, att->str) != 1) {
-                fprintf(stderr, "FAIL: test %i - failed to set string '%s'\n",
-                    test_no, att->str);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, gt, att->str) != 0)
-                goto done;
-
-        if ((i = X509_cmp_time(gt, &att->time)) != -1) {
-                fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n",
-                    test_no, i, att->time);
-                goto done;
-        }
-
-        att->time--;
-        if ((i = X509_cmp_time(gt, &att->time)) != 1) {
-                fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n",
-                    test_no, i, att->time);
-                goto done;
-        }
-        att->time++;
-
-        ASN1_GENERALIZEDTIME_free(gt);
-
-        if ((gt = ASN1_GENERALIZEDTIME_set(NULL, att->time)) == NULL) {
-                fprintf(stderr, "FAIL: test %i - failed to set time %lli\n",
-                    test_no, (long long)att->time);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, gt, att->data) != 0)
-                goto done;
-
-        failure = 0;
-
- done:
-        ASN1_GENERALIZEDTIME_free(gt);
-        free(p);
-
-        return (failure);
-}
-
-static int
-rfc5280_utctime_test(int test_no, struct rfc5280_time_test *att)
-{
-        unsigned char *p = NULL;
-        ASN1_UTCTIME *ut;
-        int failure = 1;
-        int i;
-
-        if ((ut = ASN1_UTCTIME_new()) == NULL)
-                goto done;
-
-        if (ASN1_UTCTIME_set_string(ut, att->str) != 1) {
-                fprintf(stderr, "FAIL: test %i - failed to set string '%s'\n",
-                    test_no, att->str);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, ut, att->str) != 0)
-                goto done;
-
-        if ((i = X509_cmp_time(ut, &att->time)) != -1) {
-                fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n",
-                    test_no, i, att->time);
-                goto done;
-        }
-
-        att->time--;
-        if ((i = X509_cmp_time(ut, &att->time)) != 1) {
-                fprintf(stderr, "FAIL: test %i - X509_cmp_time failed - returned %d compared to %lld\n",
-                    test_no, i, att->time);
-                goto done;
-        }
-        att->time++;
-
-        ASN1_UTCTIME_free(ut);
-
-        if ((ut = ASN1_UTCTIME_set(NULL, att->time)) == NULL) {
-                fprintf(stderr, "FAIL: test %i - failed to set time %lli\n",
-                    test_no, (long long)att->time);
-                goto done;
-        }
-        if (asn1_compare_str(test_no, ut, att->data) != 0)
-                goto done;
-
-        failure = 0;
-
- done:
-        ASN1_UTCTIME_free(ut);
-        free(p);
-
-        return (failure);
-}
-
-int
-main(int argc, char **argv)
-{
-        struct rfc5280_time_test *att;
-        int failed = 0;
-        size_t i;
-
-        fprintf(stderr, "RFC5280 Invalid time tests...\n");
-        for (i = 0; i < N_INVTIME_TESTS; i++) {
-                att = &rfc5280_invtime_tests[i];
-                failed |= rfc5280_invtime_test(i, att);
-        }
-
-        fprintf(stderr, "RFC5280 GENERALIZEDTIME tests...\n");
-        for (i = 0; i < N_GENTIME_TESTS; i++) {
-                att = &rfc5280_gentime_tests[i];
-                failed |= rfc5280_gentime_test(i, att);
-        }
-
-        fprintf(stderr, "RFC5280 UTCTIME tests...\n");
-        for (i = 0; i < N_UTCTIME_TESTS; i++) {
-                att = &rfc5280_utctime_tests[i];
-                failed |= rfc5280_utctime_test(i, att);
-        }
-        return (failed);
-}
diff --git a/src/regress/lib/libcrypto/base64/Makefile b/src/regress/lib/libcrypto/base64/Makefile
deleted file mode 100644
index 2cc004c530..0000000000
--- a/src/regress/lib/libcrypto/base64/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   base64test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/base64/base64test.c b/src/regress/lib/libcrypto/base64/base64test.c
deleted file mode 100644
index d6874d41f8..0000000000
--- a/src/regress/lib/libcrypto/base64/base64test.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*      $OpenBSD: base64test.c,v 1.5 2018/07/17 17:06:49 tb Exp $       */
-/*
- * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-
-#define BUF_SIZE 128
-
-struct base64_test {
-        const unsigned char in[BUF_SIZE];
-        const ssize_t in_len;
-        const unsigned char out[BUF_SIZE];
-        const ssize_t out_len;
-        const ssize_t valid_len;
-};
-
-/*
- * Many of these tests are based on those found in Go's encoding/base64 tests.
- */
-struct base64_test base64_tests[] = {
-
-        /* RFC3548 examples. */
-        { "\x14\xfb\x9c\x03\xd9\x7e", 6, "FPucA9l+", 8, 6, },
-        { "\x14\xfb\x9c\x03\xd9", 5, "FPucA9k=", 8, 5, },
-        { "\x14\xfb\x9c\x03", 4, "FPucAw==", 8, 4, },
-
-        /* RFC4648 examples. */
-        { "", 0, "", 0, 0, },
-        { "f", 1, "Zg==", 4, 1, },
-        { "fo", 2, "Zm8=", 4, 2, },
-        { "foo", 3, "Zm9v", 4, 3, },
-        { "foob", 4, "Zm9vYg==", 8, 4, },
-        { "fooba", 5, "Zm9vYmE=", 8, 5, },
-        { "foobar", 6, "Zm9vYmFy", 8, 6, },
-
-        /* Wikipedia examples. */
-        { "sure.", 5, "c3VyZS4=", 8, 5, },
-        { "sure", 4, "c3VyZQ==", 8, 4, },
-        { "sur", 3, "c3Vy", 4, 3, },
-        { "su", 2, "c3U=", 4, 2, },
-        { "leasure.", 8, "bGVhc3VyZS4=", 12, 8, },
-        { "easure.", 7, "ZWFzdXJlLg==", 12, 7, },
-        { "asure.", 6, "YXN1cmUu", 8, 6, },
-
-        { "abcd", 4, "YWJjZA==", 8, 4, },
-
-        {
-                "Twas brillig, and the slithy toves",
-                34,
-                "VHdhcyBicmlsbGlnLCBhbmQgdGhlIHNsaXRoeSB0b3Zlcw==",
-                48,
-                34,
-        },
-};
-
-#define N_TESTS (sizeof(base64_tests) / sizeof(*base64_tests))
-
-struct base64_test base64_nl_tests[] = {
-
-        /* Corrupt/invalid encodings. */
-        { "", -1, "", 0, 0, },
-        { "", -1, "!!!!", 4, 0, },
-        { "", -1, "====", 4, 0, },
-        { "", -1, "x===", 4, 0, },
-        { "", -1, "=AAA", 4, 0, },
-        { "", -1, "A=AA", 4, 0, },
-        { "", -1, "AA=A", 4, 0, },
-        { "", -1, "AA==A", 5, 0, },
-        { "", -1, "AAA=AAAA", 8, 0, },
-        { "", -1, "AAAAA", 5, 0, },
-        { "", -1, "AAAAAA", 6, 0, },
-        { "", -1, "A=", 2, 0, },
-        { "", -1, "A==", 3, 0, },
-        { "", -1, "AA=", 3, 0, },
-        { "", -1, "AA==", 4, 1, },              /* XXX - output ix 0x0. */
-        { "", -1, "AAA=", 4, 2, },              /* XXX - output ix 2x 0x0. */
-        { "", -1, "AAAA", 4, 3, },              /* XXX - output ix 3x 0x0. */
-        { "", -1, "AAAAAA=", 7, 0, },
-        { "", -1, "YWJjZA=====", 11, 0, },
-
-
-        /* Encodings with embedded CR/LF. */
-        { "sure", 4, "c3VyZQ==", 8, 4, },
-        { "sure", 4, "c3VyZQ==\r", 9, 4, },
-        { "sure", 4, "c3VyZQ==\n", 9, 4, },
-        { "sure", 4, "c3VyZQ==\r\n", 10, 4, },
-        { "sure", 4, "c3VyZ\r\nQ==", 10, 4, },
-        { "sure", 4, "c3V\ryZ\nQ==", 10, 4, },
-        { "sure", 4, "c3V\nyZ\rQ==", 10, 4, },
-        { "sure", 4, "c3VyZ\nQ==", 9, 4, },
-        { "sure", 4, "c3VyZQ\n==", 9, 4, },
-        { "sure", 4, "c3VyZQ=\n=", 9, 4, },
-        { "sure", 4, "c3VyZQ=\r\n\r\n=", 12, 4, },
-
-        {
-                "",
-                -1,
-                "YWJjZA======================================================"
-                "============",
-                74,
-                0,
-        },
-};
-
-#define N_NL_TESTS (sizeof(base64_nl_tests) / sizeof(*base64_nl_tests))
-
-struct base64_test base64_no_nl_tests[] = {
-
-        /*
-         * In non-newline mode, the output resulting from corrupt/invalid
-         * encodings is completely crazy. A number of zero bytes is returned
-         * rather than nothing.
-         */
-
-        /* Corrupt/invalid encodings. */
-        { "", -1, "", 0, 0, },
-        { "", -1, "!!!!", 4, 0, },
-        { "", -1, "====", 4, 1, },
-        { "", -1, "x===", 4, 1, },
-        { "", -1, "=AAA", 4, 3, },
-        { "", -1, "A=AA", 4, 3, },
-        { "", -1, "AA=A", 4, 3, },
-        { "", -1, "AA==A", 5, 1, },
-        { "", -1, "AAA=AAAA", 8, 6, },
-        { "", -1, "AAAAA", 5, 3, },
-        { "", -1, "AAAAAA", 6, 3, },
-        { "", -1, "A=", 2, 0, },
-        { "", -1, "A==", 3, 0, },
-        { "", -1, "AA=", 3, 0, },
-        { "", -1, "AA==", 4, 1, },
-        { "", -1, "AAA=", 4, 2, },
-        { "", -1, "AAAA", 4, 3, },
-        { "", -1, "AAAAAA=", 7, 3, },
-        { "", -1, "YWJjZA=====", 11, 4, },
-
-        /* Encodings with embedded CR/LF. */
-        { "sure", 4, "c3VyZQ==", 8, 4, },
-        { "sure", 4, "c3VyZQ==\r", 9, 4, },
-        { "sure", 4, "c3VyZQ==\n", 9, 4, },
-        { "sure", 4, "c3VyZQ==\r\n", 10, 4, },
-        { "sure", -1, "c3VyZ\r\nQ==", 10, 0, },
-        { "sure", -1, "c3V\ryZ\nQ==", 10, 0, },
-        { "sure", -1, "c3V\nyZ\rQ==", 10, 0, },
-        { "sure", -1, "c3VyZ\nQ==", 9, 0, },
-        { "sure", -1, "c3VyZQ\n==", 9, 0, },
-        { "sure", -1, "c3VyZQ=\n=", 9, 0, },
-        { "sure", -1, "c3VyZQ=\r\n\r\n=", 12, 0, },
-
-        /*
-         * This is invalid, yet results in 'abcd' followed by a stream of
-         * zero value bytes.
-         */
-        {
-                "",
-                -1,
-                "YWJjZA======================================================"
-                "============",
-                74,
-                52,
-        },
-};
-
-#define N_NO_NL_TESTS (sizeof(base64_no_nl_tests) / sizeof(*base64_no_nl_tests))
-
-static int
-base64_encoding_test(int test_no, struct base64_test *bt, int test_nl)
-{
-        BIO *bio_b64, *bio_mem;
-        unsigned char *buf, *out;
-        ssize_t i, len, b64len;
-        int failure = 0;
-
-        buf = malloc(BUF_SIZE);
-        if (buf == NULL)
-                errx(1, "malloc");
-
-        bio_b64 = BIO_new(BIO_f_base64());
-        if (bio_b64 == NULL)
-                errx(1, "BIO_new failed for BIO_f_base64");
-
-        bio_mem = BIO_new(BIO_s_mem());
-        if (bio_mem == NULL)
-                errx(1, "BIO_new failed for BIO_s_mem");
-
-        bio_mem = BIO_push(bio_b64, bio_mem);
-
-        if (!test_nl)
-                BIO_set_flags(bio_b64, BIO_FLAGS_BASE64_NO_NL);
-
-        len = BIO_write(bio_mem, bt->in, bt->in_len);
-        if (len != bt->in_len) {
-                fprintf(stderr, "FAIL: test %i - only wrote %zi out of %zi "
-                    "characters\n", test_no, len, bt->in_len);
-                failure = 1;
-                goto done;
-        }
-        if (BIO_flush(bio_mem) < 0) {
-                fprintf(stderr, "FAIL: test %i - flush failed\n", test_no);
-                failure = 1;
-                goto done;
-        }
-
-        b64len = 0;
-        for (i = 0; i < bt->out_len; i++) {
-                if (bt->out[i] == '\r' || bt->out[i] == '\n')
-                        continue;
-                buf[b64len++] = bt->out[i];
-        }
-        if (test_nl)
-                buf[b64len++] = '\n';
-
-        len = BIO_get_mem_data(bio_mem, &out);
-
-        /* An empty string with NL results in no output, rather than '\n'. */
-        if (test_nl && b64len == 1 && len == 0)
-                goto done;
-
-        if (len != b64len) {
-                fprintf(stderr, "FAIL: test %i - encoding resulted in %zi "
-                    "characters instead of %zi\n", test_no, len, b64len);
-                failure = 1;
-                goto done;
-        }
-
-        if (memcmp(buf, out, b64len) != 0) {
-                fprintf(stderr, "FAIL: test %i - encoding differs:\n", test_no);
-                fprintf(stderr, "  encoding: ");
-                for (i = 0; i < len; i++)
-                        fprintf(stderr, "%c", out[i]);
-                fprintf(stderr, "\n");
-                fprintf(stderr, " test data: ");
-                for (i = 0; i < bt->out_len; i++)
-                        fprintf(stderr, "%c", buf[i]);
-                fprintf(stderr, "\n");
-                failure = 1;
-        }
-
-done:
-        BIO_free_all(bio_mem);
-        free(buf);
-
-        return failure;
-}
-
-static int
-base64_decoding_test(int test_no, struct base64_test *bt, int test_nl)
-{
-        BIO *bio_b64, *bio_mem;
-        char *buf, *input;
-        ssize_t i, inlen, len;
-        int failure = 0;
-
-        buf = malloc(BUF_SIZE);
-        if (buf == NULL)
-                errx(1, "malloc");
-
-        input = (char *)bt->out;
-        inlen = bt->out_len;
-
-        if (test_nl)
-                inlen = asprintf(&input, "%s\r\n", bt->out);
-
-        bio_mem = BIO_new_mem_buf(input, inlen);
-        if (bio_mem == NULL)
-                errx(1, "BIO_new_mem_buf failed");
-
-        bio_b64 = BIO_new(BIO_f_base64());
-        if (bio_b64 == NULL)
-                errx(1, "BIO_new failed for BIO_f_base64");
-
-        if (!test_nl)
-                BIO_set_flags(bio_b64, BIO_FLAGS_BASE64_NO_NL);
-
-        bio_mem = BIO_push(bio_b64, bio_mem);
-
-        /*
-         * If we wrote zero characters then a BIO_read will result in a return
-         * value of -1, hence we need to handle this case.
-         */
-        len = BIO_read(bio_mem, buf, BUF_SIZE);
-        if (len != bt->valid_len && (bt->in_len != 0 || len != -1)) {
-                fprintf(stderr, "FAIL: test %i - decoding resulted in %zi "
-                    "characters instead of %zi\n", test_no, len, bt->valid_len);
-                fprintf(stderr, "  input: ");
-                for (i = 0; i < inlen; i++)
-                        fprintf(stderr, "%c", input[i]);
-                fprintf(stderr, "\n");
-                fprintf(stderr, "  decoding: ");
-                for (i = 0; i < len; i++)
-                        fprintf(stderr, "0x%x ", buf[i]);
-                fprintf(stderr, "\n");
-                failure = 1;
-                goto done;
-        }
-
-        /* See if we expect this to fail decoding. */
-        if (bt->in_len == -1)
-                goto done;
-
-        if (memcmp(bt->in, buf, bt->in_len) != 0) {
-                fprintf(stderr, "FAIL: test %i - decoding differs:\n", test_no);
-                fprintf(stderr, "  decoding: ");
-                for (i = 0; i < len; i++)
-                        fprintf(stderr, "0x%x ", buf[i]);
-                fprintf(stderr, "\n");
-                fprintf(stderr, " test data: ");
-                for (i = 0; i < inlen; i++)
-                        fprintf(stderr, "0x%x ", input[i]);
-                fprintf(stderr, "\n");
-                failure = 1;
-        }
-
-done:
-        BIO_free_all(bio_mem);
-        free(buf);
-        if (test_nl)
-                free(input);
-
-        return failure;
-}
-
-int
-main(int argc, char **argv)
-{
-        struct base64_test *bt;
-        int failed = 0;
-        size_t i;
-
-        fprintf(stderr, "Starting combined tests...\n");
-
-        for (i = 0; i < N_TESTS; i++) {
-                bt = &base64_tests[i];
-                if (bt->in_len != -1)
-                        failed += base64_encoding_test(i, bt, 0);
-                if (bt->out_len != -1)
-                        failed += base64_decoding_test(i, bt, 0);
-                if (bt->in_len != -1)
-                        failed += base64_encoding_test(i, bt, 1);
-                if (bt->out_len != -1)
-                        failed += base64_decoding_test(i, bt, 1);
-        }
-
-        fprintf(stderr, "Starting NL tests...\n");
-
-        for (i = 0; i < N_NL_TESTS; i++) {
-                bt = &base64_nl_tests[i];
-
-                if (bt->in_len != -1)
-                        failed += base64_encoding_test(i, bt, 1);
-                if (bt->out_len != -1)
-                        failed += base64_decoding_test(i, bt, 1);
-        }
-
-        fprintf(stderr, "Starting NO NL tests...\n");
-
-        for (i = 0; i < N_NO_NL_TESTS; i++) {
-                bt = &base64_no_nl_tests[i];
-
-                if (bt->in_len != -1)
-                        failed += base64_encoding_test(i, bt, 0);
-                if (bt->out_len != -1)
-                        failed += base64_decoding_test(i, bt, 0);
-        }
-
-        return failed;
-}
diff --git a/src/regress/lib/libcrypto/bf/Makefile b/src/regress/lib/libcrypto/bf/Makefile
deleted file mode 100644
index 989b3bb8f4..0000000000
--- a/src/regress/lib/libcrypto/bf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   bftest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bf/bftest.c b/src/regress/lib/libcrypto/bf/bftest.c
deleted file mode 100644
index 5239ffb250..0000000000
--- a/src/regress/lib/libcrypto/bf/bftest.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*      $OpenBSD: bftest.c,v 1.3 2018/07/17 17:06:49 tb Exp $   */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* This has been a quickly hacked 'ideatest.c'.  When I add tests for other
- * RC2 modes, more of the code will be uncommented. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/blowfish.h>
-
-static char *bf_key[2]={
-        "abcdefghijklmnopqrstuvwxyz",
-        "Who is John Galt?"
-        };
-
-/* big endian */
-static BF_LONG bf_plain[2][2]={
-        {0x424c4f57L,0x46495348L},
-        {0xfedcba98L,0x76543210L}
-        };
-
-static BF_LONG bf_cipher[2][2]={
-        {0x324ed0feL,0xf413a203L},
-        {0xcc91732bL,0x8022f684L}
-        };
-/************/
-
-/* Lets use the DES test vectors :-) */
-#define NUM_TESTS 34
-static unsigned char ecb_data[NUM_TESTS][8]={
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10},
-        {0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57},
-        {0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E},
-        {0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86},
-        {0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E},
-        {0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6},
-        {0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE},
-        {0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6},
-        {0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE},
-        {0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16},
-        {0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F},
-        {0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46},
-        {0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E},
-        {0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76},
-        {0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07},
-        {0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F},
-        {0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7},
-        {0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF},
-        {0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6},
-        {0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF},
-        {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
-        {0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
-        {0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10}};
-
-static unsigned char plain_data[NUM_TESTS][8]={
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
-        {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-        {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42},
-        {0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA},
-        {0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72},
-        {0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A},
-        {0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2},
-        {0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A},
-        {0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2},
-        {0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A},
-        {0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02},
-        {0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A},
-        {0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32},
-        {0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA},
-        {0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62},
-        {0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2},
-        {0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA},
-        {0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92},
-        {0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A},
-        {0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2},
-        {0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}};
-
-static unsigned char cipher_data[NUM_TESTS][8]={
-        {0x4E,0xF9,0x97,0x45,0x61,0x98,0xDD,0x78},
-        {0x51,0x86,0x6F,0xD5,0xB8,0x5E,0xCB,0x8A},
-        {0x7D,0x85,0x6F,0x9A,0x61,0x30,0x63,0xF2},
-        {0x24,0x66,0xDD,0x87,0x8B,0x96,0x3C,0x9D},
-        {0x61,0xF9,0xC3,0x80,0x22,0x81,0xB0,0x96},
-        {0x7D,0x0C,0xC6,0x30,0xAF,0xDA,0x1E,0xC7},
-        {0x4E,0xF9,0x97,0x45,0x61,0x98,0xDD,0x78},
-        {0x0A,0xCE,0xAB,0x0F,0xC6,0xA0,0xA2,0x8D},
-        {0x59,0xC6,0x82,0x45,0xEB,0x05,0x28,0x2B},
-        {0xB1,0xB8,0xCC,0x0B,0x25,0x0F,0x09,0xA0},
-        {0x17,0x30,0xE5,0x77,0x8B,0xEA,0x1D,0xA4},
-        {0xA2,0x5E,0x78,0x56,0xCF,0x26,0x51,0xEB},
-        {0x35,0x38,0x82,0xB1,0x09,0xCE,0x8F,0x1A},
-        {0x48,0xF4,0xD0,0x88,0x4C,0x37,0x99,0x18},
-        {0x43,0x21,0x93,0xB7,0x89,0x51,0xFC,0x98},
-        {0x13,0xF0,0x41,0x54,0xD6,0x9D,0x1A,0xE5},
-        {0x2E,0xED,0xDA,0x93,0xFF,0xD3,0x9C,0x79},
-        {0xD8,0x87,0xE0,0x39,0x3C,0x2D,0xA6,0xE3},
-        {0x5F,0x99,0xD0,0x4F,0x5B,0x16,0x39,0x69},
-        {0x4A,0x05,0x7A,0x3B,0x24,0xD3,0x97,0x7B},
-        {0x45,0x20,0x31,0xC1,0xE4,0xFA,0xDA,0x8E},
-        {0x75,0x55,0xAE,0x39,0xF5,0x9B,0x87,0xBD},
-        {0x53,0xC5,0x5F,0x9C,0xB4,0x9F,0xC0,0x19},
-        {0x7A,0x8E,0x7B,0xFA,0x93,0x7E,0x89,0xA3},
-        {0xCF,0x9C,0x5D,0x7A,0x49,0x86,0xAD,0xB5},
-        {0xD1,0xAB,0xB2,0x90,0x65,0x8B,0xC7,0x78},
-        {0x55,0xCB,0x37,0x74,0xD1,0x3E,0xF2,0x01},
-        {0xFA,0x34,0xEC,0x48,0x47,0xB2,0x68,0xB2},
-        {0xA7,0x90,0x79,0x51,0x08,0xEA,0x3C,0xAE},
-        {0xC3,0x9E,0x07,0x2D,0x9F,0xAC,0x63,0x1D},
-        {0x01,0x49,0x33,0xE0,0xCD,0xAF,0xF6,0xE4},
-        {0xF2,0x1E,0x9A,0x77,0xB7,0x1C,0x49,0xBC},
-        {0x24,0x59,0x46,0x88,0x57,0x54,0x36,0x9A},
-        {0x6B,0x5C,0x5A,0x9C,0x5D,0x9E,0x0A,0x5A},
-        };
-
-static unsigned char cbc_key [16]={
-        0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
-        0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87};
-static unsigned char cbc_iv [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
-static char cbc_data[40]="7654321 Now is the time for ";
-static unsigned char cbc_ok[32]={
-        0x6B,0x77,0xB4,0xD6,0x30,0x06,0xDE,0xE6,
-        0x05,0xB1,0x56,0xE2,0x74,0x03,0x97,0x93,
-        0x58,0xDE,0xB9,0xE7,0x15,0x46,0x16,0xD9,
-        0x59,0xF1,0x65,0x2B,0xD5,0xFF,0x92,0xCC};
-
-static unsigned char cfb64_ok[]={
-        0xE7,0x32,0x14,0xA2,0x82,0x21,0x39,0xCA,
-        0xF2,0x6E,0xCF,0x6D,0x2E,0xB9,0xE7,0x6E,
-        0x3D,0xA3,0xDE,0x04,0xD1,0x51,0x72,0x00,
-        0x51,0x9D,0x57,0xA6,0xC3};
-
-static unsigned char ofb64_ok[]={
-        0xE7,0x32,0x14,0xA2,0x82,0x21,0x39,0xCA,
-        0x62,0xB3,0x43,0xCC,0x5B,0x65,0x58,0x73,
-        0x10,0xDD,0x90,0x8D,0x0C,0x24,0x1B,0x22,
-        0x63,0xC2,0xCF,0x80,0xDA};
-
-#define KEY_TEST_NUM    25
-static unsigned char key_test[KEY_TEST_NUM]={
-        0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87,
-        0x78,0x69,0x5a,0x4b,0x3c,0x2d,0x1e,0x0f,
-        0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
-        0x88};
-
-static unsigned char key_data[8]=
-        {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10};
-
-static unsigned char key_out[KEY_TEST_NUM][8]={
-        {0xF9,0xAD,0x59,0x7C,0x49,0xDB,0x00,0x5E},
-        {0xE9,0x1D,0x21,0xC1,0xD9,0x61,0xA6,0xD6},
-        {0xE9,0xC2,0xB7,0x0A,0x1B,0xC6,0x5C,0xF3},
-        {0xBE,0x1E,0x63,0x94,0x08,0x64,0x0F,0x05},
-        {0xB3,0x9E,0x44,0x48,0x1B,0xDB,0x1E,0x6E},
-        {0x94,0x57,0xAA,0x83,0xB1,0x92,0x8C,0x0D},
-        {0x8B,0xB7,0x70,0x32,0xF9,0x60,0x62,0x9D},
-        {0xE8,0x7A,0x24,0x4E,0x2C,0xC8,0x5E,0x82},
-        {0x15,0x75,0x0E,0x7A,0x4F,0x4E,0xC5,0x77},
-        {0x12,0x2B,0xA7,0x0B,0x3A,0xB6,0x4A,0xE0},
-        {0x3A,0x83,0x3C,0x9A,0xFF,0xC5,0x37,0xF6},
-        {0x94,0x09,0xDA,0x87,0xA9,0x0F,0x6B,0xF2},
-        {0x88,0x4F,0x80,0x62,0x50,0x60,0xB8,0xB4},
-        {0x1F,0x85,0x03,0x1C,0x19,0xE1,0x19,0x68},
-        {0x79,0xD9,0x37,0x3A,0x71,0x4C,0xA3,0x4F},
-        {0x93,0x14,0x28,0x87,0xEE,0x3B,0xE1,0x5C},
-        {0x03,0x42,0x9E,0x83,0x8C,0xE2,0xD1,0x4B},
-        {0xA4,0x29,0x9E,0x27,0x46,0x9F,0xF6,0x7B},
-        {0xAF,0xD5,0xAE,0xD1,0xC1,0xBC,0x96,0xA8},
-        {0x10,0x85,0x1C,0x0E,0x38,0x58,0xDA,0x9F},
-        {0xE6,0xF5,0x1E,0xD7,0x9B,0x9D,0xB2,0x1F},
-        {0x64,0xA6,0xE1,0x4A,0xFD,0x36,0xB4,0x6F},
-        {0x80,0xC7,0xD7,0xD4,0x5A,0x54,0x79,0xAD},
-        {0x05,0x04,0x4B,0x62,0xFA,0x52,0xD0,0x80},
-        };
-
-static int test(void );
-static int print_test_data(void );
-int main(int argc, char *argv[])
-        {
-        int ret;
-
-        if (argc > 1)
-                ret=print_test_data();
-        else
-                ret=test();
-
-        return ret;
-        }
-
-static int print_test_data(void)
-        {
-        unsigned int i,j;
-
-        printf("ecb test data\n");
-        printf("key bytes\t\tclear bytes\t\tcipher bytes\n");
-        for (i=0; i<NUM_TESTS; i++)
-                {
-                for (j=0; j<8; j++)
-                        printf("%02X",ecb_data[i][j]);
-                printf("\t");
-                for (j=0; j<8; j++)
-                        printf("%02X",plain_data[i][j]);
-                printf("\t");
-                for (j=0; j<8; j++)
-                        printf("%02X",cipher_data[i][j]);
-                printf("\n");
-                }
-
-        printf("set_key test data\n");
-        printf("data[8]= ");
-        for (j=0; j<8; j++)
-                printf("%02X",key_data[j]);
-        printf("\n");
-        for (i=0; i<KEY_TEST_NUM-1; i++)
-                {
-                printf("c=");
-                for (j=0; j<8; j++)
-                        printf("%02X",key_out[i][j]);
-                printf(" k[%2u]=",i+1);
-                for (j=0; j<i+1; j++)
-                        printf("%02X",key_test[j]);
-                printf("\n");
-                }
-
-        printf("\nchaining mode test data\n");
-        printf("key[16]   = ");
-        for (j=0; j<16; j++)
-                printf("%02X",cbc_key[j]);
-        printf("\niv[8]     = ");
-        for (j=0; j<8; j++)
-                printf("%02X",cbc_iv[j]);
-        printf("\ndata[%d]  = '%s'",(int)strlen(cbc_data)+1,cbc_data);
-        printf("\ndata[%d]  = ",(int)strlen(cbc_data)+1);
-        for (j=0; j<strlen(cbc_data)+1; j++)
-                printf("%02X",cbc_data[j]);
-        printf("\n");
-        printf("cbc cipher text\n");
-        printf("cipher[%d]= ",32);
-        for (j=0; j<32; j++)
-                printf("%02X",cbc_ok[j]);
-        printf("\n");
-
-        printf("cfb64 cipher text\n");
-        printf("cipher[%d]= ",(int)strlen(cbc_data)+1);
-        for (j=0; j<strlen(cbc_data)+1; j++)
-                printf("%02X",cfb64_ok[j]);
-        printf("\n");
-
-        printf("ofb64 cipher text\n");
-        printf("cipher[%d]= ",(int)strlen(cbc_data)+1);
-        for (j=0; j<strlen(cbc_data)+1; j++)
-                printf("%02X",ofb64_ok[j]);
-        printf("\n");
-        return(0);
-        }
-
-static int test(void)
-        {
-        unsigned char cbc_in[40],cbc_out[40],iv[8];
-        int i,n,err=0;
-        BF_KEY key;
-        BF_LONG data[2]; 
-        unsigned char out[8]; 
-        BF_LONG len;
-
-        printf("testing blowfish in raw ecb mode\n");
-        for (n=0; n<2; n++)
-                {
-                BF_set_key(&key,strlen(bf_key[n]),(unsigned char *)bf_key[n]);
-
-                data[0]=bf_plain[n][0];
-                data[1]=bf_plain[n][1];
-                BF_encrypt(data,&key);
-                if (memcmp(&(bf_cipher[n][0]),&(data[0]), sizeof data) != 0)
-                        {
-                        printf("BF_encrypt error encrypting\n");
-                        printf("got     :");
-                        for (i=0; i<2; i++)
-                                printf("%08lX ",(unsigned long)data[i]);
-                        printf("\n");
-                        printf("expected:");
-                        for (i=0; i<2; i++)
-                                printf("%08lX ",(unsigned long)bf_cipher[n][i]);
-                        err=1;
-                        printf("\n");
-                        }
-
-                BF_decrypt(&(data[0]),&key);
-                if (memcmp(&(bf_plain[n][0]),&(data[0]),8) != 0)
-                        {
-                        printf("BF_encrypt error decrypting\n");
-                        printf("got     :");
-                        for (i=0; i<2; i++)
-                                printf("%08lX ",(unsigned long)data[i]);
-                        printf("\n");
-                        printf("expected:");
-                        for (i=0; i<2; i++)
-                                printf("%08lX ",(unsigned long)bf_plain[n][i]);
-                        printf("\n");
-                        err=1;
-                        }
-                }
-
-        printf("testing blowfish in ecb mode\n");
-
-        for (n=0; n<NUM_TESTS; n++)
-                {
-                BF_set_key(&key,8,ecb_data[n]);
-
-                BF_ecb_encrypt(&(plain_data[n][0]),out,&key,BF_ENCRYPT);
-                if (memcmp(&(cipher_data[n][0]),out,8) != 0)
-                        {
-                        printf("BF_ecb_encrypt blowfish error encrypting\n");
-                        printf("got     :");
-                        for (i=0; i<8; i++)
-                                printf("%02X ",out[i]);
-                        printf("\n");
-                        printf("expected:");
-                        for (i=0; i<8; i++)
-                                printf("%02X ",cipher_data[n][i]);
-                        err=1;
-                        printf("\n");
-                        }
-
-                BF_ecb_encrypt(out,out,&key,BF_DECRYPT);
-                if (memcmp(&(plain_data[n][0]),out,8) != 0)
-                        {
-                        printf("BF_ecb_encrypt error decrypting\n");
-                        printf("got     :");
-                        for (i=0; i<8; i++)
-                                printf("%02X ",out[i]);
-                        printf("\n");
-                        printf("expected:");
-                        for (i=0; i<8; i++)
-                                printf("%02X ",plain_data[n][i]);
-                        printf("\n");
-                        err=1;
-                        }
-                }
-
-        printf("testing blowfish set_key\n");
-        for (n=1; n<KEY_TEST_NUM; n++)
-                {
-                BF_set_key(&key,n,key_test);
-                BF_ecb_encrypt(key_data,out,&key,BF_ENCRYPT);
-                if (memcmp(out,&(key_out[n-1][0]),8) != 0)
-                        {
-                        printf("blowfish setkey error\n");
-                        err=1;
-                        }
-                }
-
-        printf("testing blowfish in cbc mode\n");
-        len=strlen(cbc_data)+1;
-
-        BF_set_key(&key,16,cbc_key);
-        memset(cbc_in,0,sizeof cbc_in);
-        memset(cbc_out,0,sizeof cbc_out);
-        memcpy(iv,cbc_iv,sizeof iv);
-        BF_cbc_encrypt((unsigned char *)cbc_data,cbc_out,len,
-                &key,iv,BF_ENCRYPT);
-        if (memcmp(cbc_out,cbc_ok,32) != 0)
-                {
-                err=1;
-                printf("BF_cbc_encrypt encrypt error\n");
-                for (i=0; i<32; i++) printf("0x%02X,",cbc_out[i]);
-                }
-        memcpy(iv,cbc_iv,8);
-        BF_cbc_encrypt(cbc_out,cbc_in,len,
-                &key,iv,BF_DECRYPT);
-        if (memcmp(cbc_in,cbc_data,strlen(cbc_data)+1) != 0)
-                {
-                printf("BF_cbc_encrypt decrypt error\n");
-                err=1;
-                }
-
-        printf("testing blowfish in cfb64 mode\n");
-
-        BF_set_key(&key,16,cbc_key);
-        memset(cbc_in,0,40);
-        memset(cbc_out,0,40);
-        memcpy(iv,cbc_iv,8);
-        n=0;
-        BF_cfb64_encrypt((unsigned char *)cbc_data,cbc_out,(long)13,
-                &key,iv,&n,BF_ENCRYPT);
-        BF_cfb64_encrypt((unsigned char *)&(cbc_data[13]),&(cbc_out[13]),len-13,
-                &key,iv,&n,BF_ENCRYPT);
-        if (memcmp(cbc_out,cfb64_ok,(int)len) != 0)
-                {
-                err=1;
-                printf("BF_cfb64_encrypt encrypt error\n");
-                for (i=0; i<(int)len; i++) printf("0x%02X,",cbc_out[i]);
-                }
-        n=0;
-        memcpy(iv,cbc_iv,8);
-        BF_cfb64_encrypt(cbc_out,cbc_in,17,
-                &key,iv,&n,BF_DECRYPT);
-        BF_cfb64_encrypt(&(cbc_out[17]),&(cbc_in[17]),len-17,
-                &key,iv,&n,BF_DECRYPT);
-        if (memcmp(cbc_in,cbc_data,(int)len) != 0)
-                {
-                printf("BF_cfb64_encrypt decrypt error\n");
-                err=1;
-                }
-
-        printf("testing blowfish in ofb64\n");
-
-        BF_set_key(&key,16,cbc_key);
-        memset(cbc_in,0,40);
-        memset(cbc_out,0,40);
-        memcpy(iv,cbc_iv,8);
-        n=0;
-        BF_ofb64_encrypt((unsigned char *)cbc_data,cbc_out,(long)13,&key,iv,&n);
-        BF_ofb64_encrypt((unsigned char *)&(cbc_data[13]),
-                &(cbc_out[13]),len-13,&key,iv,&n);
-        if (memcmp(cbc_out,ofb64_ok,(int)len) != 0)
-                {
-                err=1;
-                printf("BF_ofb64_encrypt encrypt error\n");
-                for (i=0; i<(int)len; i++) printf("0x%02X,",cbc_out[i]);
-                }
-        n=0;
-        memcpy(iv,cbc_iv,8);
-        BF_ofb64_encrypt(cbc_out,cbc_in,17,&key,iv,&n);
-        BF_ofb64_encrypt(&(cbc_out[17]),&(cbc_in[17]),len-17,&key,iv,&n);
-        if (memcmp(cbc_in,cbc_data,(int)len) != 0)
-                {
-                printf("BF_ofb64_encrypt decrypt error\n");
-                err=1;
-                }
-
-        return(err);
-        }
diff --git a/src/regress/lib/libcrypto/bio/Makefile b/src/regress/lib/libcrypto/bio/Makefile
deleted file mode 100644
index fab7d44d50..0000000000
--- a/src/regress/lib/libcrypto/bio/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   biotest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bio/biotest.c b/src/regress/lib/libcrypto/bio/biotest.c
deleted file mode 100644
index 867305a904..0000000000
--- a/src/regress/lib/libcrypto/bio/biotest.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*      $OpenBSD: biotest.c,v 1.6 2017/04/30 17:46:27 beck Exp $        */
-/*
- * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <netinet/in.h>
-
-#include <openssl/bio.h>
-#include <openssl/err.h>
-
-struct bio_get_host_ip_test {
-        char *input;
-        uint32_t ip;
-        int ret;
-};
-
-struct bio_get_host_ip_test bio_get_host_ip_tests[] = {
-        {"", 0, 0},
-        {".", 0, 0},
-        {"1", 0, 0},
-        {"1.2", 0, 0},
-        {"1.2.3", 0, 0},
-        {"1.2.3.", 0, 0},
-        {"1.2.3.4", 0x01020304, 1},
-        {"1.2.3.256", 0, 0},
-        {"1:2:3::4", 0, 0},
-        {"0.0.0.0", INADDR_ANY, 1},
-        {"127.0.0.1", INADDR_LOOPBACK, 1},
-        {"localhost", INADDR_LOOPBACK, 1},
-        {"255.255.255.255", INADDR_BROADCAST, 1},
-        {"0xff.0xff.0xff.0xff", 0, 0},
-};
-
-#define N_BIO_GET_IP_TESTS \
-    (sizeof(bio_get_host_ip_tests) / sizeof(*bio_get_host_ip_tests))
-
-struct bio_get_port_test {
-        char *input;
-        unsigned short port;
-        int ret;
-};
-
-struct bio_get_port_test bio_get_port_tests[] = {
-        {NULL, 0, 0},
-        {"", 0, 0},
-        {"-1", 0, 0},
-        {"0", 0, 1},
-        {"1", 1, 1},
-        {"12345", 12345, 1},
-        {"65535", 65535, 1},
-        {"65536", 0, 0},
-        {"999999999999", 0, 0},
-        {"xyzzy", 0, 0},
-        {"https", 443, 1},
-        {"imaps", 993, 1},
-        {"telnet", 23, 1},
-};
-
-#define N_BIO_GET_PORT_TESTS \
-    (sizeof(bio_get_port_tests) / sizeof(*bio_get_port_tests))
-
-static int
-do_bio_get_host_ip_tests(void)
-{
-        struct bio_get_host_ip_test *bgit;
-        union {
-                unsigned char c[4];
-                uint32_t i;
-        } ip;
-        int failed = 0;
-        size_t i;
-        int ret;
-
-        for (i = 0; i < N_BIO_GET_IP_TESTS; i++) {
-                bgit = &bio_get_host_ip_tests[i];
-                memset(&ip, 0, sizeof(ip));
-
-                ret = BIO_get_host_ip(bgit->input, ip.c);
-                if (ret != bgit->ret) {
-                        fprintf(stderr, "FAIL: test %zi (\"%s\") %s, want %s\n",
-                            i, bgit->input, ret ? "success" : "failure",
-                            bgit->ret ? "success" : "failure");
-                        failed = 1;
-                        continue;
-                }
-                if (ret && ntohl(ip.i) != bgit->ip) {
-                        fprintf(stderr, "FAIL: test %zi (\"%s\") returned ip "
-                            "%x != %x\n", i, bgit->input,
-                            ntohl(ip.i), bgit->ip);
-                        failed = 1;
-                }
-        }
-
-        return failed;
-}
-
-static int
-do_bio_get_port_tests(void)
-{
-        struct bio_get_port_test *bgpt;
-        unsigned short port;
-        int failed = 0;
-        size_t i;
-        int ret;
-
-        for (i = 0; i < N_BIO_GET_PORT_TESTS; i++) {
-                bgpt = &bio_get_port_tests[i];
-                port = 0;
-
-                ret = BIO_get_port(bgpt->input, &port);
-                if (ret != bgpt->ret) {
-                        fprintf(stderr, "FAIL: test %zi (\"%s\") %s, want %s\n",
-                            i, bgpt->input, ret ? "success" : "failure",
-                            bgpt->ret ? "success" : "failure");
-                        failed = 1;
-                        continue;
-                }
-                if (ret && port != bgpt->port) {
-                        fprintf(stderr, "FAIL: test %zi (\"%s\") returned port "
-                            "%u != %u\n", i, bgpt->input, port, bgpt->port);
-                        failed = 1;
-                }
-        }
-
-        return failed;
-}
-
-int
-main(int argc, char **argv)
-{
-        int ret = 0;
-
-        ret |= do_bio_get_host_ip_tests();
-        ret |= do_bio_get_port_tests();
-
-        return (ret);
-}
diff --git a/src/regress/lib/libcrypto/bn/Makefile b/src/regress/lib/libcrypto/bn/Makefile
deleted file mode 100644
index ed9298575b..0000000000
--- a/src/regress/lib/libcrypto/bn/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#       $OpenBSD: Makefile,v 1.6 2018/11/06 06:56:17 tb Exp $
-
-SUBDIR= \
-        addsub \
-        general \
-        mont \
-        rand
-
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libcrypto/bn/addsub/Makefile b/src/regress/lib/libcrypto/bn/addsub/Makefile
deleted file mode 100644
index c35182db4f..0000000000
--- a/src/regress/lib/libcrypto/bn/addsub/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2018/07/10 16:57:50 tb Exp $
-
-.include "../../Makefile.inc"
-
-PROG=           bnaddsub
-LDADD=          ${CRYPTO_INT}
-DPADD=          ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/addsub/bnaddsub.c b/src/regress/lib/libcrypto/bn/addsub/bnaddsub.c
deleted file mode 100644
index e23821ed2b..0000000000
--- a/src/regress/lib/libcrypto/bn/addsub/bnaddsub.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*      $OpenBSD: bnaddsub.c,v 1.3 2018/07/23 17:15:21 tb Exp $ */
-/*
- * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Test basic functionality of BN_add(), BN_sub(), BN_uadd() and BN_usub() */
-
-#include <err.h>
-#include <stdio.h>
-
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-
-#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
-
-BIO *bio_err;
-
-struct hexinput_st {
-        const char      *a_hex;
-        const char      *b_hex;
-        const char      *e_hex;         /* expected result */
-        const char       ret;           /* check return value */
-        int              compare;       /* use BN_cmp() to verify results */
-};
-
-int bn_op_test(int (*)(BIGNUM *, const BIGNUM *, const BIGNUM *),
-    struct hexinput_st[], unsigned int, const char *);
-void print_failure_case(BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, int,
-    const char *);
-
-struct hexinput_st test_bn_add[] = {
-        {
-                "F",
-                "F",
-                "1E",
-                1,
-                1,
-        },
-        {
-                "FFFFFFFFFFFFFFFFFFF",
-                "1",
-                "10000000000000000000",
-                1,
-                1,
-        },
-        {
-                "7878787878787878",
-                "1010101010101010",
-                "8888888888888888",
-                1,
-                1,
-        },
-        {
-                "FFFFFFFFFFFFFFFF0000000000000000",
-                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
-                "1FFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
-                1,
-                1,
-        },
-        {
-                "F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0",
-                "10101010101010101010101010101010",
-                "101010101010101010101010101010100",
-                1,
-                1,
-        },
-};
-
-struct hexinput_st test_bn_sub[] = {
-        {
-                "10",
-                "1",
-                "F",
-                1,
-                1,
-        },
-        {
-                "10",
-                "1",
-                "E",
-                1,
-                0,
-        },
-        {
-                "100000000001000000000",
-                "11100000001",
-                "FFFFFFFFFEFEFFFFFFFF",
-                1,
-                1,
-        },
-        {
-                "-FFFFFFFFFFFFFFFFFFFF",
-                "1",
-                "-100000000000000000000",
-                1,
-                1,
-        },
-};
-
-struct hexinput_st test_bn_usub[] = {
-        {
-                "10",
-                "1",
-                "F",
-                1,
-                1,
-        },
-        {
-                "10",
-                "1",
-                "E",
-                1,
-                0,
-        },
-        {
-                "100000000001000000000",
-                "11100000001",
-                "FFFFFFFFFEFEFFFFFFFF",
-                1,
-                1,
-        },
-        {
-                "100000000000000000000",
-                "1",
-                "FFFFFFFFFFFFFFFFFFFF",
-                1,
-                1,
-        },
-        {
-                "0",
-                "1",
-                "0",
-                0,
-                0,
-        },
-};
-
-void
-print_failure_case(BIGNUM *a, BIGNUM *b, BIGNUM *e, BIGNUM *r, int i,
-    const char *testname)
-{
-        BIO_printf(bio_err, "%s #%d failed:", testname, i);
-        BIO_printf(bio_err, "\na = ");
-        BN_print(bio_err, a);
-        BIO_printf(bio_err, "\nb = ");
-        BN_print(bio_err, b);
-        BIO_printf(bio_err, "\nexpected: e = ");
-        BN_print(bio_err, e);
-        BIO_printf(bio_err, "\nobtained: r = ");
-        BN_print(bio_err, r);
-        BIO_printf(bio_err, "\n");
-}
-
-int
-bn_op_test(int (*bn_op)(BIGNUM *, const BIGNUM *, const BIGNUM *),
-    struct hexinput_st tests[], unsigned int ntests, const char *testname)
-{
-        BIGNUM          *a = NULL, *b = NULL, *e = NULL, *r = NULL;
-        unsigned int     i;
-        int              failed = 0;
-
-        if (((a = BN_new()) == NULL) ||
-            ((b = BN_new()) == NULL) ||
-            ((e = BN_new()) == NULL) ||
-            ((r = BN_new()) == NULL)) {
-                failed = 1;
-                ERR_print_errors(bio_err);
-                goto err;
-        }
-
-        for (i = 0; i < ntests; i++) {
-                int print = 0;
-
-                if (!BN_hex2bn(&a, tests[i].a_hex) ||
-                    !BN_hex2bn(&b, tests[i].b_hex) ||
-                    !BN_hex2bn(&e, tests[i].e_hex)) {
-                        print = 1;
-                        ERR_print_errors(bio_err);
-                }
-
-                if (tests[i].ret != bn_op(r, a, b))
-                        print = 1;
-                if (tests[i].compare == 1 && BN_cmp(e, r) != 0)
-                        print = 1;
-                if (print) {
-                        failed = 1;
-                        print_failure_case(a, b, e, r, i, testname);
-                }
-        }
-
- err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(e);
-        BN_free(r);
-        return failed;
-}
-
-int
-main(int argc, char *argv[])
-{
-        int failed = 0;
-
-        if ((bio_err = BIO_new_fp(stderr, BIO_NOCLOSE)) == NULL) {
-                fprintf(stderr, "bnaddsub: failed to initialize bio_err");
-                return 1;
-        }
-
-        if (bn_op_test(BN_add, test_bn_add, nitems(test_bn_add),
-            "BN_add with test_bn_add[]"))
-                failed = 1;
-        if (bn_op_test(BN_uadd, test_bn_add, nitems(test_bn_add),
-            "BN_uadd with test_bn_add[]"))
-                failed = 1;
-        if (bn_op_test(BN_sub, test_bn_sub, nitems(test_bn_sub),
-            "BN_sub with test_bn_sub[]"))
-                failed = 1;
-        if (bn_op_test(BN_usub, test_bn_usub, nitems(test_bn_usub),
-            "BN_usub with test_bn_usub[]"))
-                failed = 1;
-
-        return failed;
-}
diff --git a/src/regress/lib/libcrypto/bn/general/Makefile b/src/regress/lib/libcrypto/bn/general/Makefile
deleted file mode 100644
index d578d0fe12..0000000000
--- a/src/regress/lib/libcrypto/bn/general/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2017/01/21 09:38:58 beck Exp $
-
-.include "../../Makefile.inc"
-
-PROG=   bntest
-LDADD=  ${CRYPTO_INT}
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/general/bntest.c b/src/regress/lib/libcrypto/bn/general/bntest.c
deleted file mode 100644
index cff776068b..0000000000
--- a/src/regress/lib/libcrypto/bn/general/bntest.c
+++ /dev/null
@@ -1,2467 +0,0 @@
-/*      $OpenBSD: bntest.c,v 1.20 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the Eric Young open source
- * license provided above.
- *
- * The binary polynomial arithmetic software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/x509.h>
-#include <openssl/err.h>
-
-int BN_mod_exp_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_exp_nonct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_exp_mont_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_mont_nonct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-
-int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom);
-
-const int num0 = 100; /* number of tests */
-const int num1 = 50;  /* additional tests for some functions */
-const int num2 = 5;   /* number of tests for slow functions */
-
-int test_add(BIO *bp);
-int test_sub(BIO *bp);
-int test_lshift1(BIO *bp);
-int test_lshift(BIO *bp, BN_CTX *ctx, BIGNUM *a_);
-int test_rshift1(BIO *bp);
-int test_rshift(BIO *bp, BN_CTX *ctx);
-int test_div(BIO *bp, BN_CTX *ctx);
-int test_div_word(BIO *bp);
-int test_div_recp(BIO *bp, BN_CTX *ctx);
-int test_mul(BIO *bp);
-int test_sqr(BIO *bp, BN_CTX *ctx);
-int test_mont(BIO *bp, BN_CTX *ctx);
-int test_mod(BIO *bp, BN_CTX *ctx);
-int test_mod_mul(BIO *bp, BN_CTX *ctx);
-int test_mod_exp(BIO *bp, BN_CTX *ctx);
-int test_mod_exp_mont_consttime(BIO *bp, BN_CTX *ctx);
-int test_mod_exp_mont5(BIO *bp, BN_CTX *ctx);
-int test_mod_exp_sizes(BIO *bp, BN_CTX *ctx);
-int test_exp(BIO *bp, BN_CTX *ctx);
-int test_gf2m_add(BIO *bp);
-int test_gf2m_mod(BIO *bp);
-int test_gf2m_mod_mul(BIO *bp, BN_CTX *ctx);
-int test_gf2m_mod_sqr(BIO *bp, BN_CTX *ctx);
-int test_gf2m_mod_inv(BIO *bp, BN_CTX *ctx);
-int test_gf2m_mod_div(BIO *bp, BN_CTX *ctx);
-int test_gf2m_mod_exp(BIO *bp, BN_CTX *ctx);
-int test_gf2m_mod_sqrt(BIO *bp, BN_CTX *ctx);
-int test_gf2m_mod_solve_quad(BIO *bp, BN_CTX *ctx);
-int test_kron(BIO *bp, BN_CTX *ctx);
-int test_sqrt(BIO *bp, BN_CTX *ctx);
-int rand_neg(void);
-static int results = 0;
-
-static unsigned char lst[] =
-        "\xC6\x4F\x43\x04\x2A\xEA\xCA\x6E\x58\x36\x80\x5B\xE8\xC9"
-        "\x9B\x04\x5D\x48\x36\xC2\xFD\x16\xC9\x64\xF0";
-
-#define PRINT_ERROR printf("Error in %s [%s:%d]\n", __func__, __FILE__, \
-                __LINE__)
-
-#define CHECK_GOTO(a) do {                                              \
-        if (!(a)) {                                                     \
-                PRINT_ERROR;                                            \
-                rc = 0;                                                 \
-                goto err;                                               \
-        }                                                               \
-} while (0)
-
-static void
-message(BIO *out, char *m)
-{
-        fprintf(stderr, "test %s\n", m);
-        BIO_puts(out, "print \"test ");
-        BIO_puts(out, m);
-        BIO_puts(out, "\\n\"\n");
-}
-
-int
-main(int argc, char *argv[])
-{
-        BN_CTX *ctx;
-        BIO *out;
-        char *outfile = NULL;
-
-        results = 0;
-
-        argc--;
-        argv++;
-        while (argc >= 1) {
-                if (strcmp(*argv, "-results") == 0)
-                        results = 1;
-                else if (strcmp(*argv, "-out") == 0) {
-                        if (--argc < 1)
-                                break;
-                        outfile= *(++argv);
-                }
-                argc--;
-                argv++;
-        }
-
-
-        ctx = BN_CTX_new();
-        if (ctx == NULL)
-                exit(1);
-
-        out = BIO_new(BIO_s_file());
-        if (out == NULL)
-                exit(1);
-        if (outfile == NULL) {
-                BIO_set_fp(out, stdout, BIO_NOCLOSE);
-        } else {
-                if (!BIO_write_filename(out, outfile)) {
-                        perror(outfile);
-                        exit(1);
-                }
-        }
-
-        if (!results)
-                BIO_puts(out, "obase=16\nibase=16\n");
-
-        message(out, "BN_add");
-        if (!test_add(out))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_sub");
-        if (!test_sub(out))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_lshift1");
-        if (!test_lshift1(out))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_lshift (fixed)");
-        if (!test_lshift(out, ctx, BN_bin2bn(lst, sizeof(lst) - 1, NULL)))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_lshift");
-        if (!test_lshift(out, ctx, NULL))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_rshift1");
-        if (!test_rshift1(out))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_rshift");
-        if (!test_rshift(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_sqr");
-        if (!test_sqr(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_mul");
-        if (!test_mul(out))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_div");
-        if (!test_div(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_div_word");
-        if (!test_div_word(out))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_div_recp");
-        if (!test_div_recp(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_mod");
-        if (!test_mod(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_mod_mul");
-        if (!test_mod_mul(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_mont");
-        if (!test_mont(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_mod_exp");
-        if (!test_mod_exp(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_mod_exp_mont_consttime");
-        if (!test_mod_exp_mont_consttime(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_mod_exp_mont5");
-        if (!test_mod_exp_mont5(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_exp");
-        if (!test_exp(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_kronecker");
-        if (!test_kron(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_mod_sqrt");
-        if (!test_sqrt(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "Modexp with different sizes");
-        if (!test_mod_exp_sizes(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-#ifndef OPENSSL_NO_EC2M
-        message(out, "BN_GF2m_add");
-        if (!test_gf2m_add(out))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_GF2m_mod");
-        if (!test_gf2m_mod(out))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_GF2m_mod_mul");
-        if (!test_gf2m_mod_mul(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_GF2m_mod_sqr");
-        if (!test_gf2m_mod_sqr(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_GF2m_mod_inv");
-        if (!test_gf2m_mod_inv(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_GF2m_mod_div");
-        if (!test_gf2m_mod_div(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_GF2m_mod_exp");
-        if (!test_gf2m_mod_exp(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_GF2m_mod_sqrt");
-        if (!test_gf2m_mod_sqrt(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-
-        message(out, "BN_GF2m_mod_solve_quad");
-        if (!test_gf2m_mod_solve_quad(out, ctx))
-                goto err;
-        (void)BIO_flush(out);
-#endif
-        BN_CTX_free(ctx);
-        BIO_free(out);
-
-        exit(0);
-err:
-        BIO_puts(out, "1\n"); /* make sure the Perl script fed by bc notices
-                               * the failure, see test_bn in test/Makefile.ssl*/
-
-        (void)BIO_flush(out);
-        ERR_load_crypto_strings();
-        ERR_print_errors_fp(stderr);
-        exit(1);
-}
-
-int
-test_add(BIO *bp)
-{
-        BIGNUM a, b, c;
-        int i;
-        int rc = 1;
-
-        BN_init(&a);
-        BN_init(&b);
-        BN_init(&c);
-
-        CHECK_GOTO(BN_bntest_rand(&a, 512, 0, 0));
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(&b, 450 + i, 0, 0));
-                a.neg = rand_neg();
-                b.neg = rand_neg();
-                CHECK_GOTO(BN_add(&c, &a, &b));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " + ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &c));
-                        BIO_puts(bp, "\n");
-                }
-                a.neg = !a.neg;
-                b.neg = !b.neg;
-                CHECK_GOTO(BN_add(&c, &c, &b));
-                CHECK_GOTO(BN_add(&c, &c, &a));
-                if (!BN_is_zero(&c)) {
-                        fprintf(stderr, "Add test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(&a);
-        BN_free(&b);
-        BN_free(&c);
-        return (rc);
-}
-
-int
-test_sub(BIO *bp)
-{
-        BIGNUM a, b, c;
-        int i;
-        int rc = 1;
-
-        BN_init(&a);
-        BN_init(&b);
-        BN_init(&c);
-
-        for (i = 0; i < num0 + num1; i++) {
-                if (i < num1) {
-                        CHECK_GOTO(BN_bntest_rand(&a, 512, 0, 0));
-                        CHECK_GOTO(BN_copy(&b, &a));
-                        if (BN_set_bit(&a, i) == 0) {
-                                rc = 0;
-                                break;
-                        }
-                        CHECK_GOTO(BN_add_word(&b, i));
-                } else {
-                        CHECK_GOTO(BN_bntest_rand(&b, 400 + i - num1, 0, 0));
-                        a.neg = rand_neg();
-                        b.neg = rand_neg();
-                }
-                CHECK_GOTO(BN_sub(&c, &a, &b));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " - ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &c));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_add(&c, &c, &b));
-                CHECK_GOTO(BN_sub(&c, &c, &a));
-                if (!BN_is_zero(&c)) {
-                        fprintf(stderr, "Subtract test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(&a);
-        BN_free(&b);
-        BN_free(&c);
-        return (rc);
-}
-
-int
-test_div(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM a, b, c, d, e;
-        int i;
-        int rc = 1;
-
-        BN_init(&a);
-        BN_init(&b);
-        BN_init(&c);
-        BN_init(&d);
-        BN_init(&e);
-
-        CHECK_GOTO(BN_one(&a));
-        CHECK_GOTO(BN_zero(&b));
-
-        if (BN_div(&d, &c, &a, &b, ctx)) {
-                fprintf(stderr, "Division by zero succeeded!\n");
-                return (0);
-        }
-
-        for (i = 0; i < num0 + num1; i++) {
-                if (i < num1) {
-                        CHECK_GOTO(BN_bntest_rand(&a, 400, 0, 0));
-                        CHECK_GOTO(BN_copy(&b, &a));
-                        CHECK_GOTO(BN_lshift(&a, &a, i));
-                        CHECK_GOTO(BN_add_word(&a, i));
-                } else
-                        CHECK_GOTO(BN_bntest_rand(&b, 50 + 3 * (i - num1), 0, 0));
-                a.neg = rand_neg();
-                b.neg = rand_neg();
-                CHECK_GOTO(BN_div(&d, &c, &a, &b, ctx));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " / ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &d));
-                        BIO_puts(bp, "\n");
-
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " % ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &c));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_mul(&e, &d, &b, ctx));
-                CHECK_GOTO(BN_add(&d, &e, &c));
-                CHECK_GOTO(BN_sub(&d, &d, &a));
-                if (!BN_is_zero(&d)) {
-                        fprintf(stderr, "Division test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(&a);
-        BN_free(&b);
-        BN_free(&c);
-        BN_free(&d);
-        BN_free(&e);
-        return (rc);
-}
-
-static void
-print_word(BIO *bp, BN_ULONG w)
-{
-#ifdef SIXTY_FOUR_BIT
-        if (sizeof(w) > sizeof(unsigned long)) {
-                unsigned long h = (unsigned long)(w >> 32), l = (unsigned long)(w);
-
-                if (h)
-                        BIO_printf(bp, "%lX%08lX", h, l);
-                else
-                        BIO_printf(bp, "%lX", l);
-                return;
-        }
-#endif
-        BIO_printf(bp, BN_HEX_FMT1, w);
-}
-
-int
-test_div_word(BIO *bp)
-{
-        BIGNUM a, b;
-        BN_ULONG r, rmod, s = 0;
-        int i;
-        int rc = 1;
-
-        BN_init(&a);
-        BN_init(&b);
-
-        for (i = 0; i < num0; i++) {
-                do {
-                        if (!BN_bntest_rand(&a, 512, -1, 0) ||
-                            !BN_bntest_rand(&b, BN_BITS2, -1, 0)) {
-                                rc = 0;
-                                break;
-                        }
-                        s = b.d[0];
-                } while (!s);
-
-                if (!BN_copy(&b, &a)) {
-                        rc = 0;
-                        break;
-                }
-
-                rmod = BN_mod_word(&b, s);
-                r = BN_div_word(&b, s);
-
-                if (r == (BN_ULONG)-1 || rmod == (BN_ULONG)-1) {
-                        rc = 0;
-                        break;
-                }
-
-                if (rmod != r) {
-                        fprintf(stderr, "Mod (word) test failed!\n");
-                        rc = 0;
-                        break;
-                }
-
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " / ");
-                                print_word(bp, s);
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &b));
-                        BIO_puts(bp, "\n");
-
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " % ");
-                                print_word(bp, s);
-                                BIO_puts(bp, " - ");
-                        }
-                        print_word(bp, r);
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_mul_word(&b, s));
-                CHECK_GOTO(BN_add_word(&b, r));
-                CHECK_GOTO(BN_sub(&b, &a, &b));
-                if (!BN_is_zero(&b)) {
-                        fprintf(stderr, "Division (word) test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(&a);
-        BN_free(&b);
-        return (rc);
-}
-
-int
-test_div_recp(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM a, b, c, d, e;
-        BN_RECP_CTX recp;
-        int i;
-        int rc = 1;
-
-        BN_RECP_CTX_init(&recp);
-        BN_init(&a);
-        BN_init(&b);
-        BN_init(&c);
-        BN_init(&d);
-        BN_init(&e);
-
-        for (i = 0; i < num0 + num1; i++) {
-                if (i < num1) {
-                        CHECK_GOTO(BN_bntest_rand(&a, 400, 0, 0));
-                        CHECK_GOTO(BN_copy(&b, &a));
-                        CHECK_GOTO(BN_lshift(&a, &a, i));
-                        CHECK_GOTO(BN_add_word(&a, i));
-                } else
-                        CHECK_GOTO(BN_bntest_rand(&b, 50 + 3 * (i - num1), 0, 0));
-                a.neg = rand_neg();
-                b.neg = rand_neg();
-                CHECK_GOTO(BN_RECP_CTX_set(&recp, &b, ctx));
-                CHECK_GOTO(BN_div_recp(&d, &c, &a, &recp, ctx));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " / ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &d));
-                        BIO_puts(bp, "\n");
-
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " % ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &c));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_mul(&e, &d, &b, ctx));
-                CHECK_GOTO(BN_add(&d, &e, &c));
-                CHECK_GOTO(BN_sub(&d, &d, &a));
-                if (!BN_is_zero(&d)) {
-                        fprintf(stderr, "Reciprocal division test failed!\n");
-                        fprintf(stderr, "a=");
-                        CHECK_GOTO(BN_print_fp(stderr, &a));
-                        fprintf(stderr, "\nb=");
-                        CHECK_GOTO(BN_print_fp(stderr, &b));
-                        fprintf(stderr, "\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(&a);
-        BN_free(&b);
-        BN_free(&c);
-        BN_free(&d);
-        BN_free(&e);
-        BN_RECP_CTX_free(&recp);
-        return (rc);
-}
-
-int
-test_mul(BIO *bp)
-{
-        BIGNUM a, b, c, d, e;
-        int i;
-        int rc = 1;
-        BN_CTX *ctx;
-
-        ctx = BN_CTX_new();
-        if (ctx == NULL)
-                exit(1);
-
-        BN_init(&a);
-        BN_init(&b);
-        BN_init(&c);
-        BN_init(&d);
-        BN_init(&e);
-
-        for (i = 0; i < num0 + num1; i++) {
-                if (i <= num1) {
-                        CHECK_GOTO(BN_bntest_rand(&a, 100, 0, 0));
-                        CHECK_GOTO(BN_bntest_rand(&b, 100, 0, 0));
-                } else
-                        CHECK_GOTO(BN_bntest_rand(&b, i - num1, 0, 0));
-                a.neg = rand_neg();
-                b.neg = rand_neg();
-                CHECK_GOTO(BN_mul(&c, &a, &b, ctx));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " * ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &c));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_div(&d, &e, &c, &a, ctx));
-                CHECK_GOTO(BN_sub(&d, &d, &b));
-                if (!BN_is_zero(&d) || !BN_is_zero(&e)) {
-                        fprintf(stderr, "Multiplication test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(&a);
-        BN_free(&b);
-        BN_free(&c);
-        BN_free(&d);
-        BN_free(&e);
-        BN_CTX_free(ctx);
-        return (rc);
-}
-
-int
-test_sqr(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *c, *d, *e;
-        int i, rc = 0;
-
-        a = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 40 + i * 10, 0, 0));
-                a->neg = rand_neg();
-                CHECK_GOTO(BN_sqr(c, a, ctx));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " * ");
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, c));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_div(d, e, c, a, ctx));
-                CHECK_GOTO(BN_sub(d, d, a));
-                if (!BN_is_zero(d) || !BN_is_zero(e)) {
-                        fprintf(stderr, "Square test failed!\n");
-                        goto err;
-                }
-        }
-
-        /* Regression test for a BN_sqr overflow bug. */
-        if (!BN_hex2bn(&a, "80000000000000008000000000000001"
-            "FFFFFFFFFFFFFFFE0000000000000000")) {
-                fprintf(stderr, "BN_hex2bn failed\n");
-                goto err;
-        }
-        CHECK_GOTO(BN_sqr(c, a, ctx));
-        if (bp != NULL) {
-                if (!results) {
-                        CHECK_GOTO(BN_print(bp, a));
-                        BIO_puts(bp, " * ");
-                        CHECK_GOTO(BN_print(bp, a));
-                        BIO_puts(bp, " - ");
-                }
-                CHECK_GOTO(BN_print(bp, c));
-                BIO_puts(bp, "\n");
-        }
-        CHECK_GOTO(BN_mul(d, a, a, ctx));
-        if (BN_cmp(c, d)) {
-                fprintf(stderr,
-                    "Square test failed: BN_sqr and BN_mul produce "
-                    "different results!\n");
-                goto err;
-        }
-
-        /* Regression test for a BN_sqr overflow bug. */
-        if (!BN_hex2bn(&a, "80000000000000000000000080000001"
-            "FFFFFFFE000000000000000000000000")) {
-                fprintf(stderr, "BN_hex2bn failed\n");
-                goto err;
-        }
-        CHECK_GOTO(BN_sqr(c, a, ctx));
-        if (bp != NULL) {
-                if (!results) {
-                        CHECK_GOTO(BN_print(bp, a));
-                        BIO_puts(bp, " * ");
-                        CHECK_GOTO(BN_print(bp, a));
-                        BIO_puts(bp, " - ");
-                }
-                CHECK_GOTO(BN_print(bp, c));
-                BIO_puts(bp, "\n");
-        }
-        CHECK_GOTO(BN_mul(d, a, a, ctx));
-        if (BN_cmp(c, d)) {
-                fprintf(stderr, "Square test failed: BN_sqr and BN_mul produce "
-                                "different results!\n");
-                goto err;
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        return rc;
-}
-
-int
-test_mont(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM a, b, c, d, A, B;
-        BIGNUM n;
-        int i;
-        int rc = 1;
-        BN_MONT_CTX *mont;
-
-        mont = BN_MONT_CTX_new();
-        if (mont == NULL)
-                return 0;
-
-        BN_init(&a);
-        BN_init(&b);
-        BN_init(&c);
-        BN_init(&d);
-        BN_init(&A);
-        BN_init(&B);
-        BN_init(&n);
-
-        CHECK_GOTO(BN_zero(&n));
-        if (BN_MONT_CTX_set(mont, &n, ctx)) {
-                fprintf(stderr, "BN_MONT_CTX_set succeeded for zero modulus!\n");
-                return (0);
-        }
-
-        CHECK_GOTO(BN_set_word(&n, 16));
-        if (BN_MONT_CTX_set(mont, &n, ctx)) {
-                fprintf(stderr, "BN_MONT_CTX_set succeeded for even modulus!\n");
-                return (0);
-        }
-
-        CHECK_GOTO(BN_bntest_rand(&a, 100, 0, 0));
-        CHECK_GOTO(BN_bntest_rand(&b, 100, 0, 0));
-        for (i = 0; i < num2; i++) {
-                int bits = (200 * (i + 1)) / num2;
-
-                if (bits == 0)
-                        continue;
-                CHECK_GOTO(BN_bntest_rand(&n, bits, 0, 1));
-                CHECK_GOTO(BN_MONT_CTX_set(mont, &n, ctx));
-
-                CHECK_GOTO(BN_nnmod(&a, &a, &n, ctx));
-                CHECK_GOTO(BN_nnmod(&b, &b, &n, ctx));
-
-                CHECK_GOTO(BN_to_montgomery(&A, &a, mont, ctx));
-                CHECK_GOTO(BN_to_montgomery(&B, &b, mont, ctx));
-
-                CHECK_GOTO(BN_mod_mul_montgomery(&c, &A, &B, mont, ctx));
-                CHECK_GOTO(BN_from_montgomery(&A, &c, mont, ctx));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " * ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " % ");
-                                CHECK_GOTO(BN_print(bp, &(mont->N)));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &A));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_mod_mul(&d, &a, &b, &n, ctx));
-                CHECK_GOTO(BN_sub(&d, &d, &A));
-                if (!BN_is_zero(&d)) {
-                        fprintf(stderr, "Montgomery multiplication test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_MONT_CTX_free(mont);
-        BN_free(&a);
-        BN_free(&b);
-        BN_free(&c);
-        BN_free(&d);
-        BN_free(&A);
-        BN_free(&B);
-        BN_free(&n);
-        return (rc);
-}
-
-int
-test_mod(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b, *c, *d, *e;
-        int i;
-        int rc = 1;
-
-        a = BN_new();
-        b = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-
-        CHECK_GOTO(BN_bntest_rand(a, 1024, 0, 0));
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(b, 450 + i * 10, 0, 0));
-                a->neg = rand_neg();
-                b->neg = rand_neg();
-                CHECK_GOTO(BN_mod(c, a, b, ctx));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " % ");
-                                CHECK_GOTO(BN_print(bp, b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, c));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_div(d, e, a, b, ctx));
-                CHECK_GOTO(BN_sub(e, e, c));
-                if (!BN_is_zero(e)) {
-                        fprintf(stderr, "Modulo test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        return (rc);
-}
-
-int
-test_mod_mul(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b, *c, *d, *e;
-        int i, j;
-        int rc = 1;
-
-        a = BN_new();
-        b = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-
-        CHECK_GOTO(BN_one(a));
-        CHECK_GOTO(BN_one(b));
-        CHECK_GOTO(BN_zero(c));
-        if (BN_mod_mul(e, a, b, c, ctx)) {
-                fprintf(stderr, "BN_mod_mul with zero modulus succeeded!\n");
-                return (0);
-        }
-
-        for (j = 0; j < 3; j++) {
-                CHECK_GOTO(BN_bntest_rand(c, 1024, 0, 0));
-                for (i = 0; i < num0; i++) {
-                        CHECK_GOTO(BN_bntest_rand(a, 475 + i * 10, 0, 0));
-                        CHECK_GOTO(BN_bntest_rand(b, 425 + i * 11, 0, 0));
-                        a->neg = rand_neg();
-                        b->neg = rand_neg();
-                        if (!BN_mod_mul(e, a, b, c, ctx)) {
-                                unsigned long l;
-
-                                while ((l = ERR_get_error()))
-                                        fprintf(stderr, "ERROR:%s\n",
-                                            ERR_error_string(l, NULL));
-                                exit(1);
-                        }
-                        if (bp != NULL) {
-                                if (!results) {
-                                        CHECK_GOTO(BN_print(bp, a));
-                                        BIO_puts(bp, " * ");
-                                        CHECK_GOTO(BN_print(bp, b));
-                                        BIO_puts(bp, " % ");
-                                        CHECK_GOTO(BN_print(bp, c));
-                                        if ((a->neg ^ b->neg) && !BN_is_zero(e)) {
-                                                /* If  (a*b) % c  is negative,  c  must be added
-                                                 * in order to obtain the normalized remainder
-                                                 * (new with OpenSSL 0.9.7, previous versions of
-                                                 * BN_mod_mul could generate negative results)
-                                                 */
-                                                BIO_puts(bp, " + ");
-                                                CHECK_GOTO(BN_print(bp, c));
-                                        }
-                                        BIO_puts(bp, " - ");
-                                }
-                                CHECK_GOTO(BN_print(bp, e));
-                                BIO_puts(bp, "\n");
-                        }
-                        CHECK_GOTO(BN_mul(d, a, b, ctx));
-                        CHECK_GOTO(BN_sub(d, d, e));
-                        CHECK_GOTO(BN_div(a, b, d, c, ctx));
-                        if (!BN_is_zero(b)) {
-                                fprintf(stderr, "Modulo multiply test failed!\n");
-                                ERR_print_errors_fp(stderr);
-                                rc = 0;
-                                goto err;
-                        }
-                }
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        return (rc);
-}
-
-int
-test_mod_exp(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b, *c, *d, *e;
-        int i;
-        int rc = 1;
-
-        a = BN_new();
-        b = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-
-        CHECK_GOTO(BN_one(a));
-        CHECK_GOTO(BN_one(b));
-        CHECK_GOTO(BN_zero(c));
-        if (BN_mod_exp(d, a, b, c, ctx)) {
-                fprintf(stderr, "BN_mod_exp with zero modulus succeeded!\n");
-                rc = 0;
-                goto err;
-        }
-        if (BN_mod_exp_ct(d, a, b, c, ctx)) {
-                fprintf(stderr, "BN_mod_exp_ct with zero modulus succeeded!\n");
-                rc = 0;
-                goto err;
-        }
-        if (BN_mod_exp_nonct(d, a, b, c, ctx)) {
-                fprintf(stderr, "BN_mod_exp_nonct with zero modulus succeeded!\n");
-                rc = 0;
-                goto err;
-        }
-
-        CHECK_GOTO(BN_bntest_rand(c, 30, 0, 1)); /* must be odd for montgomery */
-        for (i = 0; i < num2; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 20 + i * 5, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(b, 2 + i, 0, 0));
-
-                if (!BN_mod_exp(d, a, b, c, ctx)) {
-                        rc = 0;
-                        break;
-                }
-
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " ^ ");
-                                CHECK_GOTO(BN_print(bp, b));
-                                BIO_puts(bp, " % ");
-                                CHECK_GOTO(BN_print(bp, c));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, d));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_exp(e, a, b, ctx));
-                CHECK_GOTO(BN_sub(e, e, d));
-                CHECK_GOTO(BN_div(a, b, e, c, ctx));
-                if (!BN_is_zero(b)) {
-                        fprintf(stderr, "Modulo exponentiation test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-
-        CHECK_GOTO(BN_bntest_rand(c, 30, 0, 1)); /* must be odd for montgomery */
-        for (i = 0; i < num2; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 20 + i * 5, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(b, 2 + i, 0, 0));
-
-                if (!BN_mod_exp_ct(d, a, b, c, ctx)) {
-                        rc = 0;
-                        break;
-                }
-
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " ^ ");
-                                CHECK_GOTO(BN_print(bp, b));
-                                BIO_puts(bp, " % ");
-                                CHECK_GOTO(BN_print(bp, c));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, d));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_exp(e, a, b, ctx));
-                CHECK_GOTO(BN_sub(e, e, d));
-                CHECK_GOTO(BN_div(a, b, e, c, ctx));
-                if (!BN_is_zero(b)) {
-                        fprintf(stderr, "Modulo exponentiation test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-
-        CHECK_GOTO(BN_bntest_rand(c, 30, 0, 1)); /* must be odd for montgomery */
-        for (i = 0; i < num2; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 20 + i * 5, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(b, 2 + i, 0, 0));
-
-                if (!BN_mod_exp_nonct(d, a, b, c, ctx)) {
-                        rc = 0;
-                        break;
-                }
-
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " ^ ");
-                                CHECK_GOTO(BN_print(bp, b));
-                                BIO_puts(bp, " % ");
-                                CHECK_GOTO(BN_print(bp, c));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, d));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_exp(e, a, b, ctx));
-                CHECK_GOTO(BN_sub(e, e, d));
-                CHECK_GOTO(BN_div(a, b, e, c, ctx));
-                if (!BN_is_zero(b)) {
-                        fprintf(stderr, "Modulo exponentiation test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        return (rc);
-}
-
-int
-test_mod_exp_mont_consttime(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b, *c, *d, *e;
-        int i;
-        int rc = 1;
-
-        a = BN_new();
-        b = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-
-        CHECK_GOTO(BN_one(a));
-        CHECK_GOTO(BN_one(b));
-        CHECK_GOTO(BN_zero(c));
-        if (BN_mod_exp_mont_consttime(d, a, b, c, ctx, NULL)) {
-                fprintf(stderr, "BN_mod_exp_mont_consttime with zero modulus "
-                                "succeeded\n");
-                rc = 0;
-                goto err;
-        }
-
-        CHECK_GOTO(BN_set_word(c, 16));
-        if (BN_mod_exp_mont_consttime(d, a, b, c, ctx, NULL)) {
-                fprintf(stderr, "BN_mod_exp_mont_consttime with even modulus "
-                                "succeeded\n");
-                rc = 0;
-                goto err;
-        }
-
-        CHECK_GOTO(BN_bntest_rand(c, 30, 0, 1)); /* must be odd for montgomery */
-        for (i = 0; i < num2; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 20 + i * 5, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(b, 2 + i, 0, 0));
-
-                if (!BN_mod_exp_mont_consttime(d, a, b, c, ctx, NULL)) {
-                        rc = 0;
-                        break;
-                }
-
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " ^ ");
-                                CHECK_GOTO(BN_print(bp, b));
-                                BIO_puts(bp, " % ");
-                                CHECK_GOTO(BN_print(bp, c));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, d));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_exp(e, a, b, ctx));
-                CHECK_GOTO(BN_sub(e, e, d));
-                CHECK_GOTO(BN_div(a, b, e, c, ctx));
-                if (!BN_is_zero(b)) {
-                        fprintf(stderr, "Modulo exponentiation test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        return (rc);
-}
-
-/*
- * Test constant-time modular exponentiation with 1024-bit inputs, which on
- * x86_64 cause a different code branch to be taken.
- */
-int
-test_mod_exp_mont5(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *p, *m, *d, *e, *b, *n, *c;
-        int len, rc = 1;
-        BN_MONT_CTX *mont;
-
-        a = BN_new();
-        p = BN_new();
-        m = BN_new();
-        d = BN_new();
-        e = BN_new();
-        b = BN_new();
-        n = BN_new();
-        c = BN_new();
-
-        CHECK_GOTO(mont = BN_MONT_CTX_new());
-
-        CHECK_GOTO(BN_bntest_rand(m, 1024, 0, 1)); /* must be odd for montgomery */
-        /* Zero exponent */
-        CHECK_GOTO(BN_bntest_rand(a, 1024, 0, 0));
-        CHECK_GOTO(BN_zero(p));
-        if (!BN_mod_exp_mont_consttime(d, a, p, m, ctx, NULL)) {
-                rc = 0;
-                goto err;
-        }
-        if (!BN_is_one(d)) {
-                fprintf(stderr, "Modular exponentiation test failed!\n");
-                rc = 0;
-                goto err;
-        }
-        /* Regression test for carry bug in mulx4x_mont */
-        len = BN_hex2bn(&a,
-            "7878787878787878787878787878787878787878787878787878787878787878"
-            "7878787878787878787878787878787878787878787878787878787878787878"
-            "7878787878787878787878787878787878787878787878787878787878787878"
-            "7878787878787878787878787878787878787878787878787878787878787878");
-        CHECK_GOTO(len);
-        len = BN_hex2bn(&b,
-            "095D72C08C097BA488C5E439C655A192EAFB6380073D8C2664668EDDB4060744"
-            "E16E57FB4EDB9AE10A0CEFCDC28A894F689A128379DB279D48A2E20849D68593"
-            "9B7803BCF46CEBF5C533FB0DD35B080593DE5472E3FE5DB951B8BFF9B4CB8F03"
-            "9CC638A5EE8CDD703719F8000E6A9F63BEED5F2FCD52FF293EA05A251BB4AB81");
-        CHECK_GOTO(len);
-        len = BN_hex2bn(&n,
-            "D78AF684E71DB0C39CFF4E64FB9DB567132CB9C50CC98009FEB820B26F2DED9B"
-            "91B9B5E2B83AE0AE4EB4E0523CA726BFBE969B89FD754F674CE99118C3F2D1C5"
-            "D81FDC7C54E02B60262B241D53C040E99E45826ECA37A804668E690E1AFC1CA4"
-            "2C9A15D84D4954425F0B7642FC0BD9D7B24E2618D2DCC9B729D944BADACFDDAF");
-        CHECK_GOTO(len);
-        CHECK_GOTO(BN_MONT_CTX_set(mont, n, ctx));
-        CHECK_GOTO(BN_mod_mul_montgomery(c, a, b, mont, ctx));
-        CHECK_GOTO(BN_mod_mul_montgomery(d, b, a, mont, ctx));
-        if (BN_cmp(c, d)) {
-                fprintf(stderr, "Montgomery multiplication test failed:"
-                    " a*b != b*a.\n");
-                rc = 0;
-                goto err;
-        }
-        /* Regression test for carry bug in sqr[x]8x_mont */
-        len = BN_hex2bn(&n,
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000FFFFFFFF00"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "00000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF");
-        CHECK_GOTO(len);
-        len = BN_hex2bn(&a,
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000FFFFFFFF0000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000000"
-            "000000000000000000000000000000000000000000FFFFFFFFFFFFFF00000000");
-        CHECK_GOTO(len);
-        BN_free(b);
-        CHECK_GOTO(b = BN_dup(a));
-        CHECK_GOTO(BN_MONT_CTX_set(mont, n, ctx));
-        CHECK_GOTO(BN_mod_mul_montgomery(c, a, a, mont, ctx));
-        CHECK_GOTO(BN_mod_mul_montgomery(d, a, b, mont, ctx));
-        if (BN_cmp(c, d)) {
-                fprintf(stderr, "Montgomery multiplication test failed:"
-                    " a**2 != a*a.\n");
-                rc = 0;
-                goto err;
-        }
-        /* Zero input */
-        CHECK_GOTO(BN_bntest_rand(p, 1024, 0, 0));
-        CHECK_GOTO(BN_zero(a));
-        if (!BN_mod_exp_mont_consttime(d, a, p, m, ctx, NULL)) {
-                rc = 0;
-                goto err;
-        }
-        if (!BN_is_zero(d)) {
-                fprintf(stderr, "Modular exponentiation test failed!\n");
-                rc = 0;
-                goto err;
-        }
-        /*
-         * Craft an input whose Montgomery representation is 1, i.e., shorter
-         * than the modulus m, in order to test the const time precomputation
-         * scattering/gathering.
-         */
-        CHECK_GOTO(BN_one(a));
-        CHECK_GOTO(BN_MONT_CTX_set(mont, m, ctx));
-        if (!BN_from_montgomery(e, a, mont, ctx)) {
-                rc = 0;
-                goto err;
-        }
-        if (!BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL)) {
-                rc = 0;
-                goto err;
-        }
-        if (!BN_mod_exp_simple(a, e, p, m, ctx)) {
-                rc = 0;
-                goto err;
-        }
-        if (BN_cmp(a, d) != 0) {
-                fprintf(stderr, "Modular exponentiation test failed!\n");
-                rc = 0;
-                goto err;
-        }
-        /* Finally, some regular test vectors. */
-        CHECK_GOTO(BN_bntest_rand(e, 1024, 0, 0));
-        if (!BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL)) {
-                rc = 0;
-                goto err;
-        }
-        if (!BN_mod_exp_simple(a, e, p, m, ctx)) {
-                rc = 0;
-                goto err;
-        }
-        if (BN_cmp(a, d) != 0) {
-                fprintf(stderr, "Modular exponentiation test failed!\n");
-                rc = 0;
-                goto err;
-        }
-err:
-        BN_free(a);
-        BN_free(p);
-        BN_free(m);
-        BN_free(d);
-        BN_free(e);
-        BN_free(b);
-        BN_free(n);
-        BN_free(c);
-        BN_MONT_CTX_free(mont);
-        return (rc);
-}
-
-int
-test_exp(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b, *d, *e, *one;
-        int i;
-        int rc = 1;
-
-        a = BN_new();
-        b = BN_new();
-        d = BN_new();
-        e = BN_new();
-        one = BN_new();
-        CHECK_GOTO(BN_one(one));
-
-        for (i = 0; i < num2; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 20 + i * 5, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(b, 2 + i, 0, 0));
-
-                if (BN_exp(d, a, b, ctx) <= 0) {
-                        rc = 0;
-                        break;
-                }
-
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " ^ ");
-                                CHECK_GOTO(BN_print(bp, b));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, d));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_one(e));
-                for (; !BN_is_zero(b); BN_sub(b, b, one))
-                        CHECK_GOTO(BN_mul(e, e, a, ctx));
-                CHECK_GOTO(BN_sub(e, e, d));
-                if (!BN_is_zero(e)) {
-                        fprintf(stderr, "Exponentiation test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(d);
-        BN_free(e);
-        BN_free(one);
-        return (rc);
-}
-
-#ifndef OPENSSL_NO_EC2M
-int
-test_gf2m_add(BIO *bp)
-{
-        BIGNUM a, b, c;
-        int i, rc = 0;
-
-        BN_init(&a);
-        BN_init(&b);
-        BN_init(&c);
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_rand(&a, 512, 0, 0));
-                CHECK_GOTO(BN_copy(&b, BN_value_one()));
-                a.neg = rand_neg();
-                b.neg = rand_neg();
-                CHECK_GOTO(BN_GF2m_add(&c, &a, &b));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, &a));
-                                BIO_puts(bp, " ^ ");
-                                CHECK_GOTO(BN_print(bp, &b));
-                                BIO_puts(bp, " = ");
-                        }
-                        CHECK_GOTO(BN_print(bp, &c));
-                        BIO_puts(bp, "\n");
-                }
-#endif
-                /* Test that two added values have the correct parity. */
-                if ((BN_is_odd(&a) && BN_is_odd(&c))
-                    || (!BN_is_odd(&a) && !BN_is_odd(&c))) {
-                        fprintf(stderr, "GF(2^m) addition test (a) failed!\n");
-                        goto err;
-                }
-                CHECK_GOTO(BN_GF2m_add(&c, &c, &c));
-                /* Test that c + c = 0. */
-                if (!BN_is_zero(&c)) {
-                        fprintf(stderr, "GF(2^m) addition test (b) failed!\n");
-                        goto err;
-                }
-        }
-        rc = 1;
-err:
-        BN_free(&a);
-        BN_free(&b);
-        BN_free(&c);
-        return rc;
-}
-
-int
-test_gf2m_mod(BIO *bp)
-{
-        BIGNUM *a, *b[2], *c, *d, *e;
-        int i, j, rc = 0;
-        int p0[] = { 163, 7, 6, 3, 0, -1 };
-        int p1[] = { 193, 15, 0, -1 };
-
-        a = BN_new();
-        b[0] = BN_new();
-        b[1] = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-
-        CHECK_GOTO(BN_GF2m_arr2poly(p0, b[0]));
-        CHECK_GOTO(BN_GF2m_arr2poly(p1, b[1]));
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 1024, 0, 0));
-                for (j = 0; j < 2; j++) {
-                        CHECK_GOTO(BN_GF2m_mod(c, a, b[j]));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                        if (bp != NULL) {
-                                if (!results) {
-                                        CHECK_GOTO(BN_print(bp, a));
-                                        BIO_puts(bp, " % ");
-                                        CHECK_GOTO(BN_print(bp, b[j]));
-                                        BIO_puts(bp, " - ");
-                                        CHECK_GOTO(BN_print(bp, c));
-                                        BIO_puts(bp, "\n");
-                                }
-                        }
-#endif
-                        CHECK_GOTO(BN_GF2m_add(d, a, c));
-                        CHECK_GOTO(BN_GF2m_mod(e, d, b[j]));
-                        /* Test that a + (a mod p) mod p == 0. */
-                        if (!BN_is_zero(e)) {
-                                fprintf(stderr, "GF(2^m) modulo test failed!\n");
-                                goto err;
-                        }
-                }
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b[0]);
-        BN_free(b[1]);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        return rc;
-}
-
-int
-test_gf2m_mod_mul(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b[2], *c, *d, *e, *f, *g, *h;
-        int i, j, rc = 0;
-        int p0[] = { 163, 7, 6, 3, 0, -1 };
-        int p1[] = { 193, 15, 0, -1 };
-
-        a = BN_new();
-        b[0] = BN_new();
-        b[1] = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-        f = BN_new();
-        g = BN_new();
-        h = BN_new();
-
-        CHECK_GOTO(BN_GF2m_arr2poly(p0, b[0]));
-        CHECK_GOTO(BN_GF2m_arr2poly(p1, b[1]));
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 1024, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(c, 1024, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(d, 1024, 0, 0));
-                for (j = 0; j < 2; j++) {
-                        CHECK_GOTO(BN_GF2m_mod_mul(e, a, c, b[j], ctx));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                        if (bp != NULL) {
-                                if (!results) {
-                                        CHECK_GOTO(BN_print(bp, a));
-                                        BIO_puts(bp, " * ");
-                                        CHECK_GOTO(BN_print(bp, c));
-                                        BIO_puts(bp, " % ");
-                                        CHECK_GOTO(BN_print(bp, b[j]));
-                                        BIO_puts(bp, " - ");
-                                        CHECK_GOTO(BN_print(bp, e));
-                                        BIO_puts(bp, "\n");
-                                }
-                        }
-#endif
-                        CHECK_GOTO(BN_GF2m_add(f, a, d));
-                        CHECK_GOTO(BN_GF2m_mod_mul(g, f, c, b[j], ctx));
-                        CHECK_GOTO(BN_GF2m_mod_mul(h, d, c, b[j], ctx));
-                        CHECK_GOTO(BN_GF2m_add(f, e, g));
-                        CHECK_GOTO(BN_GF2m_add(f, f, h));
-                        /* Test that (a+d)*c = a*c + d*c. */
-                        if (!BN_is_zero(f)) {
-                                fprintf(stderr, "GF(2^m) modular multiplication test failed!\n");
-                                goto err;
-                        }
-                }
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b[0]);
-        BN_free(b[1]);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        BN_free(f);
-        BN_free(g);
-        BN_free(h);
-        return rc;
-}
-
-int
-test_gf2m_mod_sqr(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b[2], *c, *d;
-        int i, j, rc = 0;
-        int p0[] = { 163, 7, 6, 3, 0, -1 };
-        int p1[] = { 193, 15, 0, -1 };
-
-        a = BN_new();
-        b[0] = BN_new();
-        b[1] = BN_new();
-        c = BN_new();
-        d = BN_new();
-
-        CHECK_GOTO(BN_GF2m_arr2poly(p0, b[0]));
-        CHECK_GOTO(BN_GF2m_arr2poly(p1, b[1]));
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 1024, 0, 0));
-                for (j = 0; j < 2; j++) {
-                        CHECK_GOTO(BN_GF2m_mod_sqr(c, a, b[j], ctx));
-                        CHECK_GOTO(BN_copy(d, a));
-                        CHECK_GOTO(BN_GF2m_mod_mul(d, a, d, b[j], ctx));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                        if (bp != NULL) {
-                                if (!results) {
-                                        CHECK_GOTO(BN_print(bp, a));
-                                        BIO_puts(bp, " ^ 2 % ");
-                                        CHECK_GOTO(BN_print(bp, b[j]));
-                                        BIO_puts(bp, " = ");
-                                        CHECK_GOTO(BN_print(bp, c));
-                                        BIO_puts(bp, "; a * a = ");
-                                        CHECK_GOTO(BN_print(bp, d));
-                                        BIO_puts(bp, "\n");
-                                }
-                        }
-#endif
-                        CHECK_GOTO(BN_GF2m_add(d, c, d));
-                        /* Test that a*a = a^2. */
-                        if (!BN_is_zero(d)) {
-                                fprintf(stderr, "GF(2^m) modular squaring test failed!\n");
-                                goto err;
-                        }
-                }
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b[0]);
-        BN_free(b[1]);
-        BN_free(c);
-        BN_free(d);
-        return rc;
-}
-
-int
-test_gf2m_mod_inv(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b[2], *c, *d;
-        int i, j, rc = 0;
-        int p0[] = { 163, 7, 6, 3, 0, -1 };
-        int p1[] = { 193, 15, 0, -1 };
-
-        a = BN_new();
-        b[0] = BN_new();
-        b[1] = BN_new();
-        c = BN_new();
-        d = BN_new();
-
-        CHECK_GOTO(BN_GF2m_arr2poly(p0, b[0]));
-        CHECK_GOTO(BN_GF2m_arr2poly(p1, b[1]));
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 512, 0, 0));
-                for (j = 0; j < 2; j++) {
-                        CHECK_GOTO(BN_GF2m_mod_inv(c, a, b[j], ctx));
-                        CHECK_GOTO(BN_GF2m_mod_mul(d, a, c, b[j], ctx));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                        if (bp != NULL) {
-                                if (!results) {
-                                        CHECK_GOTO(BN_print(bp, a));
-                                        BIO_puts(bp, " * ");
-                                        CHECK_GOTO(BN_print(bp, c));
-                                        BIO_puts(bp, " - 1 % ");
-                                        CHECK_GOTO(BN_print(bp, b[j]));
-                                        BIO_puts(bp, "\n");
-                                }
-                        }
-#endif
-                        /* Test that ((1/a)*a) = 1. */
-                        if (!BN_is_one(d)) {
-                                fprintf(stderr, "GF(2^m) modular inversion test failed!\n");
-                                goto err;
-                        }
-                }
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b[0]);
-        BN_free(b[1]);
-        BN_free(c);
-        BN_free(d);
-        return rc;
-}
-
-int
-test_gf2m_mod_div(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b[2], *c, *d, *e, *f;
-        int i, j, rc = 0;
-        int p0[] = { 163, 7, 6, 3, 0, -1 };
-        int p1[] = { 193, 15, 0, -1 };
-
-        a = BN_new();
-        b[0] = BN_new();
-        b[1] = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-        f = BN_new();
-
-        CHECK_GOTO(BN_GF2m_arr2poly(p0, b[0]));
-        CHECK_GOTO(BN_GF2m_arr2poly(p1, b[1]));
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 512, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(c, 512, 0, 0));
-                for (j = 0; j < 2; j++) {
-                        CHECK_GOTO(BN_GF2m_mod_div(d, a, c, b[j], ctx));
-                        CHECK_GOTO(BN_GF2m_mod_mul(e, d, c, b[j], ctx));
-                        CHECK_GOTO(BN_GF2m_mod_div(f, a, e, b[j], ctx));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                        if (bp != NULL) {
-                                if (!results) {
-                                        CHECK_GOTO(BN_print(bp, a));
-                                        BIO_puts(bp, " = ");
-                                        CHECK_GOTO(BN_print(bp, c));
-                                        BIO_puts(bp, " * ");
-                                        CHECK_GOTO(BN_print(bp, d));
-                                        BIO_puts(bp, " % ");
-                                        CHECK_GOTO(BN_print(bp, b[j]));
-                                        BIO_puts(bp, "\n");
-                                }
-                        }
-#endif
-                        /* Test that ((a/c)*c)/a = 1. */
-                        if (!BN_is_one(f)) {
-                                fprintf(stderr, "GF(2^m) modular division test failed!\n");
-                                goto err;
-                        }
-                }
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b[0]);
-        BN_free(b[1]);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        BN_free(f);
-        return rc;
-}
-
-int
-test_gf2m_mod_exp(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b[2], *c, *d, *e, *f;
-        int i, j, rc = 0;
-        int p0[] = { 163, 7, 6, 3, 0, -1 };
-        int p1[] = { 193, 15, 0, -1 };
-
-        a = BN_new();
-        b[0] = BN_new();
-        b[1] = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-        f = BN_new();
-
-        CHECK_GOTO(BN_GF2m_arr2poly(p0, b[0]));
-        CHECK_GOTO(BN_GF2m_arr2poly(p1, b[1]));
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 512, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(c, 512, 0, 0));
-                CHECK_GOTO(BN_bntest_rand(d, 512, 0, 0));
-                for (j = 0; j < 2; j++) {
-                        CHECK_GOTO(BN_GF2m_mod_exp(e, a, c, b[j], ctx));
-                        CHECK_GOTO(BN_GF2m_mod_exp(f, a, d, b[j], ctx));
-                        CHECK_GOTO(BN_GF2m_mod_mul(e, e, f, b[j], ctx));
-                        CHECK_GOTO(BN_add(f, c, d));
-                        CHECK_GOTO(BN_GF2m_mod_exp(f, a, f, b[j], ctx));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                        if (bp != NULL) {
-                                if (!results) {
-                                        CHECK_GOTO(BN_print(bp, a));
-                                        BIO_puts(bp, " ^ (");
-                                        CHECK_GOTO(BN_print(bp, c));
-                                        BIO_puts(bp, " + ");
-                                        CHECK_GOTO(BN_print(bp, d));
-                                        BIO_puts(bp, ") = ");
-                                        CHECK_GOTO(BN_print(bp, e));
-                                        BIO_puts(bp, "; - ");
-                                        CHECK_GOTO(BN_print(bp, f));
-                                        BIO_puts(bp, " % ");
-                                        CHECK_GOTO(BN_print(bp, b[j]));
-                                        BIO_puts(bp, "\n");
-                                }
-                        }
-#endif
-                        CHECK_GOTO(BN_GF2m_add(f, e, f));
-                        /* Test that a^(c+d)=a^c*a^d. */
-                        if (!BN_is_zero(f)) {
-                                fprintf(stderr, "GF(2^m) modular exponentiation test failed!\n");
-                                goto err;
-                        }
-                }
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b[0]);
-        BN_free(b[1]);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        BN_free(f);
-        return rc;
-}
-
-int
-test_gf2m_mod_sqrt(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b[2], *c, *d, *e, *f;
-        int i, j, rc = 0;
-        int p0[] = { 163, 7, 6, 3, 0, -1 };
-        int p1[] = { 193, 15, 0, -1 };
-
-        a = BN_new();
-        b[0] = BN_new();
-        b[1] = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-        f = BN_new();
-
-        CHECK_GOTO(BN_GF2m_arr2poly(p0, b[0]));
-        CHECK_GOTO(BN_GF2m_arr2poly(p1, b[1]));
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 512, 0, 0));
-                for (j = 0; j < 2; j++) {
-                        CHECK_GOTO(BN_GF2m_mod(c, a, b[j]));
-                        CHECK_GOTO(BN_GF2m_mod_sqrt(d, a, b[j], ctx));
-                        CHECK_GOTO(BN_GF2m_mod_sqr(e, d, b[j], ctx));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                        if (bp != NULL) {
-                                if (!results) {
-                                        CHECK_GOTO(BN_print(bp, d));
-                                        BIO_puts(bp, " ^ 2 - ");
-                                        CHECK_GOTO(BN_print(bp, a));
-                                        BIO_puts(bp, "\n");
-                                }
-                        }
-#endif
-                        CHECK_GOTO(BN_GF2m_add(f, c, e));
-                        /* Test that d^2 = a, where d = sqrt(a). */
-                        if (!BN_is_zero(f)) {
-                                fprintf(stderr, "GF(2^m) modular square root test failed!\n");
-                                goto err;
-                        }
-                }
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b[0]);
-        BN_free(b[1]);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        BN_free(f);
-        return rc;
-}
-
-int
-test_gf2m_mod_solve_quad(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b[2], *c, *d, *e;
-        int i, j, s = 0, t, rc = 0;
-        int p0[] = { 163, 7, 6, 3, 0, -1 };
-        int p1[] = { 193, 15, 0, -1 };
-
-        a = BN_new();
-        b[0] = BN_new();
-        b[1] = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-
-        CHECK_GOTO(BN_GF2m_arr2poly(p0, b[0]));
-        CHECK_GOTO(BN_GF2m_arr2poly(p1, b[1]));
-
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_bntest_rand(a, 512, 0, 0));
-                for (j = 0; j < 2; j++) {
-                        t = BN_GF2m_mod_solve_quad(c, a, b[j], ctx);
-                        if (t) {
-                                s++;
-                                CHECK_GOTO(BN_GF2m_mod_sqr(d, c, b[j], ctx));
-                                CHECK_GOTO(BN_GF2m_add(d, c, d));
-                                CHECK_GOTO(BN_GF2m_mod(e, a, b[j]));
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                                if (bp != NULL) {
-                                        if (!results) {
-                                                CHECK_GOTO(BN_print(bp, c));
-                                                BIO_puts(bp, " is root of z^2 + z = ");
-                                                CHECK_GOTO(BN_print(bp, a));
-                                                BIO_puts(bp, " % ");
-                                                CHECK_GOTO(BN_print(bp, b[j]));
-                                                BIO_puts(bp, "\n");
-                                        }
-                                }
-#endif
-                                CHECK_GOTO(BN_GF2m_add(e, e, d));
-                                /* Test that solution of quadratic c satisfies c^2 + c = a. */
-                                if (!BN_is_zero(e)) {
-                                        fprintf(stderr, "GF(2^m) modular solve quadratic test failed!\n");
-                                        goto err;
-                                }
-
-                        } else {
-#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
-                                if (bp != NULL) {
-                                        if (!results) {
-                                                BIO_puts(bp, "There are no roots of z^2 + z = ");
-                                                CHECK_GOTO(BN_print(bp, a));
-                                                BIO_puts(bp, " % ");
-                                                CHECK_GOTO(BN_print(bp, b[j]));
-                                                BIO_puts(bp, "\n");
-                                        }
-                                }
-#endif
-                        }
-                }
-        }
-        if (s == 0) {
-                fprintf(stderr, "All %i tests of GF(2^m) modular solve quadratic resulted in no roots;\n", num0);
-                fprintf(stderr, "this is very unlikely and probably indicates an error.\n");
-                goto err;
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b[0]);
-        BN_free(b[1]);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        return rc;
-}
-#endif
-static int
-genprime_cb(int p, int n, BN_GENCB *arg)
-{
-        char c = '*';
-
-        if (p == 0)
-                c = '.';
-        if (p == 1)
-                c = '+';
-        if (p == 2)
-                c = '*';
-        if (p == 3)
-                c = '\n';
-        putc(c, stderr);
-        fflush(stderr);
-        return (1);
-}
-
-int
-test_kron(BIO *bp, BN_CTX *ctx)
-{
-        BN_GENCB cb;
-        BIGNUM *a, *b, *r, *t;
-        int i;
-        int legendre, kronecker;
-        int rc = 0;
-
-        a = BN_new();
-        b = BN_new();
-        r = BN_new();
-        t = BN_new();
-        if (a == NULL || b == NULL || r == NULL || t == NULL)
-                goto err;
-
-        BN_GENCB_set(&cb, genprime_cb, NULL);
-
-        /*
-         * We test BN_kronecker(a, b, ctx) just for b odd (Jacobi symbol). In
-         * this case we know that if b is prime, then BN_kronecker(a, b, ctx) is
-         * congruent to $a^{(b-1)/2}$, modulo $b$ (Legendre symbol). So we
-         * generate a random prime b and compare these values for a number of
-         * random a's.  (That is, we run the Solovay-Strassen primality test to
-         * confirm that b is prime, except that we don't want to test whether b
-         * is prime but whether BN_kronecker works.)
-         */
-
-        if (!BN_generate_prime_ex(b, 512, 0, NULL, NULL, &cb))
-                goto err;
-        b->neg = rand_neg();
-        putc('\n', stderr);
-
-        for (i = 0; i < num0; i++) {
-                if (!BN_bntest_rand(a, 512, 0, 0))
-                        goto err;
-                a->neg = rand_neg();
-
-                /* t := (|b|-1)/2  (note that b is odd) */
-                if (!BN_copy(t, b))
-                        goto err;
-                t->neg = 0;
-                if (!BN_sub_word(t, 1))
-                        goto err;
-                if (!BN_rshift1(t, t))
-                        goto err;
-                /* r := a^t mod b */
-                b->neg = 0;
-
-                if (!BN_mod_exp_recp(r, a, t, b, ctx))
-                        goto err;
-                b->neg = 1;
-
-                if (BN_is_word(r, 1))
-                        legendre = 1;
-                else if (BN_is_zero(r))
-                        legendre = 0;
-                else {
-                        if (!BN_add_word(r, 1))
-                                goto err;
-                        if (0 != BN_ucmp(r, b)) {
-                                fprintf(stderr, "Legendre symbol computation failed\n");
-                                goto err;
-                        }
-                        legendre = -1;
-                }
-
-                kronecker = BN_kronecker(a, b, ctx);
-                if (kronecker < -1)
-                        goto err;
-                /* we actually need BN_kronecker(a, |b|) */
-                if (a->neg && b->neg)
-                        kronecker = -kronecker;
-
-                if (legendre != kronecker) {
-                        fprintf(stderr, "legendre != kronecker; a = ");
-                        CHECK_GOTO(BN_print_fp(stderr, a));
-                        fprintf(stderr, ", b = ");
-                        CHECK_GOTO(BN_print_fp(stderr, b));
-                        fprintf(stderr, "\n");
-                        goto err;
-                }
-
-                putc('.', stderr);
-                fflush(stderr);
-        }
-
-        putc('\n', stderr);
-        fflush(stderr);
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(r);
-        BN_free(t);
-        return rc;
-}
-
-int
-test_sqrt(BIO *bp, BN_CTX *ctx)
-{
-        BN_GENCB cb;
-        BIGNUM *a, *p, *r;
-        int i, j;
-        int rc = 0;
-
-        a = BN_new();
-        p = BN_new();
-        r = BN_new();
-        if (a == NULL || p == NULL || r == NULL)
-                goto err;
-
-        BN_GENCB_set(&cb, genprime_cb, NULL);
-
-        for (i = 0; i < 16; i++) {
-                if (i < 8) {
-                        unsigned primes[8] = { 2, 3, 5, 7, 11, 13, 17, 19 };
-
-                        if (!BN_set_word(p, primes[i]))
-                                goto err;
-                } else {
-                        if (!BN_set_word(a, 32))
-                                goto err;
-                        if (!BN_set_word(r, 2 * i + 1))
-                                goto err;
-
-                        if (!BN_generate_prime_ex(p, 256, 0, a, r, &cb))
-                                goto err;
-                        putc('\n', stderr);
-                }
-                p->neg = rand_neg();
-
-                for (j = 0; j < num2; j++) {
-                        /*
-                         * construct 'a' such that it is a square modulo p, but in
-                         * general not a proper square and not reduced modulo p
-                         */
-                        if (!BN_bntest_rand(r, 256, 0, 3))
-                                goto err;
-                        if (!BN_nnmod(r, r, p, ctx))
-                                goto err;
-                        if (!BN_mod_sqr(r, r, p, ctx))
-                                goto err;
-                        if (!BN_bntest_rand(a, 256, 0, 3))
-                                goto err;
-                        if (!BN_nnmod(a, a, p, ctx))
-                                goto err;
-                        if (!BN_mod_sqr(a, a, p, ctx))
-                                goto err;
-                        if (!BN_mul(a, a, r, ctx))
-                                goto err;
-                        if (rand_neg())
-                                if (!BN_sub(a, a, p))
-                                        goto err;
-
-                        if (!BN_mod_sqrt(r, a, p, ctx))
-                                goto err;
-                        if (!BN_mod_sqr(r, r, p, ctx))
-                                goto err;
-
-                        if (!BN_nnmod(a, a, p, ctx))
-                                goto err;
-
-                        if (BN_cmp(a, r) != 0) {
-                                fprintf(stderr, "BN_mod_sqrt failed: a = ");
-                                CHECK_GOTO(BN_print_fp(stderr, a));
-                                fprintf(stderr, ", r = ");
-                                CHECK_GOTO(BN_print_fp(stderr, r));
-                                fprintf(stderr, ", p = ");
-                                CHECK_GOTO(BN_print_fp(stderr, p));
-                                fprintf(stderr, "\n");
-                                goto err;
-                        }
-
-                        putc('.', stderr);
-                        fflush(stderr);
-                }
-
-                putc('\n', stderr);
-                fflush(stderr);
-        }
-        rc = 1;
-err:
-        BN_free(a);
-        BN_free(p);
-        BN_free(r);
-        return rc;
-}
-
-int
-test_lshift(BIO *bp, BN_CTX *ctx, BIGNUM *a_)
-{
-        BIGNUM *a = NULL, *b, *c, *d;
-        int i;
-        int rc = 1;
-
-        b = BN_new();
-        c = BN_new();
-        d = BN_new();
-        CHECK_GOTO(BN_one(c));
-
-        if (a_)
-                a = a_;
-        else {
-                a = BN_new();
-                CHECK_GOTO(BN_bntest_rand(a, 200, 0, 0));
-                a->neg = rand_neg();
-        }
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_lshift(b, a, i + 1));
-                CHECK_GOTO(BN_add(c, c, c));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " * ");
-                                CHECK_GOTO(BN_print(bp, c));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, b));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_mul(d, a, c, ctx));
-                CHECK_GOTO(BN_sub(d, d, b));
-                if (!BN_is_zero(d)) {
-                        fprintf(stderr, "Left shift test failed!\n");
-                        fprintf(stderr, "a=");
-                        CHECK_GOTO(BN_print_fp(stderr, a));
-                        fprintf(stderr, "\nb=");
-                        CHECK_GOTO(BN_print_fp(stderr, b));
-                        fprintf(stderr, "\nc=");
-                        CHECK_GOTO(BN_print_fp(stderr, c));
-                        fprintf(stderr, "\nd=");
-                        CHECK_GOTO(BN_print_fp(stderr, d));
-                        fprintf(stderr, "\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(c);
-        BN_free(d);
-        return (rc);
-}
-
-int
-test_lshift1(BIO *bp)
-{
-        BIGNUM *a, *b, *c;
-        int i;
-        int rc = 1;
-
-        a = BN_new();
-        b = BN_new();
-        c = BN_new();
-
-        CHECK_GOTO(BN_bntest_rand(a, 200, 0, 0));
-        a->neg = rand_neg();
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_lshift1(b, a));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " * 2");
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, b));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_add(c, a, a));
-                CHECK_GOTO(BN_sub(a, b, c));
-                if (!BN_is_zero(a)) {
-                        fprintf(stderr, "Left shift one test failed!\n");
-                        rc = 0;
-                        break;
-                }
-
-                CHECK_GOTO(BN_copy(a, b));
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(c);
-        return (rc);
-}
-
-int
-test_rshift(BIO *bp, BN_CTX *ctx)
-{
-        BIGNUM *a, *b, *c, *d, *e;
-        int i;
-        int rc = 1;
-
-        a = BN_new();
-        b = BN_new();
-        c = BN_new();
-        d = BN_new();
-        e = BN_new();
-        CHECK_GOTO(BN_one(c));
-
-        CHECK_GOTO(BN_bntest_rand(a, 200, 0, 0));
-        a->neg = rand_neg();
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_rshift(b, a, i + 1));
-                CHECK_GOTO(BN_add(c, c, c));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " / ");
-                                CHECK_GOTO(BN_print(bp, c));
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, b));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_div(d, e, a, c, ctx));
-                CHECK_GOTO(BN_sub(d, d, b));
-                if (!BN_is_zero(d)) {
-                        fprintf(stderr, "Right shift test failed!\n");
-                        rc = 0;
-                        break;
-                }
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(c);
-        BN_free(d);
-        BN_free(e);
-        return (rc);
-}
-
-int
-test_rshift1(BIO *bp)
-{
-        BIGNUM *a, *b, *c;
-        int i;
-        int rc = 1;
-
-        a = BN_new();
-        b = BN_new();
-        c = BN_new();
-
-        CHECK_GOTO(BN_bntest_rand(a, 200, 0, 0));
-        a->neg = rand_neg();
-        for (i = 0; i < num0; i++) {
-                CHECK_GOTO(BN_rshift1(b, a));
-                if (bp != NULL) {
-                        if (!results) {
-                                CHECK_GOTO(BN_print(bp, a));
-                                BIO_puts(bp, " / 2");
-                                BIO_puts(bp, " - ");
-                        }
-                        CHECK_GOTO(BN_print(bp, b));
-                        BIO_puts(bp, "\n");
-                }
-                CHECK_GOTO(BN_sub(c, a, b));
-                CHECK_GOTO(BN_sub(c, c, b));
-                if (!BN_is_zero(c) && !BN_abs_is_word(c, 1)) {
-                        fprintf(stderr, "Right shift one test failed!\n");
-                        rc = 0;
-                        break;
-                }
-                CHECK_GOTO(BN_copy(a, b));
-        }
-err:
-        BN_free(a);
-        BN_free(b);
-        BN_free(c);
-        return (rc);
-}
-
-int
-rand_neg(void)
-{
-        static unsigned int neg = 0;
-        static int sign[8] = { 0, 0, 0, 1, 1, 0, 1, 1 };
-
-        return (sign[(neg++) % 8]);
-}
-
-int
-test_mod_exp_sizes(BIO *bp, BN_CTX *ctx)
-{
-        BN_MONT_CTX *mont_ctx = NULL;
-        BIGNUM *p, *x, *y, *r, *r2;
-        int size;
-        int rc = 0;
-
-        BN_CTX_start(ctx);
-        CHECK_GOTO(p = BN_CTX_get(ctx));
-        CHECK_GOTO(x = BN_CTX_get(ctx));
-        CHECK_GOTO(y = BN_CTX_get(ctx));
-        CHECK_GOTO(r = BN_CTX_get(ctx));
-        CHECK_GOTO(r2 = BN_CTX_get(ctx));
-        mont_ctx = BN_MONT_CTX_new();
-
-        if (r2 == NULL || mont_ctx == NULL)
-                goto err;
-
-        if (!BN_generate_prime_ex(p, 32, 0, NULL, NULL, NULL) ||
-            !BN_MONT_CTX_set(mont_ctx, p, ctx))
-                goto err;
-
-        for (size = 32; size < 1024; size += 8) {
-                if (!BN_rand(x, size, -1, 0) ||
-                    !BN_rand(y, size, -1, 0) ||
-                    !BN_mod_exp_mont_consttime(r, x, y, p, ctx, mont_ctx) ||
-                    !BN_mod_exp(r2, x, y, p, ctx))
-                        goto err;
-
-                if (BN_cmp(r, r2) != 0) {
-                        char *r_str = NULL;
-                        char *r2_str = NULL;
-                        CHECK_GOTO(r_str = BN_bn2hex(r));
-                        CHECK_GOTO(r2_str = BN_bn2hex(r2));
-
-                        printf("Incorrect answer at size %d: %s vs %s\n",
-                            size, r_str, r2_str);
-                        free(r_str);
-                        free(r2_str);
-                        goto err;
-                }
-        }
-
-        rc = 1;
-
-err:
-        BN_MONT_CTX_free(mont_ctx);
-        BN_CTX_end(ctx);
-        return rc;
-}
diff --git a/src/regress/lib/libcrypto/bn/mont/Makefile b/src/regress/lib/libcrypto/bn/mont/Makefile
deleted file mode 100644
index 55c48220d4..0000000000
--- a/src/regress/lib/libcrypto/bn/mont/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2017/01/21 09:38:58 beck Exp $
-
-PROG=   mont
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/mont/mont.c b/src/regress/lib/libcrypto/bn/mont/mont.c
deleted file mode 100644
index 30d5317b64..0000000000
--- a/src/regress/lib/libcrypto/bn/mont/mont.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*      $OpenBSD: mont.c,v 1.2 2014/10/22 13:23:05 jsing Exp $  */
-
-/*
- * Copyright (c) 2014 Miodrag Vallat.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-#include <openssl/dh.h>
-#include <openssl/err.h>
-
-/*
- * Test for proper bn_mul_mont behaviour when operands are of vastly different
- * sizes.
- */
-
-int
-main(int argc, char *argv[])
-{
-        DH *dh;
-        unsigned char *key, r[32 + 16 * 8];
-        size_t privsz;
-
-        arc4random_buf(r, sizeof(r));
-
-        for (privsz = 32; privsz <= sizeof(r); privsz += 8) {
-                dh = DH_new();
-                if (dh == NULL)
-                        goto err;
-                if (DH_generate_parameters_ex(dh, 32, DH_GENERATOR_2,
-                    NULL) == 0)
-                        goto err;
-
-                /* force private key to be much larger than public one */
-                dh->priv_key = BN_bin2bn(r, privsz, NULL);
-                if (dh->priv_key == NULL)
-                        goto err;
-
-                if (DH_generate_key(dh) == 0)
-                        goto err;
-                key = malloc(DH_size(dh));
-                if (key == NULL)
-                        err(1, "malloc");
-                if (DH_compute_key(key, dh->pub_key, dh) == -1)
-                        goto err;
-
-                free(key);
-                DH_free(dh);
-        }
-
-        return 0;
-
-err:
-        ERR_print_errors_fp(stderr);
-        return 1;
-}
diff --git a/src/regress/lib/libcrypto/bn/rand/Makefile b/src/regress/lib/libcrypto/bn/rand/Makefile
deleted file mode 100644
index 52d0835df4..0000000000
--- a/src/regress/lib/libcrypto/bn/rand/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2018/11/06 06:55:27 tb Exp $
-
-.include "../../Makefile.inc"
-
-PROG=   bn_rand_interval
-LDADD=  ${CRYPTO_INT}
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c b/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c
deleted file mode 100644
index 09b1a34eea..0000000000
--- a/src/regress/lib/libcrypto/bn/rand/bn_rand_interval.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*      $OpenBSD: bn_rand_interval.c,v 1.2 2018/11/06 13:17:42 tb Exp $ */
-/*
- * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-
-#include <openssl/bn.h>
-
-#define NUM_TESTS 1000000
-
-int bn_rand_interval(BIGNUM *rnd, const BIGNUM *lower_incl,
-    const BIGNUM *upper_excl);
-void print_triple(BIGNUM *a, BIGNUM *b, BIGNUM *x);
-
-void
-print_triple(BIGNUM *a, BIGNUM *b, BIGNUM *x) {
-        if (a != NULL) {
-                printf("a = ");
-                BN_print_fp(stdout, a);
-                printf("\n");
-        }
-
-        if (b != NULL) {
-                printf("b = ");
-                BN_print_fp(stdout, b);
-                printf("\n");
-        }
-
-        if (x != NULL) {
-                printf("x = ");
-                BN_print_fp(stdout, x);
-                printf("\n");
-        }
-}
-
-int
-main(int argc, char *argv[])
-{
-        BIGNUM *a, *b, *x;
-        int i, success = 1;
-
-        if ((a = BN_new()) == NULL)
-                err(1, "BN_hex2bn");
-        if ((b = BN_new()) == NULL)
-                err(1, "BN_hex2bn");
-        if ((x = BN_new()) == NULL)
-                err(1, "BN_new()");
-        
-        for (i = 0; i < NUM_TESTS; i++) {
-                if (!BN_rand(a, 256, 0, 0))
-                        err(1, "BN_rand(a)");
-
-                if (bn_rand_interval(x, a, a) != 0) {
-                        success = 0;
-
-                        printf("bn_rand_interval(a == a) succeeded\n");
-                        print_triple(a, NULL, x);
-                }
-
-                if (!BN_rand(b, 256, 0, 0))
-                        err(1, "BN_rand(b)");
-
-                switch(BN_cmp(a, b)) {
-                case 0:         /* a == b */
-                        continue;
-
-                case 1:         /* a > b */
-                        BN_swap(a, b);
-                        break;
-
-                default:        /* a < b */
-                        break;
-                }
-
-                if (!bn_rand_interval(x, a, b))
-                        err(1, "bn_rand_interval() failed");
-
-                if (BN_cmp(x, a) < 0 || BN_cmp(x, b) >= 0) {
-                        success = 0;
-
-                        printf("generated number x not inside [a,b)\n");
-                        print_triple(a, b, x);
-                }
-
-                if (bn_rand_interval(x, b, a) != 0) {
-                        success = 0;
-
-                        printf("bn_rand_interval(x, b, a) succeeded\n");
-                        print_triple(a, b, x);
-                }
-        }
-
-        if (success == 1)
-                printf("success\n");
-        else
-                printf("FAIL");
-
-        return 1 - success;
-}
diff --git a/src/regress/lib/libcrypto/cast/Makefile b/src/regress/lib/libcrypto/cast/Makefile
deleted file mode 100644
index cdb7da5312..0000000000
--- a/src/regress/lib/libcrypto/cast/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   casttest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/cast/casttest.c b/src/regress/lib/libcrypto/cast/casttest.c
deleted file mode 100644
index 81b878ee7f..0000000000
--- a/src/regress/lib/libcrypto/cast/casttest.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*      $OpenBSD: casttest.c,v 1.2 2018/07/17 17:06:49 tb Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_CAST is defined */
-
-#include <openssl/cast.h>
-
-#define FULL_TEST
-
-static unsigned char k[16]={
-        0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
-        0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A
-        };
-
-static unsigned char in[8]={ 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF};
-
-static int k_len[3]={16,10,5};
-static unsigned char c[3][8]={
-        {0x23,0x8B,0x4F,0xE5,0x84,0x7E,0x44,0xB2},
-        {0xEB,0x6A,0x71,0x1A,0x2C,0x02,0x27,0x1B},
-        {0x7A,0xC8,0x16,0xD1,0x6E,0x9B,0x30,0x2E},
-        };
-static unsigned char out[80];
-
-static unsigned char in_a[16]={
-        0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
-        0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A};
-static unsigned char in_b[16]={
-        0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78,
-        0x23,0x45,0x67,0x89,0x34,0x56,0x78,0x9A};
-
-static unsigned char c_a[16]={
-        0xEE,0xA9,0xD0,0xA2,0x49,0xFD,0x3B,0xA6,
-        0xB3,0x43,0x6F,0xB8,0x9D,0x6D,0xCA,0x92};
-static unsigned char c_b[16]={
-        0xB2,0xC9,0x5E,0xB0,0x0C,0x31,0xAD,0x71,
-        0x80,0xAC,0x05,0xB8,0xE8,0x3D,0x69,0x6E};
-
-#if 0
-char *text="Hello to all people out there";
-
-static unsigned char cfb_key[16]={
-        0xe1,0xf0,0xc3,0xd2,0xa5,0xb4,0x87,0x96,
-        0x69,0x78,0x4b,0x5a,0x2d,0x3c,0x0f,0x1e,
-        };
-static unsigned char cfb_iv[80]={0x34,0x12,0x78,0x56,0xab,0x90,0xef,0xcd};
-static unsigned char cfb_buf1[40],cfb_buf2[40],cfb_tmp[8];
-#define CFB_TEST_SIZE 24
-static unsigned char plain[CFB_TEST_SIZE]=
-        {
-        0x4e,0x6f,0x77,0x20,0x69,0x73,
-        0x20,0x74,0x68,0x65,0x20,0x74,
-        0x69,0x6d,0x65,0x20,0x66,0x6f,
-        0x72,0x20,0x61,0x6c,0x6c,0x20
-        };
-static unsigned char cfb_cipher64[CFB_TEST_SIZE]={
-        0x59,0xD8,0xE2,0x65,0x00,0x58,0x6C,0x3F,
-        0x2C,0x17,0x25,0xD0,0x1A,0x38,0xB7,0x2A,
-        0x39,0x61,0x37,0xDC,0x79,0xFB,0x9F,0x45
-
-/*      0xF9,0x78,0x32,0xB5,0x42,0x1A,0x6B,0x38,
-        0x9A,0x44,0xD6,0x04,0x19,0x43,0xC4,0xD9,
-        0x3D,0x1E,0xAE,0x47,0xFC,0xCF,0x29,0x0B,*/
-        }; 
-#endif
-
-int main(int argc, char *argv[])
-    {
-#ifdef FULL_TEST
-    long l;
-    CAST_KEY key_b;
-#endif
-    int i,z,err=0;
-    CAST_KEY key;
-
-    for (z=0; z<3; z++)
-        {
-        CAST_set_key(&key,k_len[z],k);
-
-        CAST_ecb_encrypt(in,out,&key,CAST_ENCRYPT);
-        if (memcmp(out,&(c[z][0]),8) != 0)
-            {
-            printf("ecb cast error encrypting for keysize %d\n",k_len[z]*8);
-            printf("got     :");
-            for (i=0; i<8; i++)
-                printf("%02X ",out[i]);
-            printf("\n");
-            printf("expected:");
-            for (i=0; i<8; i++)
-                printf("%02X ",c[z][i]);
-            err=20;
-            printf("\n");
-            }
-
-        CAST_ecb_encrypt(out,out,&key,CAST_DECRYPT);
-        if (memcmp(out,in,8) != 0)
-            {
-            printf("ecb cast error decrypting for keysize %d\n",k_len[z]*8);
-            printf("got     :");
-            for (i=0; i<8; i++)
-                printf("%02X ",out[i]);
-            printf("\n");
-            printf("expected:");
-            for (i=0; i<8; i++)
-                printf("%02X ",in[i]);
-            printf("\n");
-            err=3;
-            }
-        }
-    if (err == 0)
-        printf("ecb cast5 ok\n");
-
-#ifdef FULL_TEST
-      {
-      unsigned char out_a[16],out_b[16];
-      static char *hex="0123456789ABCDEF";
-      
-      printf("This test will take some time....");
-      fflush(stdout);
-      memcpy(out_a,in_a,sizeof(in_a));
-      memcpy(out_b,in_b,sizeof(in_b));
-      i=1;
-
-      for (l=0; l<1000000L; l++)
-          {
-          CAST_set_key(&key_b,16,out_b);
-          CAST_ecb_encrypt(&(out_a[0]),&(out_a[0]),&key_b,CAST_ENCRYPT);
-          CAST_ecb_encrypt(&(out_a[8]),&(out_a[8]),&key_b,CAST_ENCRYPT);
-          CAST_set_key(&key,16,out_a);
-          CAST_ecb_encrypt(&(out_b[0]),&(out_b[0]),&key,CAST_ENCRYPT);
-          CAST_ecb_encrypt(&(out_b[8]),&(out_b[8]),&key,CAST_ENCRYPT);
-          if ((l & 0xffff) == 0xffff)
-              {
-              printf("%c",hex[i&0x0f]);
-              fflush(stdout);
-              i++;
-              }
-          }
-
-      if (      (memcmp(out_a,c_a,sizeof(c_a)) != 0) ||
-                (memcmp(out_b,c_b,sizeof(c_b)) != 0))
-          {
-          printf("\n");
-          printf("Error\n");
-
-          printf("A out =");
-          for (i=0; i<16; i++) printf("%02X ",out_a[i]);
-          printf("\nactual=");
-          for (i=0; i<16; i++) printf("%02X ",c_a[i]);
-          printf("\n");
-
-          printf("B out =");
-          for (i=0; i<16; i++) printf("%02X ",out_b[i]);
-          printf("\nactual=");
-          for (i=0; i<16; i++) printf("%02X ",c_b[i]);
-          printf("\n");
-          }
-      else
-          printf(" ok\n");
-      }
-#endif
-
-    exit(err);
-    }
diff --git a/src/regress/lib/libcrypto/chacha/Makefile b/src/regress/lib/libcrypto/chacha/Makefile
deleted file mode 100644
index 685cbdbab1..0000000000
--- a/src/regress/lib/libcrypto/chacha/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   chachatest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/chacha/chachatest.c b/src/regress/lib/libcrypto/chacha/chachatest.c
deleted file mode 100644
index fe4cc40952..0000000000
--- a/src/regress/lib/libcrypto/chacha/chachatest.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/*      $OpenBSD: chachatest.c,v 1.5 2018/07/17 17:06:49 tb Exp $       */
-/*
- * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/chacha.h>
-
-struct chacha_tv {
-        const char *desc;
-        const unsigned char key[32];
-        const unsigned char iv[8];
-        const size_t len;
-        const unsigned char out[512];
-};
-
-/*
- * Test vectors from:
- *   http://tools.ietf.org/html/draft-strombergson-chacha-test-vectors-01
- */
-struct chacha_tv chacha_test_vectors[] = {
-        {
-                "TC1: All zero key and IV",
-                {
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                {
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                64,
-                {
-                        0x76, 0xb8, 0xe0, 0xad, 0xa0, 0xf1, 0x3d, 0x90,
-                        0x40, 0x5d, 0x6a, 0xe5, 0x53, 0x86, 0xbd, 0x28,
-                        0xbd, 0xd2, 0x19, 0xb8, 0xa0, 0x8d, 0xed, 0x1a,
-                        0xa8, 0x36, 0xef, 0xcc, 0x8b, 0x77, 0x0d, 0xc7,
-                        0xda, 0x41, 0x59, 0x7c, 0x51, 0x57, 0x48, 0x8d,
-                        0x77, 0x24, 0xe0, 0x3f, 0xb8, 0xd8, 0x4a, 0x37,
-                        0x6a, 0x43, 0xb8, 0xf4, 0x15, 0x18, 0xa1, 0x1c,
-                        0xc3, 0x87, 0xb6, 0x69, 0xb2, 0xee, 0x65, 0x86,
-                },
-        },
-        {
-                "TC2: Single bit in key set, all zero IV",
-                {
-                        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                {
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                64,
-                {
-                        0xc5, 0xd3, 0x0a, 0x7c, 0xe1, 0xec, 0x11, 0x93,
-                        0x78, 0xc8, 0x4f, 0x48, 0x7d, 0x77, 0x5a, 0x85,
-                        0x42, 0xf1, 0x3e, 0xce, 0x23, 0x8a, 0x94, 0x55,
-                        0xe8, 0x22, 0x9e, 0x88, 0x8d, 0xe8, 0x5b, 0xbd,
-                        0x29, 0xeb, 0x63, 0xd0, 0xa1, 0x7a, 0x5b, 0x99,
-                        0x9b, 0x52, 0xda, 0x22, 0xbe, 0x40, 0x23, 0xeb,
-                        0x07, 0x62, 0x0a, 0x54, 0xf6, 0xfa, 0x6a, 0xd8,
-                        0x73, 0x7b, 0x71, 0xeb, 0x04, 0x64, 0xda, 0xc0,
-                },
-        },
-        {
-                "TC3: Single bit in IV set, all zero key",
-                {
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                {
-                        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                64,
-                {
-                        0xef, 0x3f, 0xdf, 0xd6, 0xc6, 0x15, 0x78, 0xfb,
-                        0xf5, 0xcf, 0x35, 0xbd, 0x3d, 0xd3, 0x3b, 0x80,
-                        0x09, 0x63, 0x16, 0x34, 0xd2, 0x1e, 0x42, 0xac,
-                        0x33, 0x96, 0x0b, 0xd1, 0x38, 0xe5, 0x0d, 0x32,
-                        0x11, 0x1e, 0x4c, 0xaf, 0x23, 0x7e, 0xe5, 0x3c,
-                        0xa8, 0xad, 0x64, 0x26, 0x19, 0x4a, 0x88, 0x54,
-                        0x5d, 0xdc, 0x49, 0x7a, 0x0b, 0x46, 0x6e, 0x7d,
-                        0x6b, 0xbd, 0xb0, 0x04, 0x1b, 0x2f, 0x58, 0x6b
-                },
-        },
-        {
-                "TC4: All bits in key and IV are set",
-                {
-                        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                {
-                        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                },
-                64,
-                {
-                        0xd9, 0xbf, 0x3f, 0x6b, 0xce, 0x6e, 0xd0, 0xb5,
-                        0x42, 0x54, 0x55, 0x77, 0x67, 0xfb, 0x57, 0x44,
-                        0x3d, 0xd4, 0x77, 0x89, 0x11, 0xb6, 0x06, 0x05,
-                        0x5c, 0x39, 0xcc, 0x25, 0xe6, 0x74, 0xb8, 0x36,
-                        0x3f, 0xea, 0xbc, 0x57, 0xfd, 0xe5, 0x4f, 0x79,
-                        0x0c, 0x52, 0xc8, 0xae, 0x43, 0x24, 0x0b, 0x79,
-                        0xd4, 0x90, 0x42, 0xb7, 0x77, 0xbf, 0xd6, 0xcb,
-                        0x80, 0xe9, 0x31, 0x27, 0x0b, 0x7f, 0x50, 0xeb,
-                },
-        },
-        {
-                "TC5: Every even bit set in key and IV",
-                {
-                        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-                        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-                        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-                        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-                },
-                {
-                        0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-                },
-                64,
-                {
-                        0xbe, 0xa9, 0x41, 0x1a, 0xa4, 0x53, 0xc5, 0x43,
-                        0x4a, 0x5a, 0xe8, 0xc9, 0x28, 0x62, 0xf5, 0x64,
-                        0x39, 0x68, 0x55, 0xa9, 0xea, 0x6e, 0x22, 0xd6,
-                        0xd3, 0xb5, 0x0a, 0xe1, 0xb3, 0x66, 0x33, 0x11,
-                        0xa4, 0xa3, 0x60, 0x6c, 0x67, 0x1d, 0x60, 0x5c,
-                        0xe1, 0x6c, 0x3a, 0xec, 0xe8, 0xe6, 0x1e, 0xa1,
-                        0x45, 0xc5, 0x97, 0x75, 0x01, 0x7b, 0xee, 0x2f,
-                        0xa6, 0xf8, 0x8a, 0xfc, 0x75, 0x80, 0x69, 0xf7,
-                },
-        },
-        {
-                "TC6: Every odd bit set in key and IV",
-                {
-                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                },
-                {
-                        0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                },
-                64,
-                {
-                        0x9a, 0xa2, 0xa9, 0xf6, 0x56, 0xef, 0xde, 0x5a,
-                        0xa7, 0x59, 0x1c, 0x5f, 0xed, 0x4b, 0x35, 0xae,
-                        0xa2, 0x89, 0x5d, 0xec, 0x7c, 0xb4, 0x54, 0x3b,
-                        0x9e, 0x9f, 0x21, 0xf5, 0xe7, 0xbc, 0xbc, 0xf3,
-                        0xc4, 0x3c, 0x74, 0x8a, 0x97, 0x08, 0x88, 0xf8,
-                        0x24, 0x83, 0x93, 0xa0, 0x9d, 0x43, 0xe0, 0xb7,
-                        0xe1, 0x64, 0xbc, 0x4d, 0x0b, 0x0f, 0xb2, 0x40,
-                        0xa2, 0xd7, 0x21, 0x15, 0xc4, 0x80, 0x89, 0x06,
-                },
-        },
-        {
-                "TC7: Sequence patterns in key and IV",
-                {
-                        0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-                        0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-                        0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88,
-                        0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11, 0x00,
-                },
-                {
-                        0x0f, 0x1e, 0x2d, 0x3c, 0x4b, 0x5a, 0x69, 0x78,
-                },
-                64,
-                {
-                        0x9f, 0xad, 0xf4, 0x09, 0xc0, 0x08, 0x11, 0xd0,
-                        0x04, 0x31, 0xd6, 0x7e, 0xfb, 0xd8, 0x8f, 0xba,
-                        0x59, 0x21, 0x8d, 0x5d, 0x67, 0x08, 0xb1, 0xd6,
-                        0x85, 0x86, 0x3f, 0xab, 0xbb, 0x0e, 0x96, 0x1e,
-                        0xea, 0x48, 0x0f, 0xd6, 0xfb, 0x53, 0x2b, 0xfd,
-                        0x49, 0x4b, 0x21, 0x51, 0x01, 0x50, 0x57, 0x42,
-                        0x3a, 0xb6, 0x0a, 0x63, 0xfe, 0x4f, 0x55, 0xf7,
-                        0xa2, 0x12, 0xe2, 0x16, 0x7c, 0xca, 0xb9, 0x31,
-                },
-        },
-        {
-                "TC8: key: 'All your base are belong to us!, IV: 'IETF2013'",
-                {
-                        0xc4, 0x6e, 0xc1, 0xb1, 0x8c, 0xe8, 0xa8, 0x78,
-                        0x72, 0x5a, 0x37, 0xe7, 0x80, 0xdf, 0xb7, 0x35,
-                        0x1f, 0x68, 0xed, 0x2e, 0x19, 0x4c, 0x79, 0xfb,
-                        0xc6, 0xae, 0xbe, 0xe1, 0xa6, 0x67, 0x97, 0x5d,
-                },
-                {
-                        0x1a, 0xda, 0x31, 0xd5, 0xcf, 0x68, 0x82, 0x21,
-                },
-                64,
-                {
-                        0xf6, 0x3a, 0x89, 0xb7, 0x5c, 0x22, 0x71, 0xf9,
-                        0x36, 0x88, 0x16, 0x54, 0x2b, 0xa5, 0x2f, 0x06,
-                        0xed, 0x49, 0x24, 0x17, 0x92, 0x30, 0x2b, 0x00,
-                        0xb5, 0xe8, 0xf8, 0x0a, 0xe9, 0xa4, 0x73, 0xaf,
-                        0xc2, 0x5b, 0x21, 0x8f, 0x51, 0x9a, 0xf0, 0xfd,
-                        0xd4, 0x06, 0x36, 0x2e, 0x8d, 0x69, 0xde, 0x7f,
-                        0x54, 0xc6, 0x04, 0xa6, 0xe0, 0x0f, 0x35, 0x3f,
-                        0x11, 0x0f, 0x77, 0x1b, 0xdc, 0xa8, 0xab, 0x92,
-                },
-        },
-};
-
-#define N_VECTORS (sizeof(chacha_test_vectors) / sizeof(*chacha_test_vectors))
-
-/* Single-shot ChaCha20 using CRYPTO_chacha_20 interface. */
-static void
-crypto_chacha_20_test(struct chacha_tv *tv, unsigned char *out,
-    unsigned char *in)
-{
-        CRYPTO_chacha_20(out, in, tv->len, tv->key, tv->iv, 0);
-}
-
-/* Single-shot ChaCha20 using the ChaCha interface. */
-static void
-chacha_ctx_full_test(struct chacha_tv *tv, unsigned char *out,
-    unsigned char *in)
-{
-        ChaCha_ctx ctx;
-
-        ChaCha_set_key(&ctx, tv->key, 256);
-        ChaCha_set_iv(&ctx, tv->iv, NULL);
-        ChaCha(&ctx, out, in, tv->len);
-}
-
-/* ChaCha20 with partial writes using the Chacha interface. */
-static void
-chacha_ctx_partial_test(struct chacha_tv *tv, unsigned char *out,
-    unsigned char *in)
-{
-        ChaCha_ctx ctx;
-        int len, size = 0;
-
-        ChaCha_set_key(&ctx, tv->key, 256);
-        ChaCha_set_iv(&ctx, tv->iv, NULL);
-        len = tv->len - 1;
-        while (len > 1) {
-                size = len / 2;
-                ChaCha(&ctx, out, in, size);
-                in += size;
-                out += size;
-                len -= size;
-        }
-        ChaCha(&ctx, out, in, len + 1);
-}
-
-/* ChaCha20 with single byte writes using the Chacha interface. */
-static void
-chacha_ctx_single_test(struct chacha_tv *tv, unsigned char *out,
-    unsigned char *in)
-{
-        ChaCha_ctx ctx;
-        size_t i;
-
-        ChaCha_set_key(&ctx, tv->key, 256);
-        ChaCha_set_iv(&ctx, tv->iv, NULL);
-        for (i = 0; i < tv->len; i++)
-                ChaCha(&ctx, out + i, in + i, 1);
-}
-
-struct chacha_test_function {
-        char *name;
-        void (*func)(struct chacha_tv *, unsigned char *, unsigned char *);
-};
-
-struct chacha_test_function chacha_test_functions[] = {
-        {"crypto_chacha_20_test", crypto_chacha_20_test},
-        {"chacha_ctx_full_test", chacha_ctx_full_test},
-        {"chacha_ctx_partial_test", chacha_ctx_partial_test},
-        {"chacha_ctx_single_test", chacha_ctx_single_test},
-};
-
-#define N_FUNCS (sizeof(chacha_test_functions) / sizeof(*chacha_test_functions))
-
-int
-main(int argc, char **argv)
-{
-        struct chacha_tv *tv;
-        unsigned char *in, *out;
-        size_t i, j, k;
-        int failed = 0;
-
-        for (i = 0; i < N_VECTORS; i++) {
-                tv = &chacha_test_vectors[i];
-
-                for (j = 0; j < N_FUNCS; j++) {
-                        in = calloc(1, tv->len);
-                        if (in == NULL)
-                                errx(1, "calloc in");
-                        out = calloc(1, tv->len);
-                        if (out == NULL)
-                                errx(1, "calloc out");
-
-                        chacha_test_functions[j].func(tv, out, in);
-
-                        if (memcmp(out, tv->out, tv->len) != 0) {
-                                printf("ChaCha %s failed for \"%s\"!\n",
-                                    chacha_test_functions[j].name, tv->desc);
-
-                                printf("Got:\t");
-                                for (k = 0; k < tv->len; k++)
-                                        printf("%2.2x", out[k]);
-                                printf("\n");
-
-                                printf("Want:\t");
-                                for (k = 0; k < tv->len; k++)
-                                        printf("%2.2x", tv->out[k]);
-                                printf("\n");
-
-                                failed = 1;
-                        }
-
-                        free(in);
-                        free(out);
-                }
-        }
-
-        return failed;
-}
diff --git a/src/regress/lib/libcrypto/cts128/Makefile b/src/regress/lib/libcrypto/cts128/Makefile
deleted file mode 100644
index 801d1d7182..0000000000
--- a/src/regress/lib/libcrypto/cts128/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   cts128test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/cts128/cts128test.c b/src/regress/lib/libcrypto/cts128/cts128test.c
deleted file mode 100644
index ca60808718..0000000000
--- a/src/regress/lib/libcrypto/cts128/cts128test.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*      $OpenBSD: cts128test.c,v 1.3 2018/07/17 17:06:49 tb Exp $       */
-/* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project. All rights reserved.
- *
- * Rights for redistribution and usage in source and binary
- * forms are granted according to the OpenSSL license.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/aes.h>
-#include <openssl/modes.h>
-
-void test_vector(const unsigned char *vector,size_t len);
-void test_nistvector(const unsigned char *vector,size_t len);
-
-/* test vectors from RFC 3962 */
-static const unsigned char test_key[16] = "chicken teriyaki";
-static const unsigned char test_input[64] =
-                "I would like the" " General Gau's C"
-                "hicken, please, " "and wonton soup.";
-static const unsigned char test_iv[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-static const unsigned char vector_17[17] =
-{0xc6,0x35,0x35,0x68,0xf2,0xbf,0x8c,0xb4, 0xd8,0xa5,0x80,0x36,0x2d,0xa7,0xff,0x7f,
- 0x97};
-static const unsigned char vector_31[31] =
-{0xfc,0x00,0x78,0x3e,0x0e,0xfd,0xb2,0xc1, 0xd4,0x45,0xd4,0xc8,0xef,0xf7,0xed,0x22,
- 0x97,0x68,0x72,0x68,0xd6,0xec,0xcc,0xc0, 0xc0,0x7b,0x25,0xe2,0x5e,0xcf,0xe5};
-static const unsigned char vector_32[32] =
-{0x39,0x31,0x25,0x23,0xa7,0x86,0x62,0xd5, 0xbe,0x7f,0xcb,0xcc,0x98,0xeb,0xf5,0xa8,
- 0x97,0x68,0x72,0x68,0xd6,0xec,0xcc,0xc0, 0xc0,0x7b,0x25,0xe2,0x5e,0xcf,0xe5,0x84};
-static const unsigned char vector_47[47] =
-{0x97,0x68,0x72,0x68,0xd6,0xec,0xcc,0xc0, 0xc0,0x7b,0x25,0xe2,0x5e,0xcf,0xe5,0x84,
- 0xb3,0xff,0xfd,0x94,0x0c,0x16,0xa1,0x8c, 0x1b,0x55,0x49,0xd2,0xf8,0x38,0x02,0x9e,
- 0x39,0x31,0x25,0x23,0xa7,0x86,0x62,0xd5, 0xbe,0x7f,0xcb,0xcc,0x98,0xeb,0xf5};
-static const unsigned char vector_48[48] =
-{0x97,0x68,0x72,0x68,0xd6,0xec,0xcc,0xc0, 0xc0,0x7b,0x25,0xe2,0x5e,0xcf,0xe5,0x84,
- 0x9d,0xad,0x8b,0xbb,0x96,0xc4,0xcd,0xc0, 0x3b,0xc1,0x03,0xe1,0xa1,0x94,0xbb,0xd8,
- 0x39,0x31,0x25,0x23,0xa7,0x86,0x62,0xd5, 0xbe,0x7f,0xcb,0xcc,0x98,0xeb,0xf5,0xa8};
-static const unsigned char vector_64[64] =
-{0x97,0x68,0x72,0x68,0xd6,0xec,0xcc,0xc0, 0xc0,0x7b,0x25,0xe2,0x5e,0xcf,0xe5,0x84,
- 0x39,0x31,0x25,0x23,0xa7,0x86,0x62,0xd5, 0xbe,0x7f,0xcb,0xcc,0x98,0xeb,0xf5,0xa8,
- 0x48,0x07,0xef,0xe8,0x36,0xee,0x89,0xa5, 0x26,0x73,0x0d,0xbc,0x2f,0x7b,0xc8,0x40,
- 0x9d,0xad,0x8b,0xbb,0x96,0xc4,0xcd,0xc0, 0x3b,0xc1,0x03,0xe1,0xa1,0x94,0xbb,0xd8};
-
-static AES_KEY encks, decks;
-
-void
-test_vector(const unsigned char *vector,size_t len)
-{
-        unsigned char iv[sizeof(test_iv)];
-        unsigned char cleartext[64],ciphertext[64];
-        size_t tail;
-
-        printf("vector_%zu\n",len);
-        fflush(stdout);
-
-        if ((tail=len%16) == 0) tail = 16;
-        tail += 16;
-
-        /* test block-based encryption */
-        memcpy(iv,test_iv,sizeof(test_iv));
-        CRYPTO_cts128_encrypt_block(test_input,ciphertext,len,&encks,iv,(block128_f)AES_encrypt);
-        if (memcmp(ciphertext,vector,len))
-                fprintf(stderr,"output_%zu mismatch\n",len), exit(1);
-        if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%zu mismatch\n",len), exit(1);
-
-        /* test block-based decryption */
-        memcpy(iv,test_iv,sizeof(test_iv));
-        CRYPTO_cts128_decrypt_block(ciphertext,cleartext,len,&decks,iv,(block128_f)AES_decrypt);
-        if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%zu mismatch\n",len), exit(2);
-        if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%zu mismatch\n",len), exit(2);
-
-        /* test streamed encryption */
-        memcpy(iv,test_iv,sizeof(test_iv));
-        CRYPTO_cts128_encrypt(test_input,ciphertext,len,&encks,iv,(cbc128_f)AES_cbc_encrypt);
-        if (memcmp(ciphertext,vector,len))
-                fprintf(stderr,"output_%zu mismatch\n",len), exit(3);
-        if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%zu mismatch\n",len), exit(3);
-
-        /* test streamed decryption */
-        memcpy(iv,test_iv,sizeof(test_iv));
-        CRYPTO_cts128_decrypt(ciphertext,cleartext,len,&decks,iv,(cbc128_f)AES_cbc_encrypt);
-        if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%zu mismatch\n",len), exit(4);
-        if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%zu mismatch\n",len), exit(4);
-}
-
-void
-test_nistvector(const unsigned char *vector,size_t len)
-{
-        unsigned char iv[sizeof(test_iv)];
-        unsigned char cleartext[64],ciphertext[64],nistvector[64];
-        size_t tail;
-
-        printf("nistvector_%zu\n",len); fflush(stdout);
-
-        if ((tail=len%16) == 0) tail = 16;
-
-        len -= 16 + tail;
-        memcpy(nistvector,vector,len);
-        /* flip two last blocks */
-        memcpy(nistvector+len,vector+len+16,tail);
-        memcpy(nistvector+len+tail,vector+len,16);
-        len += 16 + tail;
-        tail = 16;
-
-        /* test block-based encryption */
-        memcpy(iv,test_iv,sizeof(test_iv));
-        CRYPTO_nistcts128_encrypt_block(test_input,ciphertext,len,&encks,iv,(block128_f)AES_encrypt);
-        if (memcmp(ciphertext,nistvector,len))
-                fprintf(stderr,"output_%zu mismatch\n",len), exit(1);
-        if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%zu mismatch\n",len), exit(1);
-
-        /* test block-based decryption */
-        memcpy(iv,test_iv,sizeof(test_iv));
-        CRYPTO_nistcts128_decrypt_block(ciphertext,cleartext,len,&decks,iv,(block128_f)AES_decrypt);
-        if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%zu mismatch\n",len), exit(2);
-        if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%zu mismatch\n",len), exit(2);
-
-        /* test streamed encryption */
-        memcpy(iv,test_iv,sizeof(test_iv));
-        CRYPTO_nistcts128_encrypt(test_input,ciphertext,len,&encks,iv,(cbc128_f)AES_cbc_encrypt);
-        if (memcmp(ciphertext,nistvector,len))
-                fprintf(stderr,"output_%zu mismatch\n",len), exit(3);
-        if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%zu mismatch\n",len), exit(3);
-
-        /* test streamed decryption */
-        memcpy(iv,test_iv,sizeof(test_iv));
-        CRYPTO_nistcts128_decrypt(ciphertext,cleartext,len,&decks,iv,(cbc128_f)AES_cbc_encrypt);
-        if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%zu mismatch\n",len), exit(4);
-        if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%zu mismatch\n",len), exit(4);
-}
-
-int
-main(int argc, char *argv[])
-{
-        AES_set_encrypt_key(test_key,128,&encks);
-        AES_set_decrypt_key(test_key,128,&decks);
-
-        test_vector(vector_17,sizeof(vector_17));
-        test_vector(vector_31,sizeof(vector_31));
-        test_vector(vector_32,sizeof(vector_32));
-        test_vector(vector_47,sizeof(vector_47));
-        test_vector(vector_48,sizeof(vector_48));
-        test_vector(vector_64,sizeof(vector_64));
-
-        test_nistvector(vector_17,sizeof(vector_17));
-        test_nistvector(vector_31,sizeof(vector_31));
-        test_nistvector(vector_32,sizeof(vector_32));
-        test_nistvector(vector_47,sizeof(vector_47));
-        test_nistvector(vector_48,sizeof(vector_48));
-        test_nistvector(vector_64,sizeof(vector_64));
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/curve25519/Makefile b/src/regress/lib/libcrypto/curve25519/Makefile
deleted file mode 100644
index 1bc4965670..0000000000
--- a/src/regress/lib/libcrypto/curve25519/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2016/11/05 15:09:02 jsing Exp $
-
-PROG=   x25519test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/curve25519/x25519test.c b/src/regress/lib/libcrypto/curve25519/x25519test.c
deleted file mode 100644
index 02da807bd9..0000000000
--- a/src/regress/lib/libcrypto/curve25519/x25519test.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*      $OpenBSD: x25519test.c,v 1.2 2018/07/17 17:06:49 tb Exp $       */
-/*
- * Copyright (c) 2015, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <openssl/curve25519.h>
-
-static int
-x25519_test(void)
-{
-        /* Taken from https://tools.ietf.org/html/rfc7748#section-5.2 */
-        static const uint8_t kScalar1[32] = {
-                0xa5, 0x46, 0xe3, 0x6b, 0xf0, 0x52, 0x7c, 0x9d,
-                0x3b, 0x16, 0x15, 0x4b, 0x82, 0x46, 0x5e, 0xdd,
-                0x62, 0x14, 0x4c, 0x0a, 0xc1, 0xfc, 0x5a, 0x18,
-                0x50, 0x6a, 0x22, 0x44, 0xba, 0x44, 0x9a, 0xc4,
-        };
-        static const uint8_t kPoint1[32] = {
-                0xe6, 0xdb, 0x68, 0x67, 0x58, 0x30, 0x30, 0xdb,
-                0x35, 0x94, 0xc1, 0xa4, 0x24, 0xb1, 0x5f, 0x7c,
-                0x72, 0x66, 0x24, 0xec, 0x26, 0xb3, 0x35, 0x3b,
-                0x10, 0xa9, 0x03, 0xa6, 0xd0, 0xab, 0x1c, 0x4c,
-        };
-        static const uint8_t kExpected1[32] = {
-                0xc3, 0xda, 0x55, 0x37, 0x9d, 0xe9, 0xc6, 0x90,
-                0x8e, 0x94, 0xea, 0x4d, 0xf2, 0x8d, 0x08, 0x4f,
-                0x32, 0xec, 0xcf, 0x03, 0x49, 0x1c, 0x71, 0xf7,
-                0x54, 0xb4, 0x07, 0x55, 0x77, 0xa2, 0x85, 0x52,
-        };
-        static const uint8_t kScalar2[32] = {
-                0x4b, 0x66, 0xe9, 0xd4, 0xd1, 0xb4, 0x67, 0x3c,
-                0x5a, 0xd2, 0x26, 0x91, 0x95, 0x7d, 0x6a, 0xf5,
-                0xc1, 0x1b, 0x64, 0x21, 0xe0, 0xea, 0x01, 0xd4,
-                0x2c, 0xa4, 0x16, 0x9e, 0x79, 0x18, 0xba, 0x0d,
-        };
-        static const uint8_t kPoint2[32] = {
-                0xe5, 0x21, 0x0f, 0x12, 0x78, 0x68, 0x11, 0xd3,
-                0xf4, 0xb7, 0x95, 0x9d, 0x05, 0x38, 0xae, 0x2c,
-                0x31, 0xdb, 0xe7, 0x10, 0x6f, 0xc0, 0x3c, 0x3e,
-                0xfc, 0x4c, 0xd5, 0x49, 0xc7, 0x15, 0xa4, 0x93,
-        };
-        static const uint8_t kExpected2[32] = {
-                0x95, 0xcb, 0xde, 0x94, 0x76, 0xe8, 0x90, 0x7d,
-                0x7a, 0xad, 0xe4, 0x5c, 0xb4, 0xb8, 0x73, 0xf8,
-                0x8b, 0x59, 0x5a, 0x68, 0x79, 0x9f, 0xa1, 0x52,
-                0xe6, 0xf8, 0xf7, 0x64, 0x7a, 0xac, 0x79, 0x57,
-        };
-
-        uint8_t out[32];
-
-        X25519(out, kScalar1, kPoint1);
-        if (memcmp(kExpected1, out, sizeof(out)) != 0) {
-                fprintf(stderr, "X25519 test one failed.\n");
-                return 0;
-        }
-
-        X25519(out, kScalar2, kPoint2);
-        if (memcmp(kExpected2, out, sizeof(out)) != 0) {
-                fprintf(stderr, "X25519 test two failed.\n");
-                return 0;
-        }
-
-        return 1;
-}
-
-static int
-x25519_iterated_test(void)
-{
-        /* Taken from https://tools.ietf.org/html/rfc7748#section-5.2 */
-        static const uint8_t kExpected[32] = {
-                0x68, 0x4c, 0xf5, 0x9b, 0xa8, 0x33, 0x09, 0x55,
-                0x28, 0x00, 0xef, 0x56, 0x6f, 0x2f, 0x4d, 0x3c,
-                0x1c, 0x38, 0x87, 0xc4, 0x93, 0x60, 0xe3, 0x87,
-                0x5f, 0x2e, 0xb9, 0x4d, 0x99, 0x53, 0x2c, 0x51,
-        };
-
-        uint8_t scalar[32] = {9}, point[32] = {9}, out[32];
-        unsigned i;
-
-        for (i = 0; i < 1000; i++) {
-                X25519(out, scalar, point);
-                memcpy(point, scalar, sizeof(point));
-                memcpy(scalar, out, sizeof(scalar));
-        }
-
-        if (memcmp(kExpected, scalar, sizeof(kExpected)) != 0) {
-                fprintf(stderr, "Iterated X25519 test failed\n");
-                return 0;
-        }
-
-        return 1;
-}
-
-static int
-x25519_small_order_test(void)
-{
-        static const uint8_t kSmallOrderPoint[32] = {
-                0xe0, 0xeb, 0x7a, 0x7c, 0x3b, 0x41, 0xb8, 0xae,
-                0x16, 0x56, 0xe3, 0xfa, 0xf1, 0x9f, 0xc4, 0x6a,
-                0xda, 0x09, 0x8d, 0xeb, 0x9c, 0x32, 0xb1, 0xfd,
-                0x86, 0x62, 0x05, 0x16, 0x5f, 0x49, 0xb8, 0x00,
-        };
-
-        uint8_t out[32], private_key[32];
-
-        memset(private_key, 0x11, sizeof(private_key));
-        if (X25519(out, private_key, kSmallOrderPoint)) {
-                fprintf(stderr, "X25519 returned success with a small-order input.\n");
-                return 0;
-        }
-
-        return 1;
-}
-
-int
-main(int argc, char **argv) {
-        if (!x25519_test() ||
-            !x25519_iterated_test() ||
-            !x25519_small_order_test())
-                return 1;
-
-        printf("PASS\n");
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/des/Makefile b/src/regress/lib/libcrypto/des/Makefile
deleted file mode 100644
index 356346730a..0000000000
--- a/src/regress/lib/libcrypto/des/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   destest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/des/destest.c b/src/regress/lib/libcrypto/des/destest.c
deleted file mode 100644
index ebc67f3107..0000000000
--- a/src/regress/lib/libcrypto/des/destest.c
+++ /dev/null
@@ -1,884 +0,0 @@
-/*      $OpenBSD: destest.c,v 1.4 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <string.h>
-
-#include <openssl/des.h>
-
-#define crypt(c,s) (DES_crypt((c),(s)))
-
-/* tisk tisk - the test keys don't all have odd parity :-( */
-/* test data */
-#define NUM_TESTS 34
-static unsigned char key_data[NUM_TESTS][8]={
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10},
-        {0x7C,0xA1,0x10,0x45,0x4A,0x1A,0x6E,0x57},
-        {0x01,0x31,0xD9,0x61,0x9D,0xC1,0x37,0x6E},
-        {0x07,0xA1,0x13,0x3E,0x4A,0x0B,0x26,0x86},
-        {0x38,0x49,0x67,0x4C,0x26,0x02,0x31,0x9E},
-        {0x04,0xB9,0x15,0xBA,0x43,0xFE,0xB5,0xB6},
-        {0x01,0x13,0xB9,0x70,0xFD,0x34,0xF2,0xCE},
-        {0x01,0x70,0xF1,0x75,0x46,0x8F,0xB5,0xE6},
-        {0x43,0x29,0x7F,0xAD,0x38,0xE3,0x73,0xFE},
-        {0x07,0xA7,0x13,0x70,0x45,0xDA,0x2A,0x16},
-        {0x04,0x68,0x91,0x04,0xC2,0xFD,0x3B,0x2F},
-        {0x37,0xD0,0x6B,0xB5,0x16,0xCB,0x75,0x46},
-        {0x1F,0x08,0x26,0x0D,0x1A,0xC2,0x46,0x5E},
-        {0x58,0x40,0x23,0x64,0x1A,0xBA,0x61,0x76},
-        {0x02,0x58,0x16,0x16,0x46,0x29,0xB0,0x07},
-        {0x49,0x79,0x3E,0xBC,0x79,0xB3,0x25,0x8F},
-        {0x4F,0xB0,0x5E,0x15,0x15,0xAB,0x73,0xA7},
-        {0x49,0xE9,0x5D,0x6D,0x4C,0xA2,0x29,0xBF},
-        {0x01,0x83,0x10,0xDC,0x40,0x9B,0x26,0xD6},
-        {0x1C,0x58,0x7F,0x1C,0x13,0x92,0x4F,0xEF},
-        {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
-        {0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
-        {0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10}};
-
-static unsigned char plain_data[NUM_TESTS][8]={
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
-        {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-        {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x01,0xA1,0xD6,0xD0,0x39,0x77,0x67,0x42},
-        {0x5C,0xD5,0x4C,0xA8,0x3D,0xEF,0x57,0xDA},
-        {0x02,0x48,0xD4,0x38,0x06,0xF6,0x71,0x72},
-        {0x51,0x45,0x4B,0x58,0x2D,0xDF,0x44,0x0A},
-        {0x42,0xFD,0x44,0x30,0x59,0x57,0x7F,0xA2},
-        {0x05,0x9B,0x5E,0x08,0x51,0xCF,0x14,0x3A},
-        {0x07,0x56,0xD8,0xE0,0x77,0x47,0x61,0xD2},
-        {0x76,0x25,0x14,0xB8,0x29,0xBF,0x48,0x6A},
-        {0x3B,0xDD,0x11,0x90,0x49,0x37,0x28,0x02},
-        {0x26,0x95,0x5F,0x68,0x35,0xAF,0x60,0x9A},
-        {0x16,0x4D,0x5E,0x40,0x4F,0x27,0x52,0x32},
-        {0x6B,0x05,0x6E,0x18,0x75,0x9F,0x5C,0xCA},
-        {0x00,0x4B,0xD6,0xEF,0x09,0x17,0x60,0x62},
-        {0x48,0x0D,0x39,0x00,0x6E,0xE7,0x62,0xF2},
-        {0x43,0x75,0x40,0xC8,0x69,0x8F,0x3C,0xFA},
-        {0x07,0x2D,0x43,0xA0,0x77,0x07,0x52,0x92},
-        {0x02,0xFE,0x55,0x77,0x81,0x17,0xF1,0x2A},
-        {0x1D,0x9D,0x5C,0x50,0x18,0xF7,0x28,0xC2},
-        {0x30,0x55,0x32,0x28,0x6D,0x6F,0x29,0x5A},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}};
-
-static unsigned char cipher_data[NUM_TESTS][8]={
-        {0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7},
-        {0x73,0x59,0xB2,0x16,0x3E,0x4E,0xDC,0x58},
-        {0x95,0x8E,0x6E,0x62,0x7A,0x05,0x55,0x7B},
-        {0xF4,0x03,0x79,0xAB,0x9E,0x0E,0xC5,0x33},
-        {0x17,0x66,0x8D,0xFC,0x72,0x92,0x53,0x2D},
-        {0x8A,0x5A,0xE1,0xF8,0x1A,0xB8,0xF2,0xDD},
-        {0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7},
-        {0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4},
-        {0x69,0x0F,0x5B,0x0D,0x9A,0x26,0x93,0x9B},
-        {0x7A,0x38,0x9D,0x10,0x35,0x4B,0xD2,0x71},
-        {0x86,0x8E,0xBB,0x51,0xCA,0xB4,0x59,0x9A},
-        {0x71,0x78,0x87,0x6E,0x01,0xF1,0x9B,0x2A},
-        {0xAF,0x37,0xFB,0x42,0x1F,0x8C,0x40,0x95},
-        {0x86,0xA5,0x60,0xF1,0x0E,0xC6,0xD8,0x5B},
-        {0x0C,0xD3,0xDA,0x02,0x00,0x21,0xDC,0x09},
-        {0xEA,0x67,0x6B,0x2C,0xB7,0xDB,0x2B,0x7A},
-        {0xDF,0xD6,0x4A,0x81,0x5C,0xAF,0x1A,0x0F},
-        {0x5C,0x51,0x3C,0x9C,0x48,0x86,0xC0,0x88},
-        {0x0A,0x2A,0xEE,0xAE,0x3F,0xF4,0xAB,0x77},
-        {0xEF,0x1B,0xF0,0x3E,0x5D,0xFA,0x57,0x5A},
-        {0x88,0xBF,0x0D,0xB6,0xD7,0x0D,0xEE,0x56},
-        {0xA1,0xF9,0x91,0x55,0x41,0x02,0x0B,0x56},
-        {0x6F,0xBF,0x1C,0xAF,0xCF,0xFD,0x05,0x56},
-        {0x2F,0x22,0xE4,0x9B,0xAB,0x7C,0xA1,0xAC},
-        {0x5A,0x6B,0x61,0x2C,0xC2,0x6C,0xCE,0x4A},
-        {0x5F,0x4C,0x03,0x8E,0xD1,0x2B,0x2E,0x41},
-        {0x63,0xFA,0xC0,0xD0,0x34,0xD9,0xF7,0x93},
-        {0x61,0x7B,0x3A,0x0C,0xE8,0xF0,0x71,0x00},
-        {0xDB,0x95,0x86,0x05,0xF8,0xC8,0xC6,0x06},
-        {0xED,0xBF,0xD1,0xC6,0x6C,0x29,0xCC,0xC7},
-        {0x35,0x55,0x50,0xB2,0x15,0x0E,0x24,0x51},
-        {0xCA,0xAA,0xAF,0x4D,0xEA,0xF1,0xDB,0xAE},
-        {0xD5,0xD4,0x4F,0xF7,0x20,0x68,0x3D,0x0D},
-        {0x2A,0x2B,0xB0,0x08,0xDF,0x97,0xC2,0xF2}};
-
-static unsigned char cipher_ecb2[NUM_TESTS-1][8]={
-        {0x92,0x95,0xB5,0x9B,0xB3,0x84,0x73,0x6E},
-        {0x19,0x9E,0x9D,0x6D,0xF3,0x9A,0xA8,0x16},
-        {0x2A,0x4B,0x4D,0x24,0x52,0x43,0x84,0x27},
-        {0x35,0x84,0x3C,0x01,0x9D,0x18,0xC5,0xB6},
-        {0x4A,0x5B,0x2F,0x42,0xAA,0x77,0x19,0x25},
-        {0xA0,0x6B,0xA9,0xB8,0xCA,0x5B,0x17,0x8A},
-        {0xAB,0x9D,0xB7,0xFB,0xED,0x95,0xF2,0x74},
-        {0x3D,0x25,0x6C,0x23,0xA7,0x25,0x2F,0xD6},
-        {0xB7,0x6F,0xAB,0x4F,0xBD,0xBD,0xB7,0x67},
-        {0x8F,0x68,0x27,0xD6,0x9C,0xF4,0x1A,0x10},
-        {0x82,0x57,0xA1,0xD6,0x50,0x5E,0x81,0x85},
-        {0xA2,0x0F,0x0A,0xCD,0x80,0x89,0x7D,0xFA},
-        {0xCD,0x2A,0x53,0x3A,0xDB,0x0D,0x7E,0xF3},
-        {0xD2,0xC2,0xBE,0x27,0xE8,0x1B,0x68,0xE3},
-        {0xE9,0x24,0xCF,0x4F,0x89,0x3C,0x5B,0x0A},
-        {0xA7,0x18,0xC3,0x9F,0xFA,0x9F,0xD7,0x69},
-        {0x77,0x2C,0x79,0xB1,0xD2,0x31,0x7E,0xB1},
-        {0x49,0xAB,0x92,0x7F,0xD0,0x22,0x00,0xB7},
-        {0xCE,0x1C,0x6C,0x7D,0x85,0xE3,0x4A,0x6F},
-        {0xBE,0x91,0xD6,0xE1,0x27,0xB2,0xE9,0x87},
-        {0x70,0x28,0xAE,0x8F,0xD1,0xF5,0x74,0x1A},
-        {0xAA,0x37,0x80,0xBB,0xF3,0x22,0x1D,0xDE},
-        {0xA6,0xC4,0xD2,0x5E,0x28,0x93,0xAC,0xB3},
-        {0x22,0x07,0x81,0x5A,0xE4,0xB7,0x1A,0xAD},
-        {0xDC,0xCE,0x05,0xE7,0x07,0xBD,0xF5,0x84},
-        {0x26,0x1D,0x39,0x2C,0xB3,0xBA,0xA5,0x85},
-        {0xB4,0xF7,0x0F,0x72,0xFB,0x04,0xF0,0xDC},
-        {0x95,0xBA,0xA9,0x4E,0x87,0x36,0xF2,0x89},
-        {0xD4,0x07,0x3A,0xF1,0x5A,0x17,0x82,0x0E},
-        {0xEF,0x6F,0xAF,0xA7,0x66,0x1A,0x7E,0x89},
-        {0xC1,0x97,0xF5,0x58,0x74,0x8A,0x20,0xE7},
-        {0x43,0x34,0xCF,0xDA,0x22,0xC4,0x86,0xC8},
-        {0x08,0xD7,0xB4,0xFB,0x62,0x9D,0x08,0x85}};
-
-static unsigned char cbc_key [8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-static unsigned char cbc2_key[8]={0xf1,0xe0,0xd3,0xc2,0xb5,0xa4,0x97,0x86};
-static unsigned char cbc3_key[8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
-static unsigned char cbc_iv  [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
-/* Changed the following text constant to binary so it will work on ebcdic
- * machines :-) */
-/* static char cbc_data[40]="7654321 Now is the time for \0001"; */
-static unsigned char cbc_data[40]={
-        0x37,0x36,0x35,0x34,0x33,0x32,0x31,0x20,
-        0x4E,0x6F,0x77,0x20,0x69,0x73,0x20,0x74,
-        0x68,0x65,0x20,0x74,0x69,0x6D,0x65,0x20,
-        0x66,0x6F,0x72,0x20,0x00,0x31,0x00,0x00,
-        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-        };
-
-static unsigned char cbc_ok[32]={
-        0xcc,0xd1,0x73,0xff,0xab,0x20,0x39,0xf4,
-        0xac,0xd8,0xae,0xfd,0xdf,0xd8,0xa1,0xeb,
-        0x46,0x8e,0x91,0x15,0x78,0x88,0xba,0x68,
-        0x1d,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
-
-#ifdef SCREW_THE_PARITY
-#error "SCREW_THE_PARITY is not ment to be defined."
-#error "Original vectors are preserved for reference only."
-static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87};
-static unsigned char xcbc_ok[32]={
-        0x86,0x74,0x81,0x0D,0x61,0xA4,0xA5,0x48,
-        0xB9,0x93,0x03,0xE1,0xB8,0xBB,0xBD,0xBD,
-        0x64,0x30,0x0B,0xB9,0x06,0x65,0x81,0x76,
-        0x04,0x1D,0x77,0x62,0x17,0xCA,0x2B,0xD2,
-        };
-#else
-static unsigned char xcbc_ok[32]={
-        0x84,0x6B,0x29,0x14,0x85,0x1E,0x9A,0x29,
-        0x54,0x73,0x2F,0x8A,0xA0,0xA6,0x11,0xC1,
-        0x15,0xCD,0xC2,0xD7,0x95,0x1B,0x10,0x53,
-        0xA6,0x3C,0x5E,0x03,0xB2,0x1A,0xA3,0xC4,
-        };
-#endif
-
-static unsigned char cbc3_ok[32]={
-        0x3F,0xE3,0x01,0xC9,0x62,0xAC,0x01,0xD0,
-        0x22,0x13,0x76,0x3C,0x1C,0xBD,0x4C,0xDC,
-        0x79,0x96,0x57,0xC0,0x64,0xEC,0xF5,0xD4,
-        0x1C,0x67,0x38,0x12,0xCF,0xDE,0x96,0x75};
-
-static unsigned char pcbc_ok[32]={
-        0xcc,0xd1,0x73,0xff,0xab,0x20,0x39,0xf4,
-        0x6d,0xec,0xb4,0x70,0xa0,0xe5,0x6b,0x15,
-        0xae,0xa6,0xbf,0x61,0xed,0x7d,0x9c,0x9f,
-        0xf7,0x17,0x46,0x3b,0x8a,0xb3,0xcc,0x88};
-
-static unsigned char cfb_key[8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-static unsigned char cfb_iv[8]={0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef};
-static unsigned char cfb_buf1[40],cfb_buf2[40],cfb_tmp[8];
-static unsigned char plain[24]=
-        {
-        0x4e,0x6f,0x77,0x20,0x69,0x73,
-        0x20,0x74,0x68,0x65,0x20,0x74,
-        0x69,0x6d,0x65,0x20,0x66,0x6f,
-        0x72,0x20,0x61,0x6c,0x6c,0x20
-        };
-static unsigned char cfb_cipher8[24]= {
-        0xf3,0x1f,0xda,0x07,0x01,0x14, 0x62,0xee,0x18,0x7f,0x43,0xd8,
-        0x0a,0x7c,0xd9,0xb5,0xb0,0xd2, 0x90,0xda,0x6e,0x5b,0x9a,0x87 };
-static unsigned char cfb_cipher16[24]={
-        0xF3,0x09,0x87,0x87,0x7F,0x57, 0xF7,0x3C,0x36,0xB6,0xDB,0x70,
-        0xD8,0xD5,0x34,0x19,0xD3,0x86, 0xB2,0x23,0xB7,0xB2,0xAD,0x1B };
-static unsigned char cfb_cipher32[24]={
-        0xF3,0x09,0x62,0x49,0xA4,0xDF, 0xA4,0x9F,0x33,0xDC,0x7B,0xAD,
-        0x4C,0xC8,0x9F,0x64,0xE4,0x53, 0xE5,0xEC,0x67,0x20,0xDA,0xB6 };
-static unsigned char cfb_cipher48[24]={
-        0xF3,0x09,0x62,0x49,0xC7,0xF4, 0x30,0xB5,0x15,0xEC,0xBB,0x85,
-        0x97,0x5A,0x13,0x8C,0x68,0x60, 0xE2,0x38,0x34,0x3C,0xDC,0x1F };
-static unsigned char cfb_cipher64[24]={
-        0xF3,0x09,0x62,0x49,0xC7,0xF4, 0x6E,0x51,0xA6,0x9E,0x83,0x9B,
-        0x1A,0x92,0xF7,0x84,0x03,0x46, 0x71,0x33,0x89,0x8E,0xA6,0x22 };
-
-static unsigned char ofb_key[8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-static unsigned char ofb_iv[8]={0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef};
-static unsigned char ofb_buf1[24],ofb_buf2[24],ofb_tmp[8];
-static unsigned char ofb_cipher[24]=
-        {
-        0xf3,0x09,0x62,0x49,0xc7,0xf4,0x6e,0x51,
-        0x35,0xf2,0x4a,0x24,0x2e,0xeb,0x3d,0x3f,
-        0x3d,0x6d,0x5b,0xe3,0x25,0x5a,0xf8,0xc3
-        };
-
-#if 0
-static DES_LONG cbc_cksum_ret=0xB462FEF7L;
-#else
-static DES_LONG cbc_cksum_ret=0xF7FE62B4L;
-#endif
-static unsigned char cbc_cksum_data[8]={0x1D,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
-
-static char *pt(unsigned char *p);
-static int cfb_test(int bits, unsigned char *cfb_cipher);
-static int cfb64_test(unsigned char *cfb_cipher);
-static int ede_cfb64_test(unsigned char *cfb_cipher);
-int main(int argc, char *argv[])
-        {
-        int j,err=0;
-        unsigned int i;
-        DES_cblock in,out,outin,iv3,iv2;
-        DES_key_schedule ks,ks2,ks3;
-        unsigned char cbc_in[40];
-        unsigned char cbc_out[40];
-        DES_LONG cs;
-        unsigned char cret[8];
-        DES_LONG lqret[4];
-        int num;
-        char *str;
-
-#ifndef OPENSSL_NO_DESCBCM
-        printf("Doing cbcm\n");
-        if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        if ((j=DES_set_key_checked(&cbc2_key,&ks2)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        if ((j=DES_set_key_checked(&cbc3_key,&ks3)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        memset(cbc_out,0,40);
-        memset(cbc_in,0,40);
-        i=strlen((char *)cbc_data)+1;
-        /* i=((i+7)/8)*8; */
-        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-        memset(iv2,'\0',sizeof iv2);
-
-        DES_ede3_cbcm_encrypt(cbc_data,cbc_out,16L,&ks,&ks2,&ks3,&iv3,&iv2,
-                              DES_ENCRYPT);
-        DES_ede3_cbcm_encrypt(&cbc_data[16],&cbc_out[16],i-16,&ks,&ks2,&ks3,
-                              &iv3,&iv2,DES_ENCRYPT);
-        /*      if (memcmp(cbc_out,cbc3_ok,
-                (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
-                {
-                printf("des_ede3_cbc_encrypt encrypt error\n");
-                err=1;
-                }
-        */
-        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-        memset(iv2,'\0',sizeof iv2);
-        DES_ede3_cbcm_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,&iv2,DES_DECRYPT);
-        if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
-                {
-                unsigned int n;
-
-                printf("des_ede3_cbcm_encrypt decrypt error\n");
-                for(n=0 ; n < i ; ++n)
-                    printf(" %02x",cbc_data[n]);
-                printf("\n");
-                for(n=0 ; n < i ; ++n)
-                    printf(" %02x",cbc_in[n]);
-                printf("\n");
-                err=1;
-                }
-#endif
-
-        printf("Doing ecb\n");
-        for (i=0; i<NUM_TESTS; i++)
-                {
-                DES_set_key_unchecked(&key_data[i],&ks);
-                memcpy(in,plain_data[i],8);
-                memset(out,0,8);
-                memset(outin,0,8);
-                DES_ecb_encrypt(&in,&out,&ks,DES_ENCRYPT);
-                DES_ecb_encrypt(&out,&outin,&ks,DES_DECRYPT);
-
-                if (memcmp(out,cipher_data[i],8) != 0)
-                        {
-                        printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
-                                i+1,pt(key_data[i]),pt(in),pt(cipher_data[i]),
-                                pt(out));
-                        err=1;
-                        }
-                if (memcmp(in,outin,8) != 0)
-                        {
-                        printf("Decryption error %2d\nk=%s p=%s o=%s act=%s\n",
-                                i+1,pt(key_data[i]),pt(out),pt(in),pt(outin));
-                        err=1;
-                        }
-                }
-
-        printf("Doing ede ecb\n");
-        for (i=0; i<(NUM_TESTS-2); i++)
-                {
-                DES_set_key_unchecked(&key_data[i],&ks);
-                DES_set_key_unchecked(&key_data[i+1],&ks2);
-                DES_set_key_unchecked(&key_data[i+2],&ks3);
-                memcpy(in,plain_data[i],8);
-                memset(out,0,8);
-                memset(outin,0,8);
-                DES_ecb3_encrypt(&in,&out,&ks,&ks2,&ks,DES_ENCRYPT);
-                DES_ecb3_encrypt(&out,&outin,&ks,&ks2,&ks,DES_DECRYPT);
-
-                if (memcmp(out,cipher_ecb2[i],8) != 0)
-                        {
-                        printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
-                                i+1,pt(key_data[i]),pt(in),pt(cipher_ecb2[i]),
-                                pt(out));
-                        err=1;
-                        }
-                if (memcmp(in,outin,8) != 0)
-                        {
-                        printf("Decryption error %2d\nk=%s p=%s o=%s act=%s\n",
-                                i+1,pt(key_data[i]),pt(out),pt(in),pt(outin));
-                        err=1;
-                        }
-                }
-
-        printf("Doing cbc\n");
-        if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        memset(cbc_out,0,40);
-        memset(cbc_in,0,40);
-        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-        DES_ncbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,&ks,
-                         &iv3,DES_ENCRYPT);
-        if (memcmp(cbc_out,cbc_ok,32) != 0)
-                {
-                printf("cbc_encrypt encrypt error\n");
-                err=1;
-                }
-
-        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-        DES_ncbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,&ks,
-                         &iv3,DES_DECRYPT);
-        if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)) != 0)
-                {
-                printf("cbc_encrypt decrypt error\n");
-                err=1;
-                }
-
-        printf("Doing desx cbc\n");
-        if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        memset(cbc_out,0,40);
-        memset(cbc_in,0,40);
-        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-        DES_xcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,&ks,
-                         &iv3,&cbc2_key,&cbc3_key, DES_ENCRYPT);
-        if (memcmp(cbc_out,xcbc_ok,32) != 0)
-                {
-                printf("des_xcbc_encrypt encrypt error\n");
-                err=1;
-                }
-        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-        DES_xcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,&ks,
-                         &iv3,&cbc2_key,&cbc3_key, DES_DECRYPT);
-        if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
-                {
-                printf("des_xcbc_encrypt decrypt error\n");
-                err=1;
-                }
-
-        printf("Doing ede cbc\n");
-        if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        if ((j=DES_set_key_checked(&cbc2_key,&ks2)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        if ((j=DES_set_key_checked(&cbc3_key,&ks3)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        memset(cbc_out,0,40);
-        memset(cbc_in,0,40);
-        i=strlen((char *)cbc_data)+1;
-        /* i=((i+7)/8)*8; */
-        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-
-        DES_ede3_cbc_encrypt(cbc_data,cbc_out,16L,&ks,&ks2,&ks3,&iv3,
-                             DES_ENCRYPT);
-        DES_ede3_cbc_encrypt(&(cbc_data[16]),&(cbc_out[16]),i-16,&ks,&ks2,&ks3,
-                             &iv3,DES_ENCRYPT);
-        if (memcmp(cbc_out,cbc3_ok,
-                (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
-                {
-                unsigned int n;
-
-                printf("des_ede3_cbc_encrypt encrypt error\n");
-                for(n=0 ; n < i ; ++n)
-                    printf(" %02x",cbc_out[n]);
-                printf("\n");
-                for(n=0 ; n < i ; ++n)
-                    printf(" %02x",cbc3_ok[n]);
-                printf("\n");
-                err=1;
-                }
-
-        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-        DES_ede3_cbc_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,DES_DECRYPT);
-        if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
-                {
-                unsigned int n;
-
-                printf("des_ede3_cbc_encrypt decrypt error\n");
-                for(n=0 ; n < i ; ++n)
-                    printf(" %02x",cbc_data[n]);
-                printf("\n");
-                for(n=0 ; n < i ; ++n)
-                    printf(" %02x",cbc_in[n]);
-                printf("\n");
-                err=1;
-                }
-
-        printf("Doing pcbc\n");
-        if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
-                {
-                printf("Key error %d\n",j);
-                err=1;
-                }
-        memset(cbc_out,0,40);
-        memset(cbc_in,0,40);
-        DES_pcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,&ks,
-                         &cbc_iv,DES_ENCRYPT);
-        if (memcmp(cbc_out,pcbc_ok,32) != 0)
-                {
-                printf("pcbc_encrypt encrypt error\n");
-                err=1;
-                }
-        DES_pcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,&ks,&cbc_iv,
-                         DES_DECRYPT);
-        if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
-                {
-                printf("pcbc_encrypt decrypt error\n");
-                err=1;
-                }
-
-        printf("Doing ");
-        printf("cfb8 ");
-        err+=cfb_test(8,cfb_cipher8);
-        printf("cfb16 ");
-        err+=cfb_test(16,cfb_cipher16);
-        printf("cfb32 ");
-        err+=cfb_test(32,cfb_cipher32);
-        printf("cfb48 ");
-        err+=cfb_test(48,cfb_cipher48);
-        printf("cfb64 ");
-        err+=cfb_test(64,cfb_cipher64);
-
-        printf("cfb64() ");
-        err+=cfb64_test(cfb_cipher64);
-
-        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-        for (i=0; i<sizeof(plain); i++)
-                DES_cfb_encrypt(&(plain[i]),&(cfb_buf1[i]),
-                        8,1,&ks,&cfb_tmp,DES_ENCRYPT);
-        if (memcmp(cfb_cipher8,cfb_buf1,sizeof(plain)) != 0)
-                {
-                printf("cfb_encrypt small encrypt error\n");
-                err=1;
-                }
-
-        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-        for (i=0; i<sizeof(plain); i++)
-                DES_cfb_encrypt(&(cfb_buf1[i]),&(cfb_buf2[i]),
-                        8,1,&ks,&cfb_tmp,DES_DECRYPT);
-        if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
-                {
-                printf("cfb_encrypt small decrypt error\n");
-                err=1;
-                }
-
-        printf("ede_cfb64() ");
-        err+=ede_cfb64_test(cfb_cipher64);
-
-        printf("done\n");
-
-        printf("Doing ofb\n");
-        DES_set_key_checked(&ofb_key,&ks);
-        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-        DES_ofb_encrypt(plain,ofb_buf1,64,sizeof(plain)/8,&ks,&ofb_tmp);
-        if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
-                {
-                printf("ofb_encrypt encrypt error\n");
-printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
-ofb_buf1[8+0], ofb_buf1[8+1], ofb_buf1[8+2], ofb_buf1[8+3],
-ofb_buf1[8+4], ofb_buf1[8+5], ofb_buf1[8+6], ofb_buf1[8+7]);
-printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
-ofb_buf1[8+0], ofb_cipher[8+1], ofb_cipher[8+2], ofb_cipher[8+3],
-ofb_buf1[8+4], ofb_cipher[8+5], ofb_cipher[8+6], ofb_cipher[8+7]);
-                err=1;
-                }
-        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-        DES_ofb_encrypt(ofb_buf1,ofb_buf2,64,sizeof(ofb_buf1)/8,&ks,&ofb_tmp);
-        if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
-                {
-                printf("ofb_encrypt decrypt error\n");
-printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
-ofb_buf2[8+0], ofb_buf2[8+1], ofb_buf2[8+2], ofb_buf2[8+3],
-ofb_buf2[8+4], ofb_buf2[8+5], ofb_buf2[8+6], ofb_buf2[8+7]);
-printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
-plain[8+0], plain[8+1], plain[8+2], plain[8+3],
-plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
-                err=1;
-                }
-
-        printf("Doing ofb64\n");
-        DES_set_key_checked(&ofb_key,&ks);
-        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-        memset(ofb_buf1,0,sizeof(ofb_buf1));
-        memset(ofb_buf2,0,sizeof(ofb_buf1));
-        num=0;
-        for (i=0; i<sizeof(plain); i++)
-                {
-                DES_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,&ks,&ofb_tmp,
-                                  &num);
-                }
-        if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
-                {
-                printf("ofb64_encrypt encrypt error\n");
-                err=1;
-                }
-        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-        num=0;
-        DES_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),&ks,&ofb_tmp,
-                          &num);
-        if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
-                {
-                printf("ofb64_encrypt decrypt error\n");
-                err=1;
-                }
-
-        printf("Doing ede_ofb64\n");
-        DES_set_key_checked(&ofb_key,&ks);
-        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-        memset(ofb_buf1,0,sizeof(ofb_buf1));
-        memset(ofb_buf2,0,sizeof(ofb_buf1));
-        num=0;
-        for (i=0; i<sizeof(plain); i++)
-                {
-                DES_ede3_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,&ks,&ks,
-                                       &ks,&ofb_tmp,&num);
-                }
-        if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
-                {
-                printf("ede_ofb64_encrypt encrypt error\n");
-                err=1;
-                }
-        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-        num=0;
-        DES_ede3_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),&ks,&ks,&ks,
-                               &ofb_tmp,&num);
-        if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
-                {
-                printf("ede_ofb64_encrypt decrypt error\n");
-                err=1;
-                }
-
-        printf("Doing cbc_cksum\n");
-        DES_set_key_checked(&cbc_key,&ks);
-        cs=DES_cbc_cksum(cbc_data,&cret,strlen((char *)cbc_data),&ks,&cbc_iv);
-        if (cs != cbc_cksum_ret)
-                {
-                printf("bad return value (%08lX), should be %08lX\n",
-                        (unsigned long)cs,(unsigned long)cbc_cksum_ret);
-                err=1;
-                }
-        if (memcmp(cret,cbc_cksum_data,8) != 0)
-                {
-                printf("bad cbc_cksum block returned\n");
-                err=1;
-                }
-
-        printf("Doing quad_cksum\n");
-        cs=DES_quad_cksum(cbc_data,(DES_cblock *)lqret,
-                (long)strlen((char *)cbc_data),2,(DES_cblock *)cbc_iv);
-        if (cs != 0x70d7a63aL)
-                {
-                printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
-                        (unsigned long)cs);
-                err=1;
-                }
-        if (lqret[0] != 0x327eba8dL)
-                {
-                printf("quad_cksum error, out[0] %08lx is not %08lx\n",
-                        (unsigned long)lqret[0],0x327eba8dUL);
-                err=1;
-                }
-        if (lqret[1] != 0x201a49ccL)
-                {
-                printf("quad_cksum error, out[1] %08lx is not %08lx\n",
-                        (unsigned long)lqret[1],0x201a49ccUL);
-                err=1;
-                }
-        if (lqret[2] != 0x70d7a63aL)
-                {
-                printf("quad_cksum error, out[2] %08lx is not %08lx\n",
-                        (unsigned long)lqret[2],0x70d7a63aUL);
-                err=1;
-                }
-        if (lqret[3] != 0x501c2c26L)
-                {
-                printf("quad_cksum error, out[3] %08lx is not %08lx\n",
-                        (unsigned long)lqret[3],0x501c2c26UL);
-                err=1;
-                }
-
-        printf("input word alignment test");
-        for (i=0; i<4; i++)
-                {
-                printf(" %u",i);
-                DES_ncbc_encrypt(&(cbc_out[i]),cbc_in,
-                                 strlen((char *)cbc_data)+1,&ks,
-                                 &cbc_iv,DES_ENCRYPT);
-                }
-        printf("\noutput word alignment test");
-        for (i=0; i<4; i++)
-                {
-                printf(" %u",i);
-                DES_ncbc_encrypt(cbc_out,&(cbc_in[i]),
-                                 strlen((char *)cbc_data)+1,&ks,
-                                 &cbc_iv,DES_ENCRYPT);
-                }
-        printf("\n");
-        printf("fast crypt test ");
-        str=crypt("testing","ef");
-        if (strcmp("efGnQx2725bI2",str) != 0)
-                {
-                printf("fast crypt error, %s should be efGnQx2725bI2\n",str);
-                err=1;
-                }
-        str=crypt("bca76;23","yA");
-        if (strcmp("yA1Rp/1hZXIJk",str) != 0)
-                {
-                printf("fast crypt error, %s should be yA1Rp/1hZXIJk\n",str);
-                err=1;
-                }
-        printf("\n");
-        return(err);
-        }
-
-static char *pt(unsigned char *p)
-        {
-        static char bufs[10][20];
-        static int bnum=0;
-        char *ret;
-        int i;
-        static char *f="0123456789ABCDEF";
-
-        ret= &(bufs[bnum++][0]);
-        bnum%=10;
-        for (i=0; i<8; i++)
-                {
-                ret[i*2]=f[(p[i]>>4)&0xf];
-                ret[i*2+1]=f[p[i]&0xf];
-                }
-        ret[16]='\0';
-        return(ret);
-        }
-
-static int cfb_test(int bits, unsigned char *cfb_cipher)
-        {
-        DES_key_schedule ks;
-        int i,err=0;
-
-        DES_set_key_checked(&cfb_key,&ks);
-        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-        DES_cfb_encrypt(plain,cfb_buf1,bits,sizeof(plain),&ks,&cfb_tmp,
-                        DES_ENCRYPT);
-        if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
-                {
-                err=1;
-                printf("cfb_encrypt encrypt error\n");
-                for (i=0; i<24; i+=8)
-                        printf("%s\n",pt(&(cfb_buf1[i])));
-                }
-        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-        DES_cfb_encrypt(cfb_buf1,cfb_buf2,bits,sizeof(plain),&ks,&cfb_tmp,
-                        DES_DECRYPT);
-        if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
-                {
-                err=1;
-                printf("cfb_encrypt decrypt error\n");
-                for (i=0; i<24; i+=8)
-                        printf("%s\n",pt(&(cfb_buf1[i])));
-                }
-        return(err);
-        }
-
-static int cfb64_test(unsigned char *cfb_cipher)
-        {
-        DES_key_schedule ks;
-        int err=0,i,n;
-
-        DES_set_key_checked(&cfb_key,&ks);
-        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-        n=0;
-        DES_cfb64_encrypt(plain,cfb_buf1,12,&ks,&cfb_tmp,&n,DES_ENCRYPT);
-        DES_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),sizeof(plain)-12,&ks,
-                          &cfb_tmp,&n,DES_ENCRYPT);
-        if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
-                {
-                err=1;
-                printf("cfb_encrypt encrypt error\n");
-                for (i=0; i<24; i+=8)
-                        printf("%s\n",pt(&(cfb_buf1[i])));
-                }
-        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-        n=0;
-        DES_cfb64_encrypt(cfb_buf1,cfb_buf2,17,&ks,&cfb_tmp,&n,DES_DECRYPT);
-        DES_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
-                          sizeof(plain)-17,&ks,&cfb_tmp,&n,DES_DECRYPT);
-        if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
-                {
-                err=1;
-                printf("cfb_encrypt decrypt error\n");
-                for (i=0; i<24; i+=8)
-                        printf("%s\n",pt(&(cfb_buf2[i])));
-                }
-        return(err);
-        }
-
-static int ede_cfb64_test(unsigned char *cfb_cipher)
-        {
-        DES_key_schedule ks;
-        int err=0,i,n;
-
-        DES_set_key_checked(&cfb_key,&ks);
-        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-        n=0;
-        DES_ede3_cfb64_encrypt(plain,cfb_buf1,12,&ks,&ks,&ks,&cfb_tmp,&n,
-                               DES_ENCRYPT);
-        DES_ede3_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
-                               sizeof(plain)-12,&ks,&ks,&ks,
-                               &cfb_tmp,&n,DES_ENCRYPT);
-        if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
-                {
-                err=1;
-                printf("ede_cfb_encrypt encrypt error\n");
-                for (i=0; i<24; i+=8)
-                        printf("%s\n",pt(&(cfb_buf1[i])));
-                }
-        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-        n=0;
-        DES_ede3_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,&ks,&ks,&ks,
-                               &cfb_tmp,&n,DES_DECRYPT);
-        DES_ede3_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
-                               sizeof(plain)-17,&ks,&ks,&ks,
-                               &cfb_tmp,&n,DES_DECRYPT);
-        if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
-                {
-                err=1;
-                printf("ede_cfb_encrypt decrypt error\n");
-                for (i=0; i<24; i+=8)
-                        printf("%s\n",pt(&(cfb_buf2[i])));
-                }
-        return(err);
-        }
diff --git a/src/regress/lib/libcrypto/dh/Makefile b/src/regress/lib/libcrypto/dh/Makefile
deleted file mode 100644
index 3eaacc4296..0000000000
--- a/src/regress/lib/libcrypto/dh/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   dhtest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/dh/dhtest.c b/src/regress/lib/libcrypto/dh/dhtest.c
deleted file mode 100644
index 599c51d5ed..0000000000
--- a/src/regress/lib/libcrypto/dh/dhtest.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*      $OpenBSD: dhtest.c,v 1.5 2018/07/17 17:06:49 tb Exp $   */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/crypto.h>
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-
-#include <openssl/dh.h>
-
-static int cb(int p, int n, BN_GENCB *arg)
-{
-        char c='*';
-
-        if (p == 0)
-                c='.';
-        if (p == 1)
-                c='+';
-        if (p == 2)
-                c='*';
-        if (p == 3)
-                c='\n';
-        BIO_write(arg->arg,&c,1);
-        (void)BIO_flush(arg->arg);
-        return 1;
-}
-
-int main(int argc, char *argv[])
-{
-        BN_GENCB _cb;
-        DH *a;
-        char buf[12];
-        unsigned char *abuf=NULL;
-        int i,alen,aout,ret=1;
-        BIO *out;
-
-        out=BIO_new(BIO_s_file());
-        if (out == NULL) exit(1);
-        BIO_set_fp(out,stdout,BIO_NOCLOSE);
-
-        BN_GENCB_set(&_cb, &cb, out);
-        if (((a = DH_new()) == NULL) ||
-            !DH_generate_parameters_ex(a, 64, DH_GENERATOR_5, &_cb))
-                goto err;
-
-        if (!DH_check(a, &i))
-                goto err;
-        if (i & DH_CHECK_P_NOT_PRIME)
-                BIO_puts(out, "p value is not prime\n");
-        if (i & DH_CHECK_P_NOT_SAFE_PRIME)
-                BIO_puts(out, "p value is not a safe prime\n");
-        if (i & DH_UNABLE_TO_CHECK_GENERATOR)
-                BIO_puts(out, "unable to check the generator value\n");
-        if (i & DH_NOT_SUITABLE_GENERATOR)
-                BIO_puts(out, "the g value is not a generator\n");
-
-        BIO_puts(out,"\np    =");
-        BN_print(out,a->p);
-        BIO_puts(out,"\ng    =");
-        BN_print(out,a->g);
-        BIO_puts(out,"\n");
-
-        if (!DH_generate_key(a))
-                goto err;
-        BIO_puts(out,"pri 1=");
-        BN_print(out,a->priv_key);
-        BIO_puts(out,"\npub 1=");
-        BN_print(out,a->pub_key);
-        BIO_puts(out,"\n");
-
-        alen=DH_size(a);
-        abuf=malloc(alen);
-        aout=DH_compute_key(abuf,a->pub_key,a);
-
-        BIO_puts(out,"key1 =");
-        for (i=0; i<aout; i++) {
-                snprintf(buf,sizeof buf,"%02X",abuf[i]);
-                BIO_puts(out,buf);
-        }
-        BIO_puts(out,"\n");
-
-        if (aout < 4) {
-                fprintf(stderr,"Error in DH routines\n");
-                ret=1;
-        } else
-                ret=0;
-err:
-        ERR_print_errors_fp(stderr);
-
-        free(abuf);
-        if (a != NULL)
-                DH_free(a);
-        BIO_free(out);
-        exit(ret);
-}
diff --git a/src/regress/lib/libcrypto/dsa/Makefile b/src/regress/lib/libcrypto/dsa/Makefile
deleted file mode 100644
index 0574c6e282..0000000000
--- a/src/regress/lib/libcrypto/dsa/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   dsatest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-REGRESS_TARGETS=regress-dsatest
-
-regress-dsatest:        ${PROG}
-        ./${PROG}
-        ./${PROG} -app2_1
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/dsa/dsatest.c b/src/regress/lib/libcrypto/dsa/dsatest.c
deleted file mode 100644
index dd3e3166f7..0000000000
--- a/src/regress/lib/libcrypto/dsa/dsatest.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*      $OpenBSD: dsatest.c,v 1.5 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <openssl/crypto.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-
-#include <openssl/dsa.h>
-
-static int dsa_cb(int p, int n, BN_GENCB *arg);
-
-/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
- * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
-static unsigned char seed[20]={
-        0xd5,0x01,0x4e,0x4b,0x60,0xef,0x2b,0xa8,0xb6,0x21,0x1b,0x40,
-        0x62,0xba,0x32,0x24,0xe0,0x42,0x7d,0xd3,
-        };
-
-static unsigned char out_p[]={
-        0x8d,0xf2,0xa4,0x94,0x49,0x22,0x76,0xaa,
-        0x3d,0x25,0x75,0x9b,0xb0,0x68,0x69,0xcb,
-        0xea,0xc0,0xd8,0x3a,0xfb,0x8d,0x0c,0xf7,
-        0xcb,0xb8,0x32,0x4f,0x0d,0x78,0x82,0xe5,
-        0xd0,0x76,0x2f,0xc5,0xb7,0x21,0x0e,0xaf,
-        0xc2,0xe9,0xad,0xac,0x32,0xab,0x7a,0xac,
-        0x49,0x69,0x3d,0xfb,0xf8,0x37,0x24,0xc2,
-        0xec,0x07,0x36,0xee,0x31,0xc8,0x02,0x91,
-        };
-
-static unsigned char out_q[]={
-        0xc7,0x73,0x21,0x8c,0x73,0x7e,0xc8,0xee,
-        0x99,0x3b,0x4f,0x2d,0xed,0x30,0xf4,0x8e,
-        0xda,0xce,0x91,0x5f,
-        };
-
-static unsigned char out_g[]={
-        0x62,0x6d,0x02,0x78,0x39,0xea,0x0a,0x13,
-        0x41,0x31,0x63,0xa5,0x5b,0x4c,0xb5,0x00,
-        0x29,0x9d,0x55,0x22,0x95,0x6c,0xef,0xcb,
-        0x3b,0xff,0x10,0xf3,0x99,0xce,0x2c,0x2e,
-        0x71,0xcb,0x9d,0xe5,0xfa,0x24,0xba,0xbf,
-        0x58,0xe5,0xb7,0x95,0x21,0x92,0x5c,0x9c,
-        0xc4,0x2e,0x9f,0x6f,0x46,0x4b,0x08,0x8c,
-        0xc5,0x72,0xaf,0x53,0xe6,0xd7,0x88,0x02,
-        };
-
-static const unsigned char str1[]="12345678901234567890";
-
-static BIO *bio_err=NULL;
-
-int main(int argc, char **argv)
-        {
-        BN_GENCB cb;
-        DSA *dsa=NULL;
-        int counter,ret=0,i,j;
-        unsigned char buf[256];
-        unsigned long h;
-        unsigned char sig[256];
-        unsigned int siglen;
-
-        if (bio_err == NULL)
-                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-
-        ERR_load_crypto_strings();
-
-        BIO_printf(bio_err,"test generation of DSA parameters\n");
-
-        BN_GENCB_set(&cb, dsa_cb, bio_err);
-        if(((dsa = DSA_new()) == NULL) || !DSA_generate_parameters_ex(dsa, 512,
-                                seed, 20, &counter, &h, &cb))
-                goto end;
-
-        BIO_printf(bio_err,"seed\n");
-        for (i=0; i<20; i+=4)
-                {
-                BIO_printf(bio_err,"%02X%02X%02X%02X ",
-                        seed[i],seed[i+1],seed[i+2],seed[i+3]);
-                }
-        BIO_printf(bio_err,"\ncounter=%d h=%ld\n",counter,h);
-                
-        DSA_print(bio_err,dsa,0);
-        if (counter != 105) 
-                {
-                BIO_printf(bio_err,"counter should be 105\n");
-                goto end;
-                }
-        if (h != 2)
-                {
-                BIO_printf(bio_err,"h should be 2\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->q,buf);
-        j=sizeof(out_q);
-        if ((i != j) || (memcmp(buf,out_q,i) != 0))
-                {
-                BIO_printf(bio_err,"q value is wrong\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->p,buf);
-        j=sizeof(out_p);
-        if ((i != j) || (memcmp(buf,out_p,i) != 0))
-                {
-                BIO_printf(bio_err,"p value is wrong\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->g,buf);
-        j=sizeof(out_g);
-        if ((i != j) || (memcmp(buf,out_g,i) != 0))
-                {
-                BIO_printf(bio_err,"g value is wrong\n");
-                goto end;
-                }
-
-        DSA_generate_key(dsa);
-        DSA_sign(0, str1, 20, sig, &siglen, dsa);
-        if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1)
-                ret=1;
-
-end:
-        if (!ret)
-                ERR_print_errors(bio_err);
-        if (dsa != NULL) DSA_free(dsa);
-        CRYPTO_cleanup_all_ex_data();
-        ERR_remove_thread_state(NULL);
-        ERR_free_strings();
-        CRYPTO_mem_leaks(bio_err);
-        if (bio_err != NULL)
-                {
-                BIO_free(bio_err);
-                bio_err = NULL;
-                }
-        exit(!ret);
-        }
-
-static int dsa_cb(int p, int n, BN_GENCB *arg)
-        {
-        char c='*';
-        static int ok=0,num=0;
-
-        if (p == 0) { c='.'; num++; };
-        if (p == 1) c='+';
-        if (p == 2) { c='*'; ok++; }
-        if (p == 3) c='\n';
-        BIO_write(arg->arg,&c,1);
-        (void)BIO_flush(arg->arg);
-
-        if (!ok && (p == 0) && (num > 1))
-                {
-                BIO_printf((BIO *)arg,"error in dsatest\n");
-                return 0;
-                }
-        return 1;
-        }
diff --git a/src/regress/lib/libcrypto/ec/Makefile b/src/regress/lib/libcrypto/ec/Makefile
deleted file mode 100644
index c3e7975415..0000000000
--- a/src/regress/lib/libcrypto/ec/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   ectest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ec/ectest.c b/src/regress/lib/libcrypto/ec/ectest.c
deleted file mode 100644
index 401c013a6c..0000000000
--- a/src/regress/lib/libcrypto/ec/ectest.c
+++ /dev/null
@@ -1,1456 +0,0 @@
-/*      $OpenBSD: ectest.c,v 1.8 2018/07/15 18:22:57 tb Exp $   */
-/* crypto/ec/ectest.c */
-/*
- * Originally written by Bodo Moeller for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <openssl/ec.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/err.h>
-#include <openssl/obj_mac.h>
-#include <openssl/objects.h>
-#include <openssl/bn.h>
-#include <openssl/opensslconf.h>
-
-#define ABORT do { \
-        fflush(stdout); \
-        fprintf(stderr, "%s:%d: ABORT\n", __FILE__, __LINE__); \
-        ERR_print_errors_fp(stderr); \
-        exit(1); \
-} while (0)
-
-#define TIMING_BASE_PT 0
-#define TIMING_RAND_PT 1
-#define TIMING_SIMUL 2
-
-/* test multiplication with group order, long and negative scalars */
-static void
-group_order_tests(EC_GROUP *group)
-{
-        BIGNUM *n1, *n2, *order;
-        EC_POINT *P = EC_POINT_new(group);
-        EC_POINT *Q = EC_POINT_new(group);
-        BN_CTX *ctx = BN_CTX_new();
-
-        n1 = BN_new();
-        n2 = BN_new();
-        order = BN_new();
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, order, ctx))
-                ABORT;
-        if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx))
-                ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q))
-                ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx))
-                ABORT;
-        if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx))
-                ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q))
-                ABORT;
-        fprintf(stdout, " ok\n");
-        fprintf(stdout, "long/negative scalar tests ... ");
-        if (!BN_one(n1))
-                ABORT;
-        /* n1 = 1 - order */
-        if (!BN_sub(n1, n1, order))
-                ABORT;
-        if (!EC_POINT_mul(group, Q, NULL, P, n1, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, Q, P, ctx))
-                ABORT;
-        /* n2 = 1 + order */
-        if (!BN_add(n2, order, BN_value_one()))
-                ABORT;
-        if (!EC_POINT_mul(group, Q, NULL, P, n2, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, Q, P, ctx))
-                ABORT;
-        /* n2 = (1 - order) * (1 + order) */
-        if (!BN_mul(n2, n1, n2, ctx))
-                ABORT;
-        if (!EC_POINT_mul(group, Q, NULL, P, n2, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, Q, P, ctx))
-                ABORT;
-        fprintf(stdout, "ok\n");
-        EC_POINT_free(P);
-        EC_POINT_free(Q);
-        BN_free(n1);
-        BN_free(n2);
-        BN_free(order);
-        BN_CTX_free(ctx);
-}
-
-static void
-prime_field_tests(void)
-{
-        BN_CTX *ctx = NULL;
-        BIGNUM *p, *a, *b;
-        EC_GROUP *group;
-        EC_GROUP *P_160 = NULL, *P_192 = NULL, *P_224 = NULL, *P_256 = NULL, *P_384 = NULL, *P_521 = NULL;
-        EC_POINT *P, *Q, *R;
-        BIGNUM *x, *y, *z;
-        unsigned char buf[100];
-        size_t i, len;
-        int k;
-
-#if 1 /* optional */
-        ctx = BN_CTX_new();
-        if (!ctx)
-                ABORT;
-#endif
-
-        p = BN_new();
-        a = BN_new();
-        b = BN_new();
-        if (!p || !a || !b)
-                ABORT;
-
-        if (!BN_hex2bn(&p, "17"))
-                ABORT;
-        if (!BN_hex2bn(&a, "1"))
-                ABORT;
-        if (!BN_hex2bn(&b, "1"))
-                ABORT;
-
-        group = EC_GROUP_new(EC_GFp_mont_method()); /* applications should use EC_GROUP_new_curve_GFp
-                                                     * so that the library gets to choose the EC_METHOD */
-        if (!group)
-                ABORT;
-
-        if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx))
-                ABORT;
-
-        {
-                EC_GROUP *tmp;
-                tmp = EC_GROUP_new(EC_GROUP_method_of(group));
-                if (!tmp)
-                        ABORT;
-                if (!EC_GROUP_copy(tmp, group))
-                        ABORT;
-                EC_GROUP_free(group);
-                group = tmp;
-        }
-
-        if (!EC_GROUP_get_curve_GFp(group, p, a, b, ctx))
-                ABORT;
-
-        fprintf(stdout, "Curve defined by Weierstrass equation\n     y^2 = x^3 + a*x + b  (mod 0x");
-        BN_print_fp(stdout, p);
-        fprintf(stdout, ")\n     a = 0x");
-        BN_print_fp(stdout, a);
-        fprintf(stdout, "\n     b = 0x");
-        BN_print_fp(stdout, b);
-        fprintf(stdout, "\n");
-
-        P = EC_POINT_new(group);
-        Q = EC_POINT_new(group);
-        R = EC_POINT_new(group);
-        if (!P || !Q || !R)
-                ABORT;
-
-        if (!EC_POINT_set_to_infinity(group, P))
-                ABORT;
-        if (!EC_POINT_is_at_infinity(group, P))
-                ABORT;
-
-        buf[0] = 0;
-        if (!EC_POINT_oct2point(group, Q, buf, 1, ctx))
-                ABORT;
-
-        if (!EC_POINT_add(group, P, P, Q, ctx))
-                ABORT;
-        if (!EC_POINT_is_at_infinity(group, P))
-                ABORT;
-
-        x = BN_new();
-        y = BN_new();
-        z = BN_new();
-        if (!x || !y || !z)
-                ABORT;
-
-        if (!BN_hex2bn(&x, "D"))
-                ABORT;
-        if (!EC_POINT_set_compressed_coordinates_GFp(group, Q, x, 1, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, Q, ctx)) {
-                if (!EC_POINT_get_affine_coordinates_GFp(group, Q, x, y, ctx))
-                        ABORT;
-                fprintf(stderr, "Point is not on curve: x = 0x");
-                BN_print_fp(stderr, x);
-                fprintf(stderr, ", y = 0x");
-                BN_print_fp(stderr, y);
-                fprintf(stderr, "\n");
-                ABORT;
-        }
-
-        fprintf(stdout, "A cyclic subgroup:\n");
-        k = 100;
-        do
-        {
-                if (k-- == 0)
-                        ABORT;
-
-                if (EC_POINT_is_at_infinity(group, P))
-                        fprintf(stdout, "     point at infinity\n");
-                else {
-                        if (!EC_POINT_get_affine_coordinates_GFp(group, P, x, y, ctx))
-                                ABORT;
-
-                        fprintf(stdout, "     x = 0x");
-                        BN_print_fp(stdout, x);
-                        fprintf(stdout, ", y = 0x");
-                        BN_print_fp(stdout, y);
-                        fprintf(stdout, "\n");
-                }
-
-                if (!EC_POINT_copy(R, P))
-                        ABORT;
-                if (!EC_POINT_add(group, P, P, Q, ctx))
-                        ABORT;
-
-#if 0 /* optional */
-                {
-                        EC_POINT *points[3];
-
-                        points[0] = R;
-                        points[1] = Q;
-                        points[2] = P;
-                        if (!EC_POINTs_make_affine(group, 2, points, ctx))
-                                ABORT;
-                }
-#endif
-
-        }
-        while (!EC_POINT_is_at_infinity(group, P));
-
-                if (!EC_POINT_add(group, P, Q, R, ctx))
-                        ABORT;
-        if (!EC_POINT_is_at_infinity(group, P))
-                ABORT;
-
-        len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_COMPRESSED, buf, sizeof buf, ctx);
-        if (len == 0)
-                ABORT;
-        if (!EC_POINT_oct2point(group, P, buf, len, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, P, Q, ctx))
-                ABORT;
-        fprintf(stdout, "Generator as octet string, compressed form:\n     ");
-        for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
-
-                len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_UNCOMPRESSED, buf, sizeof buf, ctx);
-        if (len == 0)
-                ABORT;
-        if (!EC_POINT_oct2point(group, P, buf, len, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, P, Q, ctx))
-                ABORT;
-        fprintf(stdout, "\nGenerator as octet string, uncompressed form:\n     ");
-        for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
-
-                len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_HYBRID, buf, sizeof buf, ctx);
-        if (len == 0)
-                ABORT;
-        if (!EC_POINT_oct2point(group, P, buf, len, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, P, Q, ctx))
-                ABORT;
-        fprintf(stdout, "\nGenerator as octet string, hybrid form:\n     ");
-        for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
-
-                if (!EC_POINT_get_Jprojective_coordinates_GFp(group, R, x, y, z, ctx))
-                        ABORT;
-        fprintf(stdout, "\nA representation of the inverse of that generator in\nJacobian projective coordinates:\n     X = 0x");
-        BN_print_fp(stdout, x);
-        fprintf(stdout, ", Y = 0x");
-        BN_print_fp(stdout, y);
-        fprintf(stdout, ", Z = 0x");
-        BN_print_fp(stdout, z);
-        fprintf(stdout, "\n");
-
-        if (!EC_POINT_invert(group, P, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, P, R, ctx))
-                ABORT;
-
-
-        /* Curve secp160r1 (Certicom Research SEC 2 Version 1.0, section 2.4.2, 2000)
-         * -- not a NIST curve, but commonly used */
-
-        if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF"))
-                ABORT;
-        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL))
-                ABORT;
-        if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC"))
-                ABORT;
-        if (!BN_hex2bn(&b, "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45"))
-                ABORT;
-        if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx))
-                ABORT;
-
-        if (!BN_hex2bn(&x, "4A96B5688EF573284664698968C38BB913CBFC82"))
-                ABORT;
-        if (!BN_hex2bn(&y, "23a628553168947d59dcc912042351377ac5fb32"))
-                ABORT;
-        if (!EC_POINT_set_affine_coordinates_GFp(group, P, x, y, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, P, ctx))
-                ABORT;
-        if (!BN_hex2bn(&z, "0100000000000000000001F4C8F927AED3CA752257"))
-                ABORT;
-        if (!EC_GROUP_set_generator(group, P, z, BN_value_one()))
-                ABORT;
-
-        if (!EC_POINT_get_affine_coordinates_GFp(group, P, x, y, ctx))
-                ABORT;
-        fprintf(stdout, "\nSEC2 curve secp160r1 -- Generator:\n     x = 0x");
-        BN_print_fp(stdout, x);
-        fprintf(stdout, "\n     y = 0x");
-        BN_print_fp(stdout, y);
-        fprintf(stdout, "\n");
-        /* G_y value taken from the standard: */
-        if (!BN_hex2bn(&z, "23a628553168947d59dcc912042351377ac5fb32"))
-                ABORT;
-        if (0 != BN_cmp(y, z))
-                ABORT;
-
-        fprintf(stdout, "verify degree ...");
-        if (EC_GROUP_get_degree(group) != 160)
-                ABORT;
-        fprintf(stdout, " ok\n");
-
-        group_order_tests(group);
-
-        if (!(P_160 = EC_GROUP_new(EC_GROUP_method_of(group))))
-                ABORT;
-        if (!EC_GROUP_copy(P_160, group))
-                ABORT;
-
-
-        /* Curve P-192 (FIPS PUB 186-2, App. 6) */
-
-        if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF"))
-                ABORT;
-        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL))
-                ABORT;
-        if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC"))
-                ABORT;
-        if (!BN_hex2bn(&b, "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1"))
-                ABORT;
-        if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx))
-                ABORT;
-
-        if (!BN_hex2bn(&x, "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"))
-                ABORT;
-        if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 1, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, P, ctx))
-                ABORT;
-        if (!BN_hex2bn(&z, "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831"))
-                ABORT;
-        if (!EC_GROUP_set_generator(group, P, z, BN_value_one()))
-                ABORT;
-
-        if (!EC_POINT_get_affine_coordinates_GFp(group, P, x, y, ctx))
-                ABORT;
-        fprintf(stdout, "\nNIST curve P-192 -- Generator:\n     x = 0x");
-        BN_print_fp(stdout, x);
-        fprintf(stdout, "\n     y = 0x");
-        BN_print_fp(stdout, y);
-        fprintf(stdout, "\n");
-        /* G_y value taken from the standard: */
-        if (!BN_hex2bn(&z, "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811"))
-                ABORT;
-        if (0 != BN_cmp(y, z))
-                ABORT;
-
-        fprintf(stdout, "verify degree ...");
-        if (EC_GROUP_get_degree(group) != 192)
-                ABORT;
-        fprintf(stdout, " ok\n");
-
-        group_order_tests(group);
-
-        if (!(P_192 = EC_GROUP_new(EC_GROUP_method_of(group))))
-                ABORT;
-        if (!EC_GROUP_copy(P_192, group))
-                ABORT;
-
-
-        /* Curve P-224 (FIPS PUB 186-2, App. 6) */
-
-        if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001"))
-                ABORT;
-        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL))
-                ABORT;
-        if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE"))
-                ABORT;
-        if (!BN_hex2bn(&b, "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4"))
-                ABORT;
-        if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx))
-                ABORT;
-
-        if (!BN_hex2bn(&x, "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"))
-                ABORT;
-        if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 0, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, P, ctx))
-                ABORT;
-        if (!BN_hex2bn(&z, "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D"))
-                ABORT;
-        if (!EC_GROUP_set_generator(group, P, z, BN_value_one()))
-                ABORT;
-
-        if (!EC_POINT_get_affine_coordinates_GFp(group, P, x, y, ctx))
-                ABORT;
-        fprintf(stdout, "\nNIST curve P-224 -- Generator:\n     x = 0x");
-        BN_print_fp(stdout, x);
-        fprintf(stdout, "\n     y = 0x");
-        BN_print_fp(stdout, y);
-        fprintf(stdout, "\n");
-        /* G_y value taken from the standard: */
-        if (!BN_hex2bn(&z, "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34"))
-                ABORT;
-        if (0 != BN_cmp(y, z))
-                ABORT;
-
-        fprintf(stdout, "verify degree ...");
-        if (EC_GROUP_get_degree(group) != 224)
-                ABORT;
-        fprintf(stdout, " ok\n");
-
-        group_order_tests(group);
-
-        if (!(P_224 = EC_GROUP_new(EC_GROUP_method_of(group))))
-                ABORT;
-        if (!EC_GROUP_copy(P_224, group))
-                ABORT;
-
-
-        /* Curve P-256 (FIPS PUB 186-2, App. 6) */
-
-        if (!BN_hex2bn(&p, "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF"))
-                ABORT;
-        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL))
-                ABORT;
-        if (!BN_hex2bn(&a, "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC"))
-                ABORT;
-        if (!BN_hex2bn(&b, "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B"))
-                ABORT;
-        if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx))
-                ABORT;
-
-        if (!BN_hex2bn(&x, "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"))
-                ABORT;
-        if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 1, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, P, ctx))
-                ABORT;
-        if (!BN_hex2bn(&z, "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E"
-            "84F3B9CAC2FC632551")) ABORT;
-        if (!EC_GROUP_set_generator(group, P, z, BN_value_one()))
-                ABORT;
-
-        if (!EC_POINT_get_affine_coordinates_GFp(group, P, x, y, ctx))
-                ABORT;
-        fprintf(stdout, "\nNIST curve P-256 -- Generator:\n     x = 0x");
-        BN_print_fp(stdout, x);
-        fprintf(stdout, "\n     y = 0x");
-        BN_print_fp(stdout, y);
-        fprintf(stdout, "\n");
-        /* G_y value taken from the standard: */
-        if (!BN_hex2bn(&z, "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"))
-                ABORT;
-        if (0 != BN_cmp(y, z))
-                ABORT;
-
-        fprintf(stdout, "verify degree ...");
-        if (EC_GROUP_get_degree(group) != 256)
-                ABORT;
-        fprintf(stdout, " ok\n");
-
-        group_order_tests(group);
-
-        if (!(P_256 = EC_GROUP_new(EC_GROUP_method_of(group))))
-                ABORT;
-        if (!EC_GROUP_copy(P_256, group))
-                ABORT;
-
-
-        /* Curve P-384 (FIPS PUB 186-2, App. 6) */
-
-        if (!BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF")) ABORT;
-        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL))
-                ABORT;
-        if (!BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC")) ABORT;
-        if (!BN_hex2bn(&b, "B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141"
-            "120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF")) ABORT;
-        if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx))
-                ABORT;
-
-        if (!BN_hex2bn(&x, "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B"
-            "9859F741E082542A385502F25DBF55296C3A545E3872760AB7")) ABORT;
-        if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 1, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, P, ctx))
-                ABORT;
-        if (!BN_hex2bn(&z, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973")) ABORT;
-        if (!EC_GROUP_set_generator(group, P, z, BN_value_one()))
-                ABORT;
-
-        if (!EC_POINT_get_affine_coordinates_GFp(group, P, x, y, ctx))
-                ABORT;
-        fprintf(stdout, "\nNIST curve P-384 -- Generator:\n     x = 0x");
-        BN_print_fp(stdout, x);
-        fprintf(stdout, "\n     y = 0x");
-        BN_print_fp(stdout, y);
-        fprintf(stdout, "\n");
-        /* G_y value taken from the standard: */
-        if (!BN_hex2bn(&z, "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A14"
-            "7CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F")) ABORT;
-        if (0 != BN_cmp(y, z))
-                ABORT;
-
-        fprintf(stdout, "verify degree ...");
-        if (EC_GROUP_get_degree(group) != 384)
-                ABORT;
-        fprintf(stdout, " ok\n");
-
-        group_order_tests(group);
-
-        if (!(P_384 = EC_GROUP_new(EC_GROUP_method_of(group))))
-                ABORT;
-        if (!EC_GROUP_copy(P_384, group))
-                ABORT;
-
-
-        /* Curve P-521 (FIPS PUB 186-2, App. 6) */
-
-        if (!BN_hex2bn(&p, "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFF")) ABORT;
-        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL))
-                ABORT;
-        if (!BN_hex2bn(&a, "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFFFFFFFFC")) ABORT;
-        if (!BN_hex2bn(&b, "051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B"
-            "315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573"
-            "DF883D2C34F1EF451FD46B503F00")) ABORT;
-        if (!EC_GROUP_set_curve_GFp(group, p, a, b, ctx))
-                ABORT;
-
-        if (!BN_hex2bn(&x, "C6858E06B70404E9CD9E3ECB662395B4429C648139053F"
-            "B521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B"
-            "3C1856A429BF97E7E31C2E5BD66")) ABORT;
-        if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 0, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, P, ctx))
-                ABORT;
-        if (!BN_hex2bn(&z, "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-            "FFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5"
-            "C9B8899C47AEBB6FB71E91386409")) ABORT;
-        if (!EC_GROUP_set_generator(group, P, z, BN_value_one()))
-                ABORT;
-
-        if (!EC_POINT_get_affine_coordinates_GFp(group, P, x, y, ctx))
-                ABORT;
-        fprintf(stdout, "\nNIST curve P-521 -- Generator:\n     x = 0x");
-        BN_print_fp(stdout, x);
-        fprintf(stdout, "\n     y = 0x");
-        BN_print_fp(stdout, y);
-        fprintf(stdout, "\n");
-        /* G_y value taken from the standard: */
-        if (!BN_hex2bn(&z, "11839296A789A3BC0045C8A5FB42C7D1BD998F54449579"
-            "B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C"
-            "7086A272C24088BE94769FD16650")) ABORT;
-        if (0 != BN_cmp(y, z))
-                ABORT;
-
-        fprintf(stdout, "verify degree ...");
-        if (EC_GROUP_get_degree(group) != 521)
-                ABORT;
-        fprintf(stdout, " ok\n");
-
-        group_order_tests(group);
-
-        if (!(P_521 = EC_GROUP_new(EC_GROUP_method_of(group))))
-                ABORT;
-        if (!EC_GROUP_copy(P_521, group))
-                ABORT;
-
-
-        /* more tests using the last curve */
-        fprintf(stdout, "infinity tests ...");
-        fflush(stdout);
-        if (!EC_POINT_copy(Q, P))
-                ABORT;
-        if (EC_POINT_is_at_infinity(group, Q))
-                ABORT;
-        /* P := 2P */
-        if (!EC_POINT_dbl(group, P, P, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, P, ctx))
-                ABORT;
-        /* Q := -P */
-        if (!EC_POINT_invert(group, Q, ctx))
-                ABORT;
-        /* R := 2P - P = P */
-        if (!EC_POINT_add(group, R, P, Q, ctx))
-                ABORT;
-        /* R := R + Q = P - P = infty */
-        if (!EC_POINT_add(group, R, R, Q, ctx))
-                ABORT;
-        if (!EC_POINT_is_at_infinity(group, R))
-                ABORT;
-        fprintf(stdout, " ok\n\n");
-
-        if (ctx)
-                BN_CTX_free(ctx);
-        BN_free(p);
-        BN_free(a);
-        BN_free(b);
-        EC_GROUP_free(group);
-        EC_POINT_free(P);
-        EC_POINT_free(Q);
-        EC_POINT_free(R);
-        BN_free(x);
-        BN_free(y);
-        BN_free(z);
-
-        if (P_160)
-                EC_GROUP_free(P_160);
-        if (P_192)
-                EC_GROUP_free(P_192);
-        if (P_224)
-                EC_GROUP_free(P_224);
-        if (P_256)
-                EC_GROUP_free(P_256);
-        if (P_384)
-                EC_GROUP_free(P_384);
-        if (P_521)
-                EC_GROUP_free(P_521);
-
-}
-
-/* Change test based on whether binary point compression is enabled or not. */
-#ifdef OPENSSL_EC_BIN_PT_COMP
-#define CHAR2_CURVE_TEST_INTERNAL(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \
-        if (!BN_hex2bn(&x, _x)) ABORT; \
-        if (!EC_POINT_set_compressed_coordinates_GF2m(group, P, x, _y_bit, ctx)) ABORT; \
-        if (!EC_POINT_is_on_curve(group, P, ctx)) ABORT; \
-        if (!BN_hex2bn(&z, _order)) ABORT; \
-        if (!BN_hex2bn(&cof, _cof)) ABORT; \
-        if (!EC_GROUP_set_generator(group, P, z, cof)) ABORT; \
-        if (!EC_POINT_get_affine_coordinates_GF2m(group, P, x, y, ctx)) ABORT; \
-        fprintf(stdout, "\n%s -- Generator:\n     x = 0x", _name); \
-        BN_print_fp(stdout, x); \
-        fprintf(stdout, "\n     y = 0x"); \
-        BN_print_fp(stdout, y); \
-        fprintf(stdout, "\n"); \
-        /* G_y value taken from the standard: */ \
-        if (!BN_hex2bn(&z, _y)) ABORT; \
-        if (0 != BN_cmp(y, z)) ABORT;
-#else
-#define CHAR2_CURVE_TEST_INTERNAL(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \
-        if (!BN_hex2bn(&x, _x)) ABORT; \
-        if (!BN_hex2bn(&y, _y)) ABORT; \
-        if (!EC_POINT_set_affine_coordinates_GF2m(group, P, x, y, ctx)) ABORT; \
-        if (!EC_POINT_is_on_curve(group, P, ctx)) ABORT; \
-        if (!BN_hex2bn(&z, _order)) ABORT; \
-        if (!BN_hex2bn(&cof, _cof)) ABORT; \
-        if (!EC_GROUP_set_generator(group, P, z, cof)) ABORT; \
-        fprintf(stdout, "\n%s -- Generator:\n     x = 0x", _name); \
-        BN_print_fp(stdout, x); \
-        fprintf(stdout, "\n     y = 0x"); \
-        BN_print_fp(stdout, y); \
-        fprintf(stdout, "\n");
-#endif
-
-#define CHAR2_CURVE_TEST(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \
-        if (!BN_hex2bn(&p, _p)) ABORT; \
-        if (!BN_hex2bn(&a, _a)) ABORT; \
-        if (!BN_hex2bn(&b, _b)) ABORT; \
-        if (!EC_GROUP_set_curve_GF2m(group, p, a, b, ctx)) ABORT; \
-        CHAR2_CURVE_TEST_INTERNAL(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \
-        fprintf(stdout, "verify degree ..."); \
-        if (EC_GROUP_get_degree(group) != _degree) ABORT; \
-        fprintf(stdout, " ok\n"); \
-        group_order_tests(group); \
-        if (!(_variable = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT; \
-        if (!EC_GROUP_copy(_variable, group)) ABORT; \
-
-#ifndef OPENSSL_NO_EC2M
-
-                                                        static void char2_field_tests(void)
-{
-        BN_CTX *ctx = NULL;
-        BIGNUM *p, *a, *b;
-        EC_GROUP *group;
-        EC_GROUP *C2_K163 = NULL, *C2_K233 = NULL, *C2_K283 = NULL, *C2_K409 = NULL, *C2_K571 = NULL;
-        EC_GROUP *C2_B163 = NULL, *C2_B233 = NULL, *C2_B283 = NULL, *C2_B409 = NULL, *C2_B571 = NULL;
-        EC_POINT *P, *Q, *R;
-        BIGNUM *x, *y, *z, *cof;
-        unsigned char buf[100];
-        size_t i, len;
-        int k;
-
-#if 1 /* optional */
-        ctx = BN_CTX_new();
-        if (!ctx)
-                ABORT;
-#endif
-
-        p = BN_new();
-        a = BN_new();
-        b = BN_new();
-        if (!p || !a || !b)
-                ABORT;
-
-        if (!BN_hex2bn(&p, "13"))
-                ABORT;
-        if (!BN_hex2bn(&a, "3"))
-                ABORT;
-        if (!BN_hex2bn(&b, "1"))
-                ABORT;
-
-        group = EC_GROUP_new(EC_GF2m_simple_method()); /* applications should use EC_GROUP_new_curve_GF2m
-                                                        * so that the library gets to choose the EC_METHOD */
-        if (!group)
-                ABORT;
-        if (!EC_GROUP_set_curve_GF2m(group, p, a, b, ctx))
-                ABORT;
-
-        {
-                EC_GROUP *tmp;
-                tmp = EC_GROUP_new(EC_GROUP_method_of(group));
-                if (!tmp)
-                        ABORT;
-                if (!EC_GROUP_copy(tmp, group))
-                        ABORT;
-                EC_GROUP_free(group);
-                group = tmp;
-        }
-
-        if (!EC_GROUP_get_curve_GF2m(group, p, a, b, ctx))
-                ABORT;
-
-        fprintf(stdout, "Curve defined by Weierstrass equation\n     y^2 + x*y = x^3 + a*x^2 + b  (mod 0x");
-        BN_print_fp(stdout, p);
-        fprintf(stdout, ")\n     a = 0x");
-        BN_print_fp(stdout, a);
-        fprintf(stdout, "\n     b = 0x");
-        BN_print_fp(stdout, b);
-        fprintf(stdout, "\n(0x... means binary polynomial)\n");
-
-        P = EC_POINT_new(group);
-        Q = EC_POINT_new(group);
-        R = EC_POINT_new(group);
-        if (!P || !Q || !R)
-                ABORT;
-
-        if (!EC_POINT_set_to_infinity(group, P))
-                ABORT;
-        if (!EC_POINT_is_at_infinity(group, P))
-                ABORT;
-
-        buf[0] = 0;
-        if (!EC_POINT_oct2point(group, Q, buf, 1, ctx))
-                ABORT;
-
-        if (!EC_POINT_add(group, P, P, Q, ctx))
-                ABORT;
-        if (!EC_POINT_is_at_infinity(group, P))
-                ABORT;
-
-        x = BN_new();
-        y = BN_new();
-        z = BN_new();
-        cof = BN_new();
-        if (!x || !y || !z || !cof)
-                ABORT;
-
-        if (!BN_hex2bn(&x, "6"))
-                ABORT;
-/* Change test based on whether binary point compression is enabled or not. */
-#ifdef OPENSSL_EC_BIN_PT_COMP
-        if (!EC_POINT_set_compressed_coordinates_GF2m(group, Q, x, 1, ctx))
-                ABORT;
-#else
-        if (!BN_hex2bn(&y, "8"))
-                ABORT;
-        if (!EC_POINT_set_affine_coordinates_GF2m(group, Q, x, y, ctx))
-                ABORT;
-#endif
-        if (!EC_POINT_is_on_curve(group, Q, ctx)) {
-/* Change test based on whether binary point compression is enabled or not. */
-#ifdef OPENSSL_EC_BIN_PT_COMP
-                if (!EC_POINT_get_affine_coordinates_GF2m(group, Q, x, y, ctx))
-                        ABORT;
-#endif
-                fprintf(stderr, "Point is not on curve: x = 0x");
-                BN_print_fp(stderr, x);
-                fprintf(stderr, ", y = 0x");
-                BN_print_fp(stderr, y);
-                fprintf(stderr, "\n");
-                ABORT;
-        }
-
-        fprintf(stdout, "A cyclic subgroup:\n");
-        k = 100;
-        do
-        {
-                if (k-- == 0)
-                        ABORT;
-
-                if (EC_POINT_is_at_infinity(group, P))
-                        fprintf(stdout, "     point at infinity\n");
-                else {
-                        if (!EC_POINT_get_affine_coordinates_GF2m(group, P, x, y, ctx))
-                                ABORT;
-
-                        fprintf(stdout, "     x = 0x");
-                        BN_print_fp(stdout, x);
-                        fprintf(stdout, ", y = 0x");
-                        BN_print_fp(stdout, y);
-                        fprintf(stdout, "\n");
-                }
-
-                if (!EC_POINT_copy(R, P))
-                        ABORT;
-                if (!EC_POINT_add(group, P, P, Q, ctx))
-                        ABORT;
-        }
-        while (!EC_POINT_is_at_infinity(group, P));
-
-                if (!EC_POINT_add(group, P, Q, R, ctx))
-                        ABORT;
-        if (!EC_POINT_is_at_infinity(group, P))
-                ABORT;
-
-/* Change test based on whether binary point compression is enabled or not. */
-#ifdef OPENSSL_EC_BIN_PT_COMP
-        len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_COMPRESSED, buf, sizeof buf, ctx);
-        if (len == 0)
-                ABORT;
-        if (!EC_POINT_oct2point(group, P, buf, len, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, P, Q, ctx))
-                ABORT;
-        fprintf(stdout, "Generator as octet string, compressed form:\n     ");
-        for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
-#endif
-
-                len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_UNCOMPRESSED, buf, sizeof buf, ctx);
-        if (len == 0)
-                ABORT;
-        if (!EC_POINT_oct2point(group, P, buf, len, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, P, Q, ctx))
-                ABORT;
-        fprintf(stdout, "\nGenerator as octet string, uncompressed form:\n     ");
-        for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
-
-/* Change test based on whether binary point compression is enabled or not. */
-#ifdef OPENSSL_EC_BIN_PT_COMP
-                len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_HYBRID, buf, sizeof buf, ctx);
-        if (len == 0)
-                ABORT;
-        if (!EC_POINT_oct2point(group, P, buf, len, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, P, Q, ctx))
-                ABORT;
-        fprintf(stdout, "\nGenerator as octet string, hybrid form:\n     ");
-        for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
-#endif
-
-                fprintf(stdout, "\n");
-
-        if (!EC_POINT_invert(group, P, ctx))
-                ABORT;
-        if (0 != EC_POINT_cmp(group, P, R, ctx))
-                ABORT;
-
-
-        /* Curve K-163 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve K-163",
-            "0800000000000000000000000000000000000000C9",
-            "1",
-            "1",
-            "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
-            "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
-            1,
-            "04000000000000000000020108A2E0CC0D99F8A5EF",
-            "2",
-            163,
-        C2_K163
-        );
-
-        /* Curve B-163 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve B-163",
-            "0800000000000000000000000000000000000000C9",
-            "1",
-            "020A601907B8C953CA1481EB10512F78744A3205FD",
-            "03F0EBA16286A2D57EA0991168D4994637E8343E36",
-            "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
-            1,
-            "040000000000000000000292FE77E70C12A4234C33",
-            "2",
-            163,
-        C2_B163
-        );
-
-        /* Curve K-233 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve K-233",
-            "020000000000000000000000000000000000000004000000000000000001",
-            "0",
-            "1",
-            "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
-            "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
-            0,
-            "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
-            "4",
-            233,
-        C2_K233
-        );
-
-        /* Curve B-233 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve B-233",
-            "020000000000000000000000000000000000000004000000000000000001",
-            "000000000000000000000000000000000000000000000000000000000001",
-            "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
-            "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
-            "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
-            1,
-            "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
-            "2",
-            233,
-        C2_B233
-        );
-
-        /* Curve K-283 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve K-283",
-            "0800000000000000000000000000000000000000000000000000000000000000000010A1",
-            "0",
-            "1",
-            "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
-            "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
-            0,
-            "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
-            "4",
-            283,
-        C2_K283
-        );
-
-        /* Curve B-283 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve B-283",
-            "0800000000000000000000000000000000000000000000000000000000000000000010A1",
-            "000000000000000000000000000000000000000000000000000000000000000000000001",
-            "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
-            "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
-            "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
-            1,
-            "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
-            "2",
-            283,
-        C2_B283
-        );
-
-        /* Curve K-409 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve K-409",
-            "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-            "0",
-            "1",
-            "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
-            "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
-            1,
-            "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
-            "4",
-            409,
-        C2_K409
-        );
-
-        /* Curve B-409 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve B-409",
-            "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
-            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-            "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
-            "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
-            "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
-            1,
-            "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
-            "2",
-            409,
-        C2_B409
-        );
-
-        /* Curve K-571 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve K-571",
-            "80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-            "0",
-            "1",
-            "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
-            "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
-            0,
-            "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
-            "4",
-            571,
-        C2_K571
-        );
-
-        /* Curve B-571 (FIPS PUB 186-2, App. 6) */
-        CHAR2_CURVE_TEST
-        (
-        "NIST curve B-571",
-            "80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
-            "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
-            "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
-            "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
-            "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
-            1,
-            "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
-            "2",
-            571,
-        C2_B571
-        );
-
-        /* more tests using the last curve */
-        fprintf(stdout, "infinity tests ...");
-        fflush(stdout);
-        if (!EC_POINT_copy(Q, P))
-                ABORT;
-        if (EC_POINT_is_at_infinity(group, Q))
-                ABORT;
-        /* P := 2P */
-        if (!EC_POINT_dbl(group, P, P, ctx))
-                ABORT;
-        if (!EC_POINT_is_on_curve(group, P, ctx))
-                ABORT;
-        /* Q := -P */
-        if (!EC_POINT_invert(group, Q, ctx))
-                ABORT;
-        /* R := 2P - P = P */
-        if (!EC_POINT_add(group, R, P, Q, ctx))
-                ABORT;
-        /* R := R + Q = P - P = infty */
-        if (!EC_POINT_add(group, R, R, Q, ctx))
-                ABORT;
-        if (!EC_POINT_is_at_infinity(group, R))
-                ABORT;
-        fprintf(stdout, " ok\n\n");
-
-        if (ctx)
-                BN_CTX_free(ctx);
-        BN_free(p);
-        BN_free(a);
-        BN_free(b);
-        EC_GROUP_free(group);
-        EC_POINT_free(P);
-        EC_POINT_free(Q);
-        EC_POINT_free(R);
-        BN_free(x);
-        BN_free(y);
-        BN_free(z);
-        BN_free(cof);
-
-        if (C2_K163)
-                EC_GROUP_free(C2_K163);
-        if (C2_B163)
-                EC_GROUP_free(C2_B163);
-        if (C2_K233)
-                EC_GROUP_free(C2_K233);
-        if (C2_B233)
-                EC_GROUP_free(C2_B233);
-        if (C2_K283)
-                EC_GROUP_free(C2_K283);
-        if (C2_B283)
-                EC_GROUP_free(C2_B283);
-        if (C2_K409)
-                EC_GROUP_free(C2_K409);
-        if (C2_B409)
-                EC_GROUP_free(C2_B409);
-        if (C2_K571)
-                EC_GROUP_free(C2_K571);
-        if (C2_B571)
-                EC_GROUP_free(C2_B571);
-
-}
-#endif
-
-static void
-internal_curve_test(void)
-{
-        EC_builtin_curve *curves = NULL;
-        size_t crv_len = 0, n = 0;
-        int    ok = 1;
-
-        crv_len = EC_get_builtin_curves(NULL, 0);
-
-        curves = reallocarray(NULL, sizeof(EC_builtin_curve),  crv_len);
-
-        if (curves == NULL)
-                return;
-
-        if (!EC_get_builtin_curves(curves, crv_len)) {
-                free(curves);
-                return;
-        }
-
-        fprintf(stdout, "testing internal curves: ");
-
-        for (n = 0; n < crv_len; n++) {
-                EC_GROUP *group = NULL;
-                int nid = curves[n].nid;
-                if ((group = EC_GROUP_new_by_curve_name(nid)) == NULL) {
-                        ok = 0;
-                        fprintf(stdout, "\nEC_GROUP_new_curve_name() failed with"
-                            " curve %s\n", OBJ_nid2sn(nid));
-                        /* try next curve */
-                        continue;
-                }
-                if (!EC_GROUP_check(group, NULL)) {
-                        ok = 0;
-                        fprintf(stdout, "\nEC_GROUP_check() failed with"
-                            " curve %s\n", OBJ_nid2sn(nid));
-                        EC_GROUP_free(group);
-                        /* try the next curve */
-                        continue;
-                }
-                fprintf(stdout, ".");
-                fflush(stdout);
-                EC_GROUP_free(group);
-        }
-        if (ok)
-                fprintf(stdout, " ok\n\n");
-        else {
-                fprintf(stdout, " failed\n\n");
-                ABORT;
-        }
-        free(curves);
-        return;
-}
-
-#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-/* nistp_test_params contains magic numbers for testing our optimized
- * implementations of several NIST curves with characteristic > 3. */
-struct nistp_test_params {
-        const EC_METHOD* (*meth) ();
-        int degree;
-        /* Qx, Qy and D are taken from
-         * http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
-         * Otherwise, values are standard curve parameters from FIPS 180-3 */
-        const char *p, *a, *b, *Qx, *Qy, *Gx, *Gy, *order, *d;
-};
-
-static const struct nistp_test_params nistp_tests_params[] = { {
-                /* P-224 */
-                EC_GFp_nistp224_method,
-                    224,
-                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", /* p */
-                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", /* a */
-                "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", /* b */
-                "E84FB0B8E7000CB657D7973CF6B42ED78B301674276DF744AF130B3E", /* Qx */
-                "4376675C6FC5612C21A0FF2D2A89D2987DF7A2BC52183B5982298555", /* Qy */
-                "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", /* Gx */
-                "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", /* Gy */
-                "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", /* order */
-                "3F0C488E987C80BE0FEE521F8D90BE6034EC69AE11CA72AA777481E8", /* d */
-        },
-        {
-                /* P-256 */
-                EC_GFp_nistp256_method,
-                    256,
-                "ffffffff00000001000000000000000000000000ffffffffffffffffffffffff", /* p */
-                "ffffffff00000001000000000000000000000000fffffffffffffffffffffffc", /* a */
-                "5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b", /* b */
-                "b7e08afdfe94bad3f1dc8c734798ba1c62b3a0ad1e9ea2a38201cd0889bc7a19", /* Qx */
-                "3603f747959dbf7a4bb226e41928729063adc7ae43529e61b563bbc606cc5e09", /* Qy */
-                "6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296", /* Gx */
-                "4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5", /* Gy */
-                "ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551", /* order */
-                "c477f9f65c22cce20657faa5b2d1d8122336f851a508a1ed04e479c34985bf96", /* d */
-        },
-        {
-                /* P-521 */
-                EC_GFp_nistp521_method,
-                    521,
-                "1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", /* p */
-                "1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc", /* a */
-                "051953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef109e156193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00", /* b */
-                "0098e91eef9a68452822309c52fab453f5f117c1da8ed796b255e9ab8f6410cca16e59df403a6bdc6ca467a37056b1e54b3005d8ac030decfeb68df18b171885d5c4", /* Qx */
-                "0164350c321aecfc1cca1ba4364c9b15656150b4b78d6a48d7d28e7f31985ef17be8554376b72900712c4b83ad668327231526e313f5f092999a4632fd50d946bc2e", /* Qy */
-                "c6858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3dbaa14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66", /* Gx */
-                "11839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e662c97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650", /* Gy */
-                "1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409", /* order */
-                "0100085f47b8e1b8b11b7eb33028c0b2888e304bfc98501955b45bba1478dc184eeedf09b86a5f7c21994406072787205e69a63709fe35aa93ba333514b24f961722", /* d */
-        },
-};
-
-void
-nistp_single_test(const struct nistp_test_params *test)
-{
-        BN_CTX *ctx;
-        BIGNUM *p, *a, *b, *x, *y, *n, *m, *order;
-        EC_GROUP *NISTP;
-        EC_POINT *G, *P, *Q, *Q_CHECK;
-
-        fprintf(stdout, "\nNIST curve P-%d (optimised implementation):\n", test->degree);
-        ctx = BN_CTX_new();
-        p = BN_new();
-        a = BN_new();
-        b = BN_new();
-        x = BN_new();
-        y = BN_new();
-        m = BN_new();
-        n = BN_new();
-        order = BN_new();
-
-        NISTP = EC_GROUP_new(test->meth());
-        if (!NISTP)
-                ABORT;
-        if (!BN_hex2bn(&p, test->p))
-                ABORT;
-        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL))
-                ABORT;
-        if (!BN_hex2bn(&a, test->a))
-                ABORT;
-        if (!BN_hex2bn(&b, test->b))
-                ABORT;
-        if (!EC_GROUP_set_curve_GFp(NISTP, p, a, b, ctx))
-                ABORT;
-        G = EC_POINT_new(NISTP);
-        P = EC_POINT_new(NISTP);
-        Q = EC_POINT_new(NISTP);
-        Q_CHECK = EC_POINT_new(NISTP);
-        if (!BN_hex2bn(&x, test->Qx))
-                ABORT;
-        if (!BN_hex2bn(&y, test->Qy))
-                ABORT;
-        if (!EC_POINT_set_affine_coordinates_GFp(NISTP, Q_CHECK, x, y, ctx))
-                ABORT;
-        if (!BN_hex2bn(&x, test->Gx))
-                ABORT;
-        if (!BN_hex2bn(&y, test->Gy))
-                ABORT;
-        if (!EC_POINT_set_affine_coordinates_GFp(NISTP, G, x, y, ctx))
-                ABORT;
-        if (!BN_hex2bn(&order, test->order))
-                ABORT;
-        if (!EC_GROUP_set_generator(NISTP, G, order, BN_value_one()))
-                ABORT;
-
-        fprintf(stdout, "verify degree ... ");
-        if (EC_GROUP_get_degree(NISTP) != test->degree)
-                ABORT;
-        fprintf(stdout, "ok\n");
-
-        fprintf(stdout, "NIST test vectors ... ");
-        if (!BN_hex2bn(&n, test->d))
-                ABORT;
-        /* fixed point multiplication */
-        EC_POINT_mul(NISTP, Q, n, NULL, NULL, ctx);
-        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
-                ABORT;
-        /* random point multiplication */
-        EC_POINT_mul(NISTP, Q, NULL, G, n, ctx);
-        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
-                ABORT;
-
-        /* set generator to P = 2*G, where G is the standard generator */
-        if (!EC_POINT_dbl(NISTP, P, G, ctx))
-                ABORT;
-        if (!EC_GROUP_set_generator(NISTP, P, order, BN_value_one()))
-                ABORT;
-        /* set the scalar to m=n/2, where n is the NIST test scalar */
-        if (!BN_rshift(m, n, 1))
-                ABORT;
-
-        /* test the non-standard generator */
-        /* fixed point multiplication */
-        EC_POINT_mul(NISTP, Q, m, NULL, NULL, ctx);
-        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
-                ABORT;
-        /* random point multiplication */
-        EC_POINT_mul(NISTP, Q, NULL, P, m, ctx);
-        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
-                ABORT;
-
-        /* now repeat all tests with precomputation */
-        if (!EC_GROUP_precompute_mult(NISTP, ctx))
-                ABORT;
-
-        /* fixed point multiplication */
-        EC_POINT_mul(NISTP, Q, m, NULL, NULL, ctx);
-        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
-                ABORT;
-        /* random point multiplication */
-        EC_POINT_mul(NISTP, Q, NULL, P, m, ctx);
-        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
-                ABORT;
-
-        /* reset generator */
-        if (!EC_GROUP_set_generator(NISTP, G, order, BN_value_one()))
-                ABORT;
-        /* fixed point multiplication */
-        EC_POINT_mul(NISTP, Q, n, NULL, NULL, ctx);
-        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
-                ABORT;
-        /* random point multiplication */
-        EC_POINT_mul(NISTP, Q, NULL, G, n, ctx);
-        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
-                ABORT;
-
-        fprintf(stdout, "ok\n");
-        group_order_tests(NISTP);
-        EC_GROUP_free(NISTP);
-        EC_POINT_free(G);
-        EC_POINT_free(P);
-        EC_POINT_free(Q);
-        EC_POINT_free(Q_CHECK);
-        BN_free(n);
-        BN_free(m);
-        BN_free(p);
-        BN_free(a);
-        BN_free(b);
-        BN_free(x);
-        BN_free(y);
-        BN_free(order);
-        BN_CTX_free(ctx);
-}
-
-void
-nistp_tests()
-{
-        unsigned i;
-
-        for (i = 0; i < sizeof(nistp_tests_params) / sizeof(struct nistp_test_params); i++) {
-                nistp_single_test(&nistp_tests_params[i]);
-        }
-}
-#endif
-
-int
-main(int argc, char *argv[])
-{
-        ERR_load_crypto_strings();
-
-        prime_field_tests();
-        puts("");
-#ifndef OPENSSL_NO_EC2M
-        char2_field_tests();
-#endif
-#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-        nistp_tests();
-#endif
-        /* test the internal curves */
-        internal_curve_test();
-
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE_cleanup();
-#endif
-        CRYPTO_cleanup_all_ex_data();
-        ERR_free_strings();
-        ERR_remove_thread_state(NULL);
-        CRYPTO_mem_leaks_fp(stderr);
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/ecdh/Makefile b/src/regress/lib/libcrypto/ecdh/Makefile
deleted file mode 100644
index b645771f7b..0000000000
--- a/src/regress/lib/libcrypto/ecdh/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   ecdhtest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ecdh/ecdhtest.c b/src/regress/lib/libcrypto/ecdh/ecdhtest.c
deleted file mode 100644
index faf519e07a..0000000000
--- a/src/regress/lib/libcrypto/ecdh/ecdhtest.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/*      $OpenBSD: ecdhtest.c,v 1.10 2018/07/17 17:06:49 tb Exp $        */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The ECDH software is originally written by Douglas Stebila of
- * Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/crypto.h>
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/objects.h>
-#include <openssl/sha.h>
-#include <openssl/err.h>
-
-#include <openssl/ec.h>
-#include <openssl/ecdh.h>
-
-static const int KDF1_SHA1_len = 20;
-static void *
-KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen)
-{
-#ifndef OPENSSL_NO_SHA
-        if (*outlen < SHA_DIGEST_LENGTH)
-                return NULL;
-        else
-                *outlen = SHA_DIGEST_LENGTH;
-        return SHA1(in, inlen, out);
-#else
-        return NULL;
-#endif
-}
-
-
-static int
-test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
-{
-        BIGNUM *x_a = NULL, *y_a = NULL, *x_b = NULL, *y_b = NULL;
-        EC_KEY *a = NULL, *b = NULL;
-        const EC_GROUP *group;
-        unsigned char *abuf = NULL, *bbuf = NULL;
-        int i, alen, blen, aout, bout, ret = 0;
-        char buf[12];
-
-        a = EC_KEY_new_by_curve_name(nid);
-        b = EC_KEY_new_by_curve_name(nid);
-        if (a == NULL || b == NULL)
-                goto err;
-
-        group = EC_KEY_get0_group(a);
-
-        if ((x_a = BN_new()) == NULL)
-                goto err;
-        if ((y_a = BN_new()) == NULL)
-                goto err;
-        if ((x_b = BN_new()) == NULL)
-                goto err;
-        if ((y_b = BN_new()) == NULL)
-                goto err;
-
-        BIO_puts(out, "Testing key generation with ");
-        BIO_puts(out, text);
-        (void)BIO_flush(out);
-
-        if (!EC_KEY_generate_key(a))
-                goto err;
-
-        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
-            NID_X9_62_prime_field) {
-                if (!EC_POINT_get_affine_coordinates_GFp(group,
-                    EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
-        }
-#ifndef OPENSSL_NO_EC2M
-        else {
-                if (!EC_POINT_get_affine_coordinates_GF2m(group,
-                    EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
-        }
-#endif
-        BIO_printf(out, " .");
-        (void)BIO_flush(out);
-
-        if (!EC_KEY_generate_key(b))
-                goto err;
-
-        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
-            NID_X9_62_prime_field) {
-                if (!EC_POINT_get_affine_coordinates_GFp(group,
-                    EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
-        }
-#ifndef OPENSSL_NO_EC2M
-        else {
-                if (!EC_POINT_get_affine_coordinates_GF2m(group,
-                    EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
-        }
-#endif
-
-        BIO_printf(out, ".");
-        (void)BIO_flush(out);
-
-        alen = KDF1_SHA1_len;
-        abuf = malloc(alen);
-        aout = ECDH_compute_key(abuf, alen, EC_KEY_get0_public_key(b),
-            a, KDF1_SHA1);
-
-        BIO_printf(out, ".");
-        (void)BIO_flush(out);
-
-        blen = KDF1_SHA1_len;
-        bbuf = malloc(blen);
-        bout = ECDH_compute_key(bbuf, blen, EC_KEY_get0_public_key(a),
-            b, KDF1_SHA1);
-
-        BIO_printf(out, ".");
-        (void)BIO_flush(out);
-
-        if ((aout < 4) || (bout != aout) || (memcmp(abuf, bbuf, aout) != 0)) {
-                BIO_printf(out, " failed\n\n");
-                BIO_printf(out, "key a:\n");
-                BIO_printf(out, "private key: ");
-                BN_print(out, EC_KEY_get0_private_key(a));
-                BIO_printf(out, "\n");
-                BIO_printf(out, "public key (x,y): ");
-                BN_print(out, x_a);
-                BIO_printf(out, ",");
-                BN_print(out, y_a);
-                BIO_printf(out, "\nkey b:\n");
-                BIO_printf(out, "private key: ");
-                BN_print(out, EC_KEY_get0_private_key(b));
-                BIO_printf(out, "\n");
-                BIO_printf(out, "public key (x,y): ");
-                BN_print(out, x_b);
-                BIO_printf(out, ",");
-                BN_print(out, y_b);
-                BIO_printf(out, "\n");
-                BIO_printf(out, "generated key a: ");
-                for (i = 0; i < bout; i++) {
-                        snprintf(buf, sizeof buf, "%02X", bbuf[i]);
-                        BIO_puts(out, buf);
-                }
-                BIO_printf(out, "\n");
-                BIO_printf(out, "generated key b: ");
-                for (i = 0; i < aout; i++) {
-                        snprintf(buf, sizeof buf, "%02X", abuf[i]);
-                        BIO_puts(out, buf);
-                }
-                BIO_printf(out, "\n");
-                fprintf(stderr, "Error in ECDH routines\n");
-                ret = 0;
-        } else {
-                BIO_printf(out, " ok\n");
-                ret = 1;
-        }
-
-err:
-        ERR_print_errors_fp(stderr);
-
-        free(abuf);
-        free(bbuf);
-        BN_free(x_a);
-        BN_free(y_a);
-        BN_free(x_b);
-        BN_free(y_b);
-        EC_KEY_free(b);
-        EC_KEY_free(a);
-
-        return (ret);
-}
-
-/* Keys and shared secrets from RFC 7027 */
-
-static const unsigned char bp256_da[] = {
-        0x81, 0xDB, 0x1E, 0xE1, 0x00, 0x15, 0x0F, 0xF2, 0xEA, 0x33, 0x8D, 0x70,
-        0x82, 0x71, 0xBE, 0x38, 0x30, 0x0C, 0xB5, 0x42, 0x41, 0xD7, 0x99, 0x50,
-        0xF7, 0x7B, 0x06, 0x30, 0x39, 0x80, 0x4F, 0x1D
-};
-
-static const unsigned char bp256_db[] = {
-        0x55, 0xE4, 0x0B, 0xC4, 0x1E, 0x37, 0xE3, 0xE2, 0xAD, 0x25, 0xC3, 0xC6,
-        0x65, 0x45, 0x11, 0xFF, 0xA8, 0x47, 0x4A, 0x91, 0xA0, 0x03, 0x20, 0x87,
-        0x59, 0x38, 0x52, 0xD3, 0xE7, 0xD7, 0x6B, 0xD3
-};
-
-static const unsigned char bp256_Z[] = {
-        0x89, 0xAF, 0xC3, 0x9D, 0x41, 0xD3, 0xB3, 0x27, 0x81, 0x4B, 0x80, 0x94,
-        0x0B, 0x04, 0x25, 0x90, 0xF9, 0x65, 0x56, 0xEC, 0x91, 0xE6, 0xAE, 0x79,
-        0x39, 0xBC, 0xE3, 0x1F, 0x3A, 0x18, 0xBF, 0x2B
-};
-
-static const unsigned char bp384_da[] = {
-        0x1E, 0x20, 0xF5, 0xE0, 0x48, 0xA5, 0x88, 0x6F, 0x1F, 0x15, 0x7C, 0x74,
-        0xE9, 0x1B, 0xDE, 0x2B, 0x98, 0xC8, 0xB5, 0x2D, 0x58, 0xE5, 0x00, 0x3D,
-        0x57, 0x05, 0x3F, 0xC4, 0xB0, 0xBD, 0x65, 0xD6, 0xF1, 0x5E, 0xB5, 0xD1,
-        0xEE, 0x16, 0x10, 0xDF, 0x87, 0x07, 0x95, 0x14, 0x36, 0x27, 0xD0, 0x42
-};
-
-static const unsigned char bp384_db[] = {
-        0x03, 0x26, 0x40, 0xBC, 0x60, 0x03, 0xC5, 0x92, 0x60, 0xF7, 0x25, 0x0C,
-        0x3D, 0xB5, 0x8C, 0xE6, 0x47, 0xF9, 0x8E, 0x12, 0x60, 0xAC, 0xCE, 0x4A,
-        0xCD, 0xA3, 0xDD, 0x86, 0x9F, 0x74, 0xE0, 0x1F, 0x8B, 0xA5, 0xE0, 0x32,
-        0x43, 0x09, 0xDB, 0x6A, 0x98, 0x31, 0x49, 0x7A, 0xBA, 0xC9, 0x66, 0x70
-};
-
-static const unsigned char bp384_Z[] = {
-        0x0B, 0xD9, 0xD3, 0xA7, 0xEA, 0x0B, 0x3D, 0x51, 0x9D, 0x09, 0xD8, 0xE4,
-        0x8D, 0x07, 0x85, 0xFB, 0x74, 0x4A, 0x6B, 0x35, 0x5E, 0x63, 0x04, 0xBC,
-        0x51, 0xC2, 0x29, 0xFB, 0xBC, 0xE2, 0x39, 0xBB, 0xAD, 0xF6, 0x40, 0x37,
-        0x15, 0xC3, 0x5D, 0x4F, 0xB2, 0xA5, 0x44, 0x4F, 0x57, 0x5D, 0x4F, 0x42
-};
-
-static const unsigned char bp512_da[] = {
-        0x16, 0x30, 0x2F, 0xF0, 0xDB, 0xBB, 0x5A, 0x8D, 0x73, 0x3D, 0xAB, 0x71,
-        0x41, 0xC1, 0xB4, 0x5A, 0xCB, 0xC8, 0x71, 0x59, 0x39, 0x67, 0x7F, 0x6A,
-        0x56, 0x85, 0x0A, 0x38, 0xBD, 0x87, 0xBD, 0x59, 0xB0, 0x9E, 0x80, 0x27,
-        0x96, 0x09, 0xFF, 0x33, 0x3E, 0xB9, 0xD4, 0xC0, 0x61, 0x23, 0x1F, 0xB2,
-        0x6F, 0x92, 0xEE, 0xB0, 0x49, 0x82, 0xA5, 0xF1, 0xD1, 0x76, 0x4C, 0xAD,
-        0x57, 0x66, 0x54, 0x22
-};
-
-static const unsigned char bp512_db[] = {
-        0x23, 0x0E, 0x18, 0xE1, 0xBC, 0xC8, 0x8A, 0x36, 0x2F, 0xA5, 0x4E, 0x4E,
-        0xA3, 0x90, 0x20, 0x09, 0x29, 0x2F, 0x7F, 0x80, 0x33, 0x62, 0x4F, 0xD4,
-        0x71, 0xB5, 0xD8, 0xAC, 0xE4, 0x9D, 0x12, 0xCF, 0xAB, 0xBC, 0x19, 0x96,
-        0x3D, 0xAB, 0x8E, 0x2F, 0x1E, 0xBA, 0x00, 0xBF, 0xFB, 0x29, 0xE4, 0xD7,
-        0x2D, 0x13, 0xF2, 0x22, 0x45, 0x62, 0xF4, 0x05, 0xCB, 0x80, 0x50, 0x36,
-        0x66, 0xB2, 0x54, 0x29
-};
-
-
-static const unsigned char bp512_Z[] = {
-        0xA7, 0x92, 0x70, 0x98, 0x65, 0x5F, 0x1F, 0x99, 0x76, 0xFA, 0x50, 0xA9,
-        0xD5, 0x66, 0x86, 0x5D, 0xC5, 0x30, 0x33, 0x18, 0x46, 0x38, 0x1C, 0x87,
-        0x25, 0x6B, 0xAF, 0x32, 0x26, 0x24, 0x4B, 0x76, 0xD3, 0x64, 0x03, 0xC0,
-        0x24, 0xD7, 0xBB, 0xF0, 0xAA, 0x08, 0x03, 0xEA, 0xFF, 0x40, 0x5D, 0x3D,
-        0x24, 0xF1, 0x1A, 0x9B, 0x5C, 0x0B, 0xEF, 0x67, 0x9F, 0xE1, 0x45, 0x4B,
-        0x21, 0xC4, 0xCD, 0x1F
-};
-
-/* Given private value and NID, create EC_KEY structure */
-
-static EC_KEY *
-mk_eckey(int nid, const unsigned char *p, size_t plen)
-{
-        EC_KEY *k = NULL;
-        BIGNUM *priv = NULL;
-        EC_POINT *pub = NULL;
-        const EC_GROUP *grp;
-        int ok = 0;
-
-        k = EC_KEY_new_by_curve_name(nid);
-        if (!k)
-                goto err;
-        priv = BN_bin2bn(p, plen, NULL);
-        if (!priv)
-                goto err;
-        if (!EC_KEY_set_private_key(k, priv))
-                goto err;
-        grp = EC_KEY_get0_group(k);
-        pub = EC_POINT_new(grp);
-        if (!pub)
-                goto err;
-        if (!EC_POINT_mul(grp, pub, priv, NULL, NULL, NULL))
-                goto err;
-        if (!EC_KEY_set_public_key(k, pub))
-                goto err;
-        ok = 1;
-err:
-        BN_clear_free(priv);
-        EC_POINT_free(pub);
-        if (!ok) {
-                EC_KEY_free(k);
-                k = NULL;
-        }
-        return (k);
-}
-
-/* Known answer test: compute shared secret and check it matches
- * expected value.
- */
-
-static int
-ecdh_kat(BIO *out, const char *cname, int nid,
-    const unsigned char *k1, size_t k1_len,
-    const unsigned char *k2, size_t k2_len,
-    const unsigned char *Z, size_t Zlen)
-{
-        int rv = 0;
-        EC_KEY *key1 = NULL, *key2 = NULL;
-        unsigned char *Ztmp = NULL;
-        size_t Ztmplen;
-        BIO_puts(out, "Testing ECDH shared secret with ");
-        BIO_puts(out, cname);
-        key1 = mk_eckey(nid, k1, k1_len);
-        key2 = mk_eckey(nid, k2, k2_len);
-        if (!key1 || !key2)
-                goto err;
-        Ztmplen = ECDH_size(key1);
-        if (Ztmplen != Zlen)
-                goto err;
-        Ztmp = malloc(Ztmplen);
-        if (!ECDH_compute_key(Ztmp, Ztmplen,
-            EC_KEY_get0_public_key(key2), key1, 0))
-                goto err;
-        if (memcmp(Ztmp, Z, Zlen))
-                goto err;
-        memset(Ztmp, 0, Zlen);
-        if (!ECDH_compute_key(Ztmp, Ztmplen,
-            EC_KEY_get0_public_key(key1), key2, 0))
-                goto err;
-        if (memcmp(Ztmp, Z, Zlen))
-                goto err;
-        rv = 1;
-
-err:
-        if (rv)
-                BIO_puts(out, " ok\n");
-        else {
-                fprintf(stderr, "Error in ECDH routines\n");
-                ERR_print_errors_fp(stderr);
-        }
-
-        EC_KEY_free(key1);
-        EC_KEY_free(key2);
-        free(Ztmp);
-
-        return rv;
-}
-
-#define test_ecdh_kat(bio, curve, bits) \
-        ecdh_kat(bio, curve, NID_brainpoolP##bits##r1, \
-                bp##bits##_da, sizeof(bp##bits##_da), \
-                bp##bits##_db, sizeof(bp##bits##_db), \
-                bp##bits##_Z, sizeof(bp##bits##_Z))
-
-int
-main(int argc, char *argv[])
-{
-        BN_CTX *ctx = NULL;
-        int ret = 1;
-        BIO *out;
-
-        out = BIO_new(BIO_s_file());
-        if (out == NULL)
-                exit(1);
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-
-        if ((ctx = BN_CTX_new()) == NULL)
-                goto err;
-
-        /* NIST PRIME CURVES TESTS */
-        if (!test_ecdh_curve(NID_X9_62_prime192v1, "NIST Prime-Curve P-192",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_X9_62_prime256v1, "NIST Prime-Curve P-256",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_secp384r1, "NIST Prime-Curve P-384", ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_secp521r1, "NIST Prime-Curve P-521", ctx, out))
-                goto err;
-#ifndef OPENSSL_NO_EC2M
-        /* NIST BINARY CURVES TESTS */
-        if (!test_ecdh_curve(NID_sect163k1, "NIST Binary-Curve K-163",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect163r2, "NIST Binary-Curve B-163",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect233k1, "NIST Binary-Curve K-233",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect233r1, "NIST Binary-Curve B-233",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect283k1, "NIST Binary-Curve K-283",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect283r1, "NIST Binary-Curve B-283",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect409k1, "NIST Binary-Curve K-409",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect409r1, "NIST Binary-Curve B-409",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect571k1, "NIST Binary-Curve K-571",
-            ctx, out))
-                goto err;
-        if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571",
-            ctx, out))
-                goto err;
-#endif
-        if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP256r1", 256))
-                goto err;
-        if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP384r1", 384))
-                goto err;
-        if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP512r1", 512))
-                goto err;
-
-        ret = 0;
-
-err:
-        ERR_print_errors_fp(stderr);
-        BN_CTX_free(ctx);
-        BIO_free(out);
-        CRYPTO_cleanup_all_ex_data();
-        ERR_remove_thread_state(NULL);
-        CRYPTO_mem_leaks_fp(stderr);
-        exit(ret);
-}
diff --git a/src/regress/lib/libcrypto/ecdsa/Makefile b/src/regress/lib/libcrypto/ecdsa/Makefile
deleted file mode 100644
index 0c2e26a85e..0000000000
--- a/src/regress/lib/libcrypto/ecdsa/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   ecdsatest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ecdsa/ecdsatest.c b/src/regress/lib/libcrypto/ecdsa/ecdsatest.c
deleted file mode 100644
index 097768d11e..0000000000
--- a/src/regress/lib/libcrypto/ecdsa/ecdsatest.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/*      $OpenBSD: ecdsatest.c,v 1.6 2018/07/17 17:10:04 tb Exp $        */
-/*
- * Written by Nils Larsch for the OpenSSL project.
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/crypto.h>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/bn.h>
-#include <openssl/ecdsa.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/err.h>
-
-/* declaration of the test functions */
-int x9_62_test_internal(BIO *out, int nid, const char *r, const char *s);
-int test_builtin(BIO *);
-
-/* some tests from the X9.62 draft */
-int
-x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
-{
-        int     ret = 0;
-        const char message[] = "abc";
-        unsigned char digest[20];
-        unsigned int  dgst_len = 0;
-        EVP_MD_CTX md_ctx;
-        EC_KEY    *key = NULL;
-        ECDSA_SIG *signature = NULL;
-        BIGNUM    *r = NULL, *s = NULL;
-
-        EVP_MD_CTX_init(&md_ctx);
-        /* get the message digest */
-        EVP_DigestInit(&md_ctx, EVP_ecdsa());
-        EVP_DigestUpdate(&md_ctx, (const void*)message, 3);
-        EVP_DigestFinal(&md_ctx, digest, &dgst_len);
-
-        BIO_printf(out, "testing %s: ", OBJ_nid2sn(nid));
-        /* create the key */
-        if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
-                goto x962_int_err;
-        if (!EC_KEY_generate_key(key))
-                goto x962_int_err;
-        BIO_printf(out, ".");
-        (void)BIO_flush(out);
-        /* create the signature */
-        signature = ECDSA_do_sign(digest, 20, key);
-        if (signature == NULL)
-                goto x962_int_err;
-        BIO_printf(out, ".");
-        (void)BIO_flush(out);
-        /* compare the created signature with the expected signature */
-        if ((r = BN_new()) == NULL || (s = BN_new()) == NULL)
-                goto x962_int_err;
-        if (!BN_dec2bn(&r, r_in) ||
-            !BN_dec2bn(&s, s_in))
-                goto x962_int_err;
-        if (BN_cmp(signature->r ,r) || BN_cmp(signature->s, s))
-                goto x962_int_err;
-        BIO_printf(out, ".");
-        (void)BIO_flush(out);
-        /* verify the signature */
-        if (ECDSA_do_verify(digest, 20, signature, key) != 1)
-                goto x962_int_err;
-        BIO_printf(out, ".");
-        (void)BIO_flush(out);
-
-        BIO_printf(out, " ok\n");
-        ret = 1;
- x962_int_err:
-        if (!ret)
-                BIO_printf(out, " failed\n");
-        if (key)
-                EC_KEY_free(key);
-        if (signature)
-                ECDSA_SIG_free(signature);
-        if (r)
-                BN_free(r);
-        if (s)
-                BN_free(s);
-        EVP_MD_CTX_cleanup(&md_ctx);
-        return ret;
-}
-
-int
-test_builtin(BIO *out)
-{
-        EC_builtin_curve *curves = NULL;
-        size_t          num_curves = 0, n = 0;
-        EC_KEY          *eckey = NULL, *wrong_eckey = NULL;
-        EC_GROUP        *group;
-        ECDSA_SIG       *ecdsa_sig = NULL;
-        unsigned char   digest[20], wrong_digest[20];
-        unsigned char   *signature = NULL;
-        const unsigned char     *sig_ptr;
-        unsigned char   *sig_ptr2;
-        unsigned char   *raw_buf = NULL;
-        unsigned int    sig_len, degree, r_len, s_len, bn_len, buf_len;
-        int             nid, ret =  0;
-
-        /* fill digest values with some random data */
-        arc4random_buf(digest, 20);
-        arc4random_buf(wrong_digest, 20);
-
-        /* create and verify a ecdsa signature with every available curve */
-        BIO_printf(out, "\ntesting ECDSA_sign() and ECDSA_verify() "
-                "with some internal curves:\n");
-
-        /* get a list of all internal curves */
-        num_curves = EC_get_builtin_curves(NULL, 0);
-
-        curves = reallocarray(NULL, sizeof(EC_builtin_curve), num_curves);
-
-        if (curves == NULL) {
-                BIO_printf(out, "reallocarray error\n");
-                goto builtin_err;
-        }
-
-        if (!EC_get_builtin_curves(curves, num_curves)) {
-                BIO_printf(out, "unable to get internal curves\n");
-                goto builtin_err;
-        }
-
-        /* now create and verify a signature for every curve */
-        for (n = 0; n < num_curves; n++) {
-                unsigned char dirt, offset;
-
-                nid = curves[n].nid;
-                if (nid == NID_ipsec4)
-                        continue;
-                /* create new ecdsa key (== EC_KEY) */
-                if ((eckey = EC_KEY_new()) == NULL)
-                        goto builtin_err;
-                group = EC_GROUP_new_by_curve_name(nid);
-                if (group == NULL)
-                        goto builtin_err;
-                if (EC_KEY_set_group(eckey, group) == 0)
-                        goto builtin_err;
-                EC_GROUP_free(group);
-                degree = EC_GROUP_get_degree(EC_KEY_get0_group(eckey));
-                if (degree < 160) {
-                        /* drop the curve */
-                        EC_KEY_free(eckey);
-                        eckey = NULL;
-                        continue;
-                }
-                BIO_printf(out, "%s: ", OBJ_nid2sn(nid));
-                /* create key */
-                if (!EC_KEY_generate_key(eckey)) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                /* create second key */
-                if ((wrong_eckey = EC_KEY_new()) == NULL)
-                        goto builtin_err;
-                group = EC_GROUP_new_by_curve_name(nid);
-                if (group == NULL)
-                        goto builtin_err;
-                if (EC_KEY_set_group(wrong_eckey, group) == 0)
-                        goto builtin_err;
-                EC_GROUP_free(group);
-                if (!EC_KEY_generate_key(wrong_eckey)) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-
-                BIO_printf(out, ".");
-                (void)BIO_flush(out);
-                /* check key */
-                if (!EC_KEY_check_key(eckey)) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                BIO_printf(out, ".");
-                (void)BIO_flush(out);
-                /* create signature */
-                sig_len = ECDSA_size(eckey);
-                if ((signature = malloc(sig_len)) == NULL)
-                        goto builtin_err;
-                if (!ECDSA_sign(0, digest, 20, signature, &sig_len, eckey)) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                BIO_printf(out, ".");
-                (void)BIO_flush(out);
-                /* verify signature */
-                if (ECDSA_verify(0, digest, 20, signature, sig_len,
-                    eckey) != 1) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                BIO_printf(out, ".");
-                (void)BIO_flush(out);
-                /* verify signature with the wrong key */
-                if (ECDSA_verify(0, digest, 20, signature, sig_len,
-                        wrong_eckey) == 1) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                BIO_printf(out, ".");
-                (void)BIO_flush(out);
-                /* wrong digest */
-                if (ECDSA_verify(0, wrong_digest, 20, signature, sig_len,
-                    eckey) == 1) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                BIO_printf(out, ".");
-                (void)BIO_flush(out);
-                /* wrong length */
-                if (ECDSA_verify(0, digest, 20, signature, sig_len - 1,
-                    eckey) == 1) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                BIO_printf(out, ".");
-                (void)BIO_flush(out);
-
-                /*
-                 * Modify a single byte of the signature: to ensure we don't
-                 * garble the ASN1 structure, we read the raw signature and
-                 * modify a byte in one of the bignums directly.
-                 */
-                sig_ptr = signature;
-                if ((ecdsa_sig = d2i_ECDSA_SIG(NULL, &sig_ptr,
-                    sig_len)) == NULL) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-
-                /* Store the two BIGNUMs in raw_buf. */
-                r_len = BN_num_bytes(ecdsa_sig->r);
-                s_len = BN_num_bytes(ecdsa_sig->s);
-                bn_len = (degree + 7) / 8;
-                if ((r_len > bn_len) || (s_len > bn_len)) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                buf_len = 2 * bn_len;
-                if ((raw_buf = calloc(1, buf_len)) == NULL)
-                        goto builtin_err;
-                BN_bn2bin(ecdsa_sig->r, raw_buf + bn_len - r_len);
-                BN_bn2bin(ecdsa_sig->s, raw_buf + buf_len - s_len);
-
-                /* Modify a single byte in the buffer. */
-                offset = raw_buf[10] % buf_len;
-                dirt   = raw_buf[11] ? raw_buf[11] : 1;
-                raw_buf[offset] ^= dirt;
-                /* Now read the BIGNUMs back in from raw_buf. */
-                if ((BN_bin2bn(raw_buf, bn_len, ecdsa_sig->r) == NULL) ||
-                    (BN_bin2bn(raw_buf + bn_len, bn_len, ecdsa_sig->s) == NULL))
-                        goto builtin_err;
-
-                sig_ptr2 = signature;
-                sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr2);
-                if (ECDSA_verify(0, digest, 20, signature, sig_len,
-                    eckey) == 1) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                /* Sanity check: undo the modification and verify signature. */
-                raw_buf[offset] ^= dirt;
-                if ((BN_bin2bn(raw_buf, bn_len, ecdsa_sig->r) == NULL) ||
-                    (BN_bin2bn(raw_buf + bn_len, bn_len, ecdsa_sig->s) == NULL))
-                        goto builtin_err;
-
-                sig_ptr2 = signature;
-                sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr2);
-                if (ECDSA_verify(0, digest, 20, signature, sig_len,
-                    eckey) != 1) {
-                        BIO_printf(out, " failed\n");
-                        goto builtin_err;
-                }
-                BIO_printf(out, ".");
-                (void)BIO_flush(out);
-
-                BIO_printf(out, " ok\n");
-                /* cleanup */
-                /* clean bogus errors */
-                ERR_clear_error();
-                free(signature);
-                signature = NULL;
-                EC_KEY_free(eckey);
-                eckey = NULL;
-                EC_KEY_free(wrong_eckey);
-                wrong_eckey = NULL;
-                ECDSA_SIG_free(ecdsa_sig);
-                ecdsa_sig = NULL;
-                free(raw_buf);
-                raw_buf = NULL;
-        }
-
-        ret = 1;
- builtin_err:
-        EC_KEY_free(eckey);
-        EC_KEY_free(wrong_eckey);
-        ECDSA_SIG_free(ecdsa_sig);
-        free(signature);
-        free(raw_buf);
-        free(curves);
-
-        return ret;
-}
-
-int
-main(void)
-{
-        int     ret = 1;
-        BIO     *out;
-
-        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-
-        ERR_load_crypto_strings();
-
-        /* the tests */
-        if (!test_builtin(out))
-                goto err;
-
-        ret = 0;
- err:
-        if (ret)
-                BIO_printf(out, "\nECDSA test failed\n");
-        else
-                BIO_printf(out, "\nECDSA test passed\n");
-        if (ret)
-                ERR_print_errors(out);
-        CRYPTO_cleanup_all_ex_data();
-        ERR_remove_thread_state(NULL);
-        ERR_free_strings();
-        CRYPTO_mem_leaks(out);
-        if (out != NULL)
-                BIO_free(out);
-        return ret;
-}
diff --git a/src/regress/lib/libcrypto/engine/Makefile b/src/regress/lib/libcrypto/engine/Makefile
deleted file mode 100644
index 7f11b0d382..0000000000
--- a/src/regress/lib/libcrypto/engine/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   enginetest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/engine/enginetest.c b/src/regress/lib/libcrypto/engine/enginetest.c
deleted file mode 100644
index 123866259b..0000000000
--- a/src/regress/lib/libcrypto/engine/enginetest.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*      $OpenBSD: enginetest.c,v 1.8 2018/07/17 17:06:49 tb Exp $       */
-/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <openssl/buffer.h>
-#include <openssl/crypto.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
-
-static void display_engine_list(void)
-{
-        ENGINE *h;
-        int loop;
-
-        h = ENGINE_get_first();
-        loop = 0;
-        printf("listing available engine types\n");
-        while (h) {
-                printf("engine %i, id = \"%s\", name = \"%s\"\n",
-                    loop++, ENGINE_get_id(h), ENGINE_get_name(h));
-                h = ENGINE_get_next(h);
-        }
-
-        printf("end of list\n");
-        /*
-         * ENGINE_get_first() increases the struct_ref counter, so we must call
-         * ENGINE_free() to decrease it again
-         */
-        ENGINE_free(h);
-}
-
-int main(int argc, char *argv[])
-{
-        ENGINE *block[512];
-        char *id, *name;
-        ENGINE *ptr;
-        int loop;
-        int to_return = 1;
-        ENGINE *new_h1 = NULL;
-        ENGINE *new_h2 = NULL;
-        ENGINE *new_h3 = NULL;
-        ENGINE *new_h4 = NULL;
-
-        ERR_load_crypto_strings();
-
-        memset(block, 0, 512 * sizeof(ENGINE *));
-        if (((new_h1 = ENGINE_new()) == NULL) ||
-           !ENGINE_set_id(new_h1, "test_id0") ||
-           !ENGINE_set_name(new_h1, "First test item") ||
-           ((new_h2 = ENGINE_new()) == NULL) ||
-           !ENGINE_set_id(new_h2, "test_id1") ||
-           !ENGINE_set_name(new_h2, "Second test item") ||
-           ((new_h3 = ENGINE_new()) == NULL) ||
-           !ENGINE_set_id(new_h3, "test_id2") ||
-           !ENGINE_set_name(new_h3, "Third test item") ||
-           ((new_h4 = ENGINE_new()) == NULL) ||
-           !ENGINE_set_id(new_h4, "test_id3") ||
-           !ENGINE_set_name(new_h4, "Fourth test item")) {
-                printf("Couldn't set up test ENGINE structures\n");
-                goto end;
-        }
-
-        printf("\nenginetest beginning\n\n");
-        display_engine_list();
-        if (!ENGINE_add(new_h1)) {
-                printf("Add failed!\n");
-                goto end;
-        }
-        display_engine_list();
-        ptr = ENGINE_get_first();
-        if (!ENGINE_remove(ptr)) {
-                printf("Remove failed!\n");
-                goto end;
-        }
-        ENGINE_free(ptr);
-        display_engine_list();
-        if (!ENGINE_add(new_h3) || !ENGINE_add(new_h2)) {
-                printf("Add failed!\n");
-                goto end;
-        }
-        display_engine_list();
-        if (!ENGINE_remove(new_h2)) {
-                printf("Remove failed!\n");
-                goto end;
-        }
-        display_engine_list();
-        if (!ENGINE_add(new_h4)) {
-                printf("Add failed!\n");
-                goto end;
-        }
-        display_engine_list();
-        if (ENGINE_add(new_h3)) {
-                printf("Add *should* have failed but didn't!\n");
-                goto end;
-        } else
-                printf("Add that should fail did.\n");
-        ERR_clear_error();
-        if (ENGINE_remove(new_h2)) {
-                printf("Remove *should* have failed but didn't!\n");
-                goto end;
-        } else
-                printf("Remove that should fail did.\n");
-        ERR_clear_error();
-        if (!ENGINE_remove(new_h3)) {
-                printf("Remove failed!\n");
-                goto end;
-        }
-        display_engine_list();
-        if (!ENGINE_remove(new_h4)) {
-                printf("Remove failed!\n");
-                goto end;
-        }
-        display_engine_list();
-        /*
-         * Depending on whether there's any hardware support compiled
-         * in, this remove may be destined to fail.
-         */
-        ptr = ENGINE_get_first();
-        if (ptr)
-                if (!ENGINE_remove(ptr))
-                        printf("Remove failed!i - probably no hardware "
-                                "support present.\n");
-        ENGINE_free(ptr);
-        display_engine_list();
-
-        if (!ENGINE_add(new_h1) || !ENGINE_remove(new_h1)) {
-                printf("Couldn't add and remove to an empty list!\n");
-                goto end;
-        } else
-                printf("Successfully added and removed to an empty list!\n");
-
-        printf("About to beef up the engine-type list\n");
-        for (loop = 0; loop < 512; loop++) {
-                if (asprintf(&id, "id%i", loop) == -1)
-                        goto end;
-                if (asprintf(&name, "Fake engine type %i", loop) == -1)
-                        goto end;
-
-                if (((block[loop] = ENGINE_new()) == NULL) ||
-                    !id || !ENGINE_set_id(block[loop], id) ||
-                    !name || !ENGINE_set_name(block[loop], name)) {
-                        printf("Couldn't create block of ENGINE structures.\n");
-                        goto end;
-                }
-        }
-
-        for (loop = 0; loop < 512; loop++) {
-                if (!ENGINE_add(block[loop])) {
-                        printf("\nAdding stopped at %i, (%s,%s)\n",
-                                loop, ENGINE_get_id(block[loop]),
-                                ENGINE_get_name(block[loop]));
-                        break;
-                }
-                printf(".");
-                fflush(stdout);
-        }
-        printf("\nAbout to empty the engine-type list\n");
-        while ((ptr = ENGINE_get_first()) != NULL) {
-                if (!ENGINE_remove(ptr)) {
-                        printf("\nRemove failed!\n");
-                        goto end;
-                }
-                ENGINE_free(ptr);
-                printf("."); fflush(stdout);
-        }
-        for (loop = 0; loop < 512; loop++) {
-                free((void *)ENGINE_get_id(block[loop]));
-                free((void *)ENGINE_get_name(block[loop]));
-        }
-        printf("\nTests completed happily\n");
-        to_return = 0;
-end:
-        if (to_return)
-                ERR_print_errors_fp(stderr);
-        ENGINE_free(new_h1);
-        ENGINE_free(new_h2);
-        ENGINE_free(new_h3);
-        ENGINE_free(new_h4);
-        for (loop = 0; loop < 512; loop++)
-                ENGINE_free(block[loop]);
-        ENGINE_cleanup();
-        CRYPTO_cleanup_all_ex_data();
-        ERR_free_strings();
-        ERR_remove_thread_state(NULL);
-        CRYPTO_mem_leaks_fp(stderr);
-        return to_return;
-}
diff --git a/src/regress/lib/libcrypto/evp/Makefile b/src/regress/lib/libcrypto/evp/Makefile
deleted file mode 100644
index 33c77fc1dd..0000000000
--- a/src/regress/lib/libcrypto/evp/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   evptest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-REGRESS_TARGETS=regress-evptest
-
-regress-evptest:        ${PROG}
-        ./${PROG} ${.CURDIR}/evptests.txt
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/evp/evptest.c b/src/regress/lib/libcrypto/evp/evptest.c
deleted file mode 100644
index 1aa11d7b1e..0000000000
--- a/src/regress/lib/libcrypto/evp/evptest.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*      $OpenBSD: evptest.c,v 1.7 2018/07/17 17:06:49 tb Exp $  */
-/* Written by Ben Laurie, 2001 */
-/*
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <openssl/opensslconf.h>
-#include <openssl/evp.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/err.h>
-#include <openssl/conf.h>
-
-static void
-hexdump(FILE *f, const char *title, const unsigned char *s, int l)
-{
-        int n = 0;
-
-        fprintf(f, "%s",title);
-        for (; n < l; ++n) {
-                if ((n % 16) == 0)
-                        fprintf(f, "\n%04x",n);
-                fprintf(f, " %02x",s[n]);
-        }
-        fprintf(f, "\n");
-}
-
-static int
-convert(unsigned char *s)
-{
-        unsigned char *d;
-
-        for (d = s; *s; s += 2,++d) {
-                unsigned int n;
-
-                if (!s[1]) {
-                        fprintf(stderr, "Odd number of hex digits!\n");
-                        exit(4);
-                }
-                if (sscanf((char *)s, "%2x", &n) != 1) {
-                        fprintf(stderr, "Invalid hex value at %s\n", s);
-                        exit(4);
-                }
-
-                *d = (unsigned char)n;
-        }
-        return s - d;
-}
-
-static char *
-sstrsep(char **string, const char *delim)
-{
-        char isdelim[256];
-        char *token = *string;
-
-        if (**string == 0)
-                return NULL;
-
-        memset(isdelim, 0, 256);
-        isdelim[0] = 1;
-
-        while (*delim) {
-                isdelim[(unsigned char)(*delim)] = 1;
-                delim++;
-        }
-
-        while (!isdelim[(unsigned char)(**string)]) {
-                (*string)++;
-        }
-
-        if (**string) {
-                **string = 0;
-                (*string)++;
-        }
-
-        return token;
-}
-
-static unsigned char *
-ustrsep(char **p, const char *sep)
-{
-        return (unsigned char *)sstrsep(p, sep);
-}
-
-static int
-test1_exit(int ec)
-{
-        exit(ec);
-        return(0);              /* To keep some compilers quiet */
-}
-
-static void
-test1(const EVP_CIPHER *c, const unsigned char *key, int kn,
-    const unsigned char *iv, int in, const unsigned char *plaintext, int pn,
-    const unsigned char *ciphertext, int cn, int encdec)
-{
-        EVP_CIPHER_CTX ctx;
-        unsigned char out[4096];
-        int outl, outl2;
-
-        printf("Testing cipher %s%s\n", EVP_CIPHER_name(c),
-            (encdec == 1 ? "(encrypt)" : (encdec == 0 ? "(decrypt)" : "(encrypt/decrypt)")));
-        hexdump(stdout, "Key",key,kn);
-        if (in)
-                hexdump(stdout, "IV",iv,in);
-        hexdump(stdout, "Plaintext",plaintext,pn);
-        hexdump(stdout, "Ciphertext",ciphertext,cn);
-
-        if (kn != c->key_len) {
-                fprintf(stderr, "Key length doesn't match, got %d expected %lu\n",kn,
-                    (unsigned long)c->key_len);
-                test1_exit(5);
-        }
-        EVP_CIPHER_CTX_init(&ctx);
-        if (encdec != 0) {
-                if (!EVP_EncryptInit_ex(&ctx, c,NULL, key, iv)) {
-                        fprintf(stderr, "EncryptInit failed\n");
-                        ERR_print_errors_fp(stderr);
-                        test1_exit(10);
-                }
-                EVP_CIPHER_CTX_set_padding(&ctx, 0);
-
-                if (!EVP_EncryptUpdate(&ctx, out, &outl, plaintext, pn)) {
-                        fprintf(stderr, "Encrypt failed\n");
-                        ERR_print_errors_fp(stderr);
-                        test1_exit(6);
-                }
-                if (!EVP_EncryptFinal_ex(&ctx, out + outl, &outl2)) {
-                        fprintf(stderr, "EncryptFinal failed\n");
-                        ERR_print_errors_fp(stderr);
-                        test1_exit(7);
-                }
-
-                if (outl + outl2 != cn) {
-                        fprintf(stderr, "Ciphertext length mismatch got %d expected %d\n",
-                            outl + outl2, cn);
-                        test1_exit(8);
-                }
-
-                if (memcmp(out, ciphertext, cn)) {
-                        fprintf(stderr, "Ciphertext mismatch\n");
-                        hexdump(stderr, "Got",out,cn);
-                        hexdump(stderr, "Expected",ciphertext,cn);
-                        test1_exit(9);
-                }
-        }
-
-        if (encdec <= 0) {
-                if (!EVP_DecryptInit_ex(&ctx, c,NULL, key, iv)) {
-                        fprintf(stderr, "DecryptInit failed\n");
-                        ERR_print_errors_fp(stderr);
-                        test1_exit(11);
-                }
-                EVP_CIPHER_CTX_set_padding(&ctx, 0);
-
-                if (!EVP_DecryptUpdate(&ctx, out, &outl, ciphertext, cn)) {
-                        fprintf(stderr, "Decrypt failed\n");
-                        ERR_print_errors_fp(stderr);
-                        test1_exit(6);
-                }
-                if (!EVP_DecryptFinal_ex(&ctx, out + outl, &outl2)) {
-                        fprintf(stderr, "DecryptFinal failed\n");
-                        ERR_print_errors_fp(stderr);
-                        test1_exit(7);
-                }
-
-                if (outl + outl2 != pn) {
-                        fprintf(stderr, "Plaintext length mismatch got %d expected %d\n",
-                            outl + outl2, pn);
-                        test1_exit(8);
-                }
-
-                if (memcmp(out, plaintext, pn)) {
-                        fprintf(stderr, "Plaintext mismatch\n");
-                        hexdump(stderr, "Got",out,pn);
-                        hexdump(stderr, "Expected",plaintext,pn);
-                        test1_exit(9);
-                }
-        }
-
-        EVP_CIPHER_CTX_cleanup(&ctx);
-
-        printf("\n");
-}
-
-static int
-test_cipher(const char *cipher, const unsigned char *key, int kn,
-    const unsigned char *iv, int in, const unsigned char *plaintext, int pn,
-    const unsigned char *ciphertext, int cn, int encdec)
-{
-        const EVP_CIPHER *c;
-
-        c = EVP_get_cipherbyname(cipher);
-        if (!c)
-                return 0;
-
-        test1(c, key, kn, iv, in, plaintext, pn, ciphertext, cn, encdec);
-
-        return 1;
-}
-
-static int
-test_digest(const char *digest, const unsigned char *plaintext, int pn,
-    const unsigned char *ciphertext, unsigned int cn)
-{
-        const EVP_MD *d;
-        EVP_MD_CTX ctx;
-        unsigned char md[EVP_MAX_MD_SIZE];
-        unsigned int mdn;
-
-        d = EVP_get_digestbyname(digest);
-        if (!d)
-                return 0;
-
-        printf("Testing digest %s\n",EVP_MD_name(d));
-        hexdump(stdout, "Plaintext",plaintext,pn);
-        hexdump(stdout, "Digest",ciphertext,cn);
-
-        EVP_MD_CTX_init(&ctx);
-        if (!EVP_DigestInit_ex(&ctx, d, NULL)) {
-                fprintf(stderr, "DigestInit failed\n");
-                ERR_print_errors_fp(stderr);
-                exit(100);
-        }
-        if (!EVP_DigestUpdate(&ctx, plaintext, pn)) {
-                fprintf(stderr, "DigestUpdate failed\n");
-                ERR_print_errors_fp(stderr);
-                exit(101);
-        }
-        if (!EVP_DigestFinal_ex(&ctx, md, &mdn)) {
-                fprintf(stderr, "DigestFinal failed\n");
-                ERR_print_errors_fp(stderr);
-                exit(101);
-        }
-        EVP_MD_CTX_cleanup(&ctx);
-
-        if (mdn != cn) {
-                fprintf(stderr, "Digest length mismatch, got %d expected %d\n",mdn,cn);
-                exit(102);
-        }
-
-        if (memcmp(md, ciphertext, cn)) {
-                fprintf(stderr, "Digest mismatch\n");
-                hexdump(stderr, "Got",md,cn);
-                hexdump(stderr, "Expected",ciphertext,cn);
-                exit(103);
-        }
-
-        printf("\n");
-
-        EVP_MD_CTX_cleanup(&ctx);
-
-        return 1;
-}
-
-int
-main(int argc, char **argv)
-{
-        const char *szTestFile;
-        FILE *f;
-
-        if (argc != 2) {
-                fprintf(stderr, "%s <test file>\n",argv[0]);
-                exit(1);
-        }
-
-        szTestFile = argv[1];
-
-        f=fopen(szTestFile, "r");
-        if (!f) {
-                perror(szTestFile);
-                exit(2);
-        }
-
-        /* Load up the software EVP_CIPHER and EVP_MD definitions */
-        OpenSSL_add_all_ciphers();
-        OpenSSL_add_all_digests();
-#ifndef OPENSSL_NO_ENGINE
-        /* Load all compiled-in ENGINEs */
-        ENGINE_load_builtin_engines();
-#endif
-#if 0
-        OPENSSL_config();
-#endif
-#ifndef OPENSSL_NO_ENGINE
-    /* Register all available ENGINE implementations of ciphers and digests.
-     * This could perhaps be changed to "ENGINE_register_all_complete()"? */
-        ENGINE_register_all_ciphers();
-        ENGINE_register_all_digests();
-    /* If we add command-line options, this statement should be switchable.
-     * It'll prevent ENGINEs being ENGINE_init()ialised for cipher/digest use if
-     * they weren't already initialised. */
-        /* ENGINE_set_cipher_flags(ENGINE_CIPHER_FLAG_NOINIT); */
-#endif
-
-        for (;;) {
-                char line[4096];
-                char *p;
-                char *cipher;
-                unsigned char *iv, *key, *plaintext, *ciphertext;
-                int encdec;
-                int kn, in, pn, cn;
-
-                if (!fgets((char *)line, sizeof line, f))
-                        break;
-                if (line[0] == '#' || line[0] == '\n')
-                        continue;
-                p = line;
-                cipher=sstrsep(&p, ":");
-                key=ustrsep(&p, ":");
-                iv=ustrsep(&p, ":");
-                plaintext=ustrsep(&p, ":");
-                ciphertext=ustrsep(&p, ":");
-                if (p[-1] == '\n') {
-                        p[-1] = '\0';
-                        encdec = -1;
-                } else {
-                        encdec = atoi(sstrsep(&p, "\n"));
-                }
-
-
-                kn = convert(key);
-                in = convert(iv);
-                pn = convert(plaintext);
-                cn = convert(ciphertext);
-
-                if (!test_cipher(cipher, key, kn, iv, in, plaintext, pn, ciphertext, cn, encdec) &&
-                    !test_digest(cipher, plaintext, pn, ciphertext, cn)) {
-#ifdef OPENSSL_NO_AES
-                        if (strstr(cipher, "AES") == cipher) {
-                                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
-                                continue;
-                        }
-#endif
-#ifdef OPENSSL_NO_DES
-                        if (strstr(cipher, "DES") == cipher) {
-                                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
-                                continue;
-                        }
-#endif
-#ifdef OPENSSL_NO_RC4
-                        if (strstr(cipher, "RC4") == cipher) {
-                                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
-                                continue;
-                        }
-#endif
-#ifdef OPENSSL_NO_CAMELLIA
-                        if (strstr(cipher, "CAMELLIA") == cipher) {
-                                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
-                                continue;
-                        }
-#endif
-#ifdef OPENSSL_NO_SEED
-                        if (strstr(cipher, "SEED") == cipher) {
-                                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
-                                continue;
-                        }
-#endif
-#ifdef OPENSSL_NO_CHACHA
-                        if (strstr(cipher, "ChaCha") == cipher) {
-                                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
-                                continue;
-                        }
-#endif
-#ifdef OPENSSL_NO_GOST
-                        if (strstr(cipher, "md_gost") == cipher ||
-                            strstr(cipher, "streebog") == cipher) {
-                                fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
-                                continue;
-                        }
-#endif
-                        fprintf(stderr, "Can't find %s\n",cipher);
-                        exit(3);
-                }
-        }
-        fclose(f);
-
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE_cleanup();
-#endif
-        EVP_cleanup();
-        CRYPTO_cleanup_all_ex_data();
-        ERR_remove_thread_state(NULL);
-        ERR_free_strings();
-        CRYPTO_mem_leaks_fp(stderr);
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/evp/evptests.txt b/src/regress/lib/libcrypto/evp/evptests.txt
deleted file mode 100644
index fd2c6cdfd1..0000000000
--- a/src/regress/lib/libcrypto/evp/evptests.txt
+++ /dev/null
@@ -1,357 +0,0 @@
-#       $OpenBSD: evptests.txt,v 1.5 2018/07/17 17:06:49 tb Exp $
-#cipher:key:iv:plaintext:ciphertext:0/1(decrypt/encrypt)
-#digest:::input:output
-
-# SHA(1) tests (from shatest.c)
-SHA1:::616263:a9993e364706816aba3e25717850c26c9cd0d89d
-
-# MD5 tests (from md5test.c)
-MD5::::d41d8cd98f00b204e9800998ecf8427e
-MD5:::61:0cc175b9c0f1b6a831c399e269772661
-MD5:::616263:900150983cd24fb0d6963f7d28e17f72
-MD5:::6d65737361676520646967657374:f96b697d7cb7938d525a2f31aaf161d0
-MD5:::6162636465666768696a6b6c6d6e6f707172737475767778797a:c3fcd3d76192e4007dfb496cca67e13b
-MD5:::4142434445464748494a4b4c4d4e4f505152535455565758595a6162636465666768696a6b6c6d6e6f707172737475767778797a30313233343536373839:d174ab98d277d9f5a5611c2c9f419d9f
-MD5:::3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930:57edf4a22be3c955ac49da2e2107b67a
-
-# MD5+SHA1 tests
-MD5-SHA1:::616263:900150983cd24fb0d6963f7d28e17f72a9993e364706816aba3e25717850c26c9cd0d89d
-
-# GOST R 34.11 tests
-md_gost94::::981e5f3ca30c841487830f84fb433e13ac1101569b9c13584ac483234cd656c0
-streebog512::::8e945da209aa869f0455928529bcae4679e9873ab707b55315f56ceb98bef0a7362f715528356ee83cda5f2aac4c6ad2ba3a715c1bcd81cb8e9f90bf4c1c1a8a
-streebog256::::3f539a213e97c802cc229d474c6aa32a825a360b2a933a949fd925208d9ce1bb
-streebog512:::303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132:1b54d01a4af5b9d5cc3d86d68d285462b19abc2475222f35c085122be4ba1ffa00ad30f8767b3a82384c6574f024c311e2a481332b08ef7f41797891c1646f48
-streebog256:::303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132:9d151eefd8590b89daa6ba6cb74af9275dd051026bb149a452fd84e5e57b5500
-streebog512:::d1e520e2e5f2f0e82c20d1f2f0e8e1eee6e820e2edf3f6e82c20e2e5fef2fa20f120eceef0ff20f1f2f0e5ebe0ece820ede020f5f0e0e1f0fbff20efebfaeafb20c8e3eef0e5e2fb:1e88e62226bfca6f9994f1f2d51569e0daf8475a3b0fe61a5300eee46d961376035fe83549ada2b8620fcd7c496ce5b33f0cb9dddc2b6460143b03dabac9fb28
-streebog256:::d1e520e2e5f2f0e82c20d1f2f0e8e1eee6e820e2edf3f6e82c20e2e5fef2fa20f120eceef0ff20f1f2f0e5ebe0ece820ede020f5f0e0e1f0fbff20efebfaeafb20c8e3eef0e5e2fb:9dd2fe4e90409e5da87f53976d7405b0c0cac628fc669a741d50063c557e8f50
-
-# AES 128 ECB tests (from FIPS-197 test vectors, encrypt)
-
-AES-128-ECB:000102030405060708090A0B0C0D0E0F::00112233445566778899AABBCCDDEEFF:69C4E0D86A7B0430D8CDB78070B4C55A:1
-
-# AES 192 ECB tests (from FIPS-197 test vectors, encrypt)
-
-AES-192-ECB:000102030405060708090A0B0C0D0E0F1011121314151617::00112233445566778899AABBCCDDEEFF:DDA97CA4864CDFE06EAF70A0EC0D7191:1
-
-# AES 256 ECB tests (from FIPS-197 test vectors, encrypt)
-
-AES-256-ECB:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F::00112233445566778899AABBCCDDEEFF:8EA2B7CA516745BFEAFC49904B496089:1
-
-# AES 128 ECB tests (from NIST test vectors, encrypt)
-
-#AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F:1
-
-# AES 128 ECB tests (from NIST test vectors, decrypt)
-
-#AES-128-ECB:00000000000000000000000000000000::44416AC2D1F53C583303917E6BE9EBE0:00000000000000000000000000000000:0
-
-# AES 192 ECB tests (from NIST test vectors, decrypt)
-
-#AES-192-ECB:000000000000000000000000000000000000000000000000::48E31E9E256718F29229319C19F15BA4:00000000000000000000000000000000:0
-
-# AES 256 ECB tests (from NIST test vectors, decrypt)
-
-#AES-256-ECB:0000000000000000000000000000000000000000000000000000000000000000::058CCFFDBBCB382D1F6F56585D8A4ADE:00000000000000000000000000000000:0
-
-# AES 128 CBC tests (from NIST test vectors, encrypt)
-
-#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:8A05FC5E095AF4848A08D328D3688E3D:1
-
-# AES 192 CBC tests (from NIST test vectors, encrypt)
-
-#AES-192-CBC:000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:7BD966D53AD8C1BB85D2ADFAE87BB104:1
-
-# AES 256 CBC tests (from NIST test vectors, encrypt)
-
-#AES-256-CBC:0000000000000000000000000000000000000000000000000000000000000000:00000000000000000000000000000000:00000000000000000000000000000000:FE3C53653E2F45B56FCD88B2CC898FF0:1
-
-# AES 128 CBC tests (from NIST test vectors, decrypt)
-
-#AES-128-CBC:00000000000000000000000000000000:00000000000000000000000000000000:FACA37E0B0C85373DF706E73F7C9AF86:00000000000000000000000000000000:0
-
-# AES tests from NIST document SP800-38A
-# For all ECB encrypts and decrypts, the transformed sequence is
-#   AES-bits-ECB:key::plaintext:ciphertext:encdec
-# ECB-AES128.Encrypt and ECB-AES128.Decrypt
-AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::6BC1BEE22E409F96E93D7E117393172A:3AD77BB40D7A3660A89ECAF32466EF97
-AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::AE2D8A571E03AC9C9EB76FAC45AF8E51:F5D3D58503B9699DE785895A96FDBAAF
-AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::30C81C46A35CE411E5FBC1191A0A52EF:43B1CD7F598ECE23881B00E3ED030688
-AES-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::F69F2445DF4F9B17AD2B417BE66C3710:7B0C785E27E8AD3F8223207104725DD4
-# ECB-AES192.Encrypt and ECB-AES192.Decrypt 
-AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::6BC1BEE22E409F96E93D7E117393172A:BD334F1D6E45F25FF712A214571FA5CC
-AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::AE2D8A571E03AC9C9EB76FAC45AF8E51:974104846D0AD3AD7734ECB3ECEE4EEF
-AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::30C81C46A35CE411E5FBC1191A0A52EF:EF7AFD2270E2E60ADCE0BA2FACE6444E
-AES-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::F69F2445DF4F9B17AD2B417BE66C3710:9A4B41BA738D6C72FB16691603C18E0E
-# ECB-AES256.Encrypt and ECB-AES256.Decrypt 
-AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::6BC1BEE22E409F96E93D7E117393172A:F3EED1BDB5D2A03C064B5A7E3DB181F8
-AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::AE2D8A571E03AC9C9EB76FAC45AF8E51:591CCB10D410ED26DC5BA74A31362870
-AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::30C81C46A35CE411E5FBC1191A0A52EF:B6ED21B99CA6F4F9F153E7B1BEAFED1D
-AES-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::F69F2445DF4F9B17AD2B417BE66C3710:23304B7A39F9F3FF067D8D8F9E24ECC7
-# For all CBC encrypts and decrypts, the transformed sequence is
-#   AES-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec
-# CBC-AES128.Encrypt and CBC-AES128.Decrypt 
-AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:7649ABAC8119B246CEE98E9B12E9197D
-AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:7649ABAC8119B246CEE98E9B12E9197D:AE2D8A571E03AC9C9EB76FAC45AF8E51:5086CB9B507219EE95DB113A917678B2
-AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:5086CB9B507219EE95DB113A917678B2:30C81C46A35CE411E5FBC1191A0A52EF:73BED6B8E3C1743B7116E69E22229516
-AES-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:73BED6B8E3C1743B7116E69E22229516:F69F2445DF4F9B17AD2B417BE66C3710:3FF1CAA1681FAC09120ECA307586E1A7
-# CBC-AES192.Encrypt and CBC-AES192.Decrypt 
-AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:4F021DB243BC633D7178183A9FA071E8
-AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:4F021DB243BC633D7178183A9FA071E8:AE2D8A571E03AC9C9EB76FAC45AF8E51:B4D9ADA9AD7DEDF4E5E738763F69145A
-AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:B4D9ADA9AD7DEDF4E5E738763F69145A:30C81C46A35CE411E5FBC1191A0A52EF:571B242012FB7AE07FA9BAAC3DF102E0
-AES-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:571B242012FB7AE07FA9BAAC3DF102E0:F69F2445DF4F9B17AD2B417BE66C3710:08B0E27988598881D920A9E64F5615CD
-# CBC-AES256.Encrypt and CBC-AES256.Decrypt 
-AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:F58C4C04D6E5F1BA779EABFB5F7BFBD6
-AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:F58C4C04D6E5F1BA779EABFB5F7BFBD6:AE2D8A571E03AC9C9EB76FAC45AF8E51:9CFC4E967EDB808D679F777BC6702C7D
-AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:9CFC4E967EDB808D679F777BC6702C7D:30C81C46A35CE411E5FBC1191A0A52EF:39F23369A9D9BACFA530E26304231461
-AES-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39F23369A9D9BACFA530E26304231461:F69F2445DF4F9B17AD2B417BE66C3710:B2EB05E2C39BE9FCDA6C19078C6A9D1B
-# We don't support CFB{1,8}-AESxxx.{En,De}crypt
-# For all CFB128 encrypts and decrypts, the transformed sequence is
-#   AES-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec
-# CFB128-AES128.Encrypt 
-AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:1
-AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:3B3FD92EB72DAD20333449F8E83CFB4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:C8A64537A0B3A93FCDE3CDAD9F1CE58B:1
-AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:C8A64537A0B3A93FCDE3CDAD9F1CE58B:30C81C46A35CE411E5FBC1191A0A52EF:26751F67A3CBB140B1808CF187A4F4DF:1
-AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:26751F67A3CBB140B1808CF187A4F4DF:F69F2445DF4F9B17AD2B417BE66C3710:C04B05357C5D1C0EEAC4C66F9FF7F2E6:1
-# CFB128-AES128.Decrypt 
-AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:0
-AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:3B3FD92EB72DAD20333449F8E83CFB4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:C8A64537A0B3A93FCDE3CDAD9F1CE58B:0
-AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:C8A64537A0B3A93FCDE3CDAD9F1CE58B:30C81C46A35CE411E5FBC1191A0A52EF:26751F67A3CBB140B1808CF187A4F4DF:0
-AES-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:26751F67A3CBB140B1808CF187A4F4DF:F69F2445DF4F9B17AD2B417BE66C3710:C04B05357C5D1C0EEAC4C66F9FF7F2E6:0
-# CFB128-AES192.Encrypt
-AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:1
-AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:CDC80D6FDDF18CAB34C25909C99A4174:AE2D8A571E03AC9C9EB76FAC45AF8E51:67CE7F7F81173621961A2B70171D3D7A:1
-AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:67CE7F7F81173621961A2B70171D3D7A:30C81C46A35CE411E5FBC1191A0A52EF:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:1
-AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:F69F2445DF4F9B17AD2B417BE66C3710:C05F9F9CA9834FA042AE8FBA584B09FF:1
-# CFB128-AES192.Decrypt
-AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:0
-AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:CDC80D6FDDF18CAB34C25909C99A4174:AE2D8A571E03AC9C9EB76FAC45AF8E51:67CE7F7F81173621961A2B70171D3D7A:0
-AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:67CE7F7F81173621961A2B70171D3D7A:30C81C46A35CE411E5FBC1191A0A52EF:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:0
-AES-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:2E1E8A1DD59B88B1C8E60FED1EFAC4C9:F69F2445DF4F9B17AD2B417BE66C3710:C05F9F9CA9834FA042AE8FBA584B09FF:0
-# CFB128-AES256.Encrypt 
-AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:1
-AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DC7E84BFDA79164B7ECD8486985D3860:AE2D8A571E03AC9C9EB76FAC45AF8E51:39FFED143B28B1C832113C6331E5407B:1
-AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39FFED143B28B1C832113C6331E5407B:30C81C46A35CE411E5FBC1191A0A52EF:DF10132415E54B92A13ED0A8267AE2F9:1
-AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DF10132415E54B92A13ED0A8267AE2F9:F69F2445DF4F9B17AD2B417BE66C3710:75A385741AB9CEF82031623D55B1E471:1
-# CFB128-AES256.Decrypt 
-AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:0
-AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DC7E84BFDA79164B7ECD8486985D3860:AE2D8A571E03AC9C9EB76FAC45AF8E51:39FFED143B28B1C832113C6331E5407B:0
-AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:39FFED143B28B1C832113C6331E5407B:30C81C46A35CE411E5FBC1191A0A52EF:DF10132415E54B92A13ED0A8267AE2F9:0
-AES-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:DF10132415E54B92A13ED0A8267AE2F9:F69F2445DF4F9B17AD2B417BE66C3710:75A385741AB9CEF82031623D55B1E471:0
-# For all OFB encrypts and decrypts, the transformed sequence is
-#   AES-bits-CFB:key:IV/output':plaintext:ciphertext:encdec
-# OFB-AES128.Encrypt 
-AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:1 
-AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:7789508D16918F03F53C52DAC54ED825:1 
-AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:9740051E9C5FECF64344F7A82260EDCC:1 
-AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:304C6528F659C77866A510D9C1D6AE5E:1 
-# OFB-AES128.Decrypt 
-AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:3B3FD92EB72DAD20333449F8E83CFB4A:0
-AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:7789508D16918F03F53C52DAC54ED825:0
-AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:9740051E9C5FECF64344F7A82260EDCC:0
-AES-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:304C6528F659C77866A510D9C1D6AE5E:0
-# OFB-AES192.Encrypt 
-AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:1 
-AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:FCC28B8D4C63837C09E81700C1100401:1 
-AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:8D9A9AEAC0F6596F559C6D4DAF59A5F2:1 
-AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:6D9F200857CA6C3E9CAC524BD9ACC92A:1 
-# OFB-AES192.Decrypt 
-AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CDC80D6FDDF18CAB34C25909C99A4174:0 
-AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:FCC28B8D4C63837C09E81700C1100401:0 
-AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:8D9A9AEAC0F6596F559C6D4DAF59A5F2:0 
-AES-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:6D9F200857CA6C3E9CAC524BD9ACC92A:0 
-# OFB-AES256.Encrypt 
-AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:1
-AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:4FEBDC6740D20B3AC88F6AD82A4FB08D:1
-AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:1
-AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:1
-# OFB-AES256.Decrypt 
-AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:DC7E84BFDA79164B7ECD8486985D3860:0
-AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:4FEBDC6740D20B3AC88F6AD82A4FB08D:0
-AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:0
-AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:0
-
-# AES Counter test vectors from RFC3686
-aes-128-ctr:AE6852F8121067CC4BF7A5765577F39E:00000030000000000000000000000001:53696E676C6520626C6F636B206D7367:E4095D4FB7A7B3792D6175A3261311B8:1
-aes-128-ctr:7E24067817FAE0D743D6CE1F32539163:006CB6DBC0543B59DA48D90B00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28:1
-aes-128-ctr:7691BE035E5020A8AC6E618529F9A0DC:00E0017B27777F3F4A1786F000000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F:1
-
-aes-192-ctr:16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515:0000004836733C147D6D93CB00000001:53696E676C6520626C6F636B206D7367:4B55384FE259C9C84E7935A003CBE928:1
-aes-192-ctr:7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A:0096B03B020C6EADC2CB500D00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:453243FC609B23327EDFAAFA7131CD9F8490701C5AD4A79CFC1FE0FF42F4FB00:1
-aes-192-ctr:02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE:0007BDFD5CBD60278DCC091200000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:96893FC55E5C722F540B7DD1DDF7E758D288BC95C69165884536C811662F2188ABEE0935:1
-
-aes-256-ctr:776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104:00000060DB5672C97AA8F0B200000001:53696E676C6520626C6F636B206D7367:145AD01DBF824EC7560863DC71E3E0C0:1
-aes-256-ctr:F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884:00FAAC24C1585EF15A43D87500000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C:1
-aes-256-ctr:FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D:001CC5B751A51D70A1C1114800000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8:1
-
-# DES ECB tests (from destest)
-
-DES-ECB:0000000000000000::0000000000000000:8CA64DE9C1B123A7
-DES-ECB:FFFFFFFFFFFFFFFF::FFFFFFFFFFFFFFFF:7359B2163E4EDC58
-DES-ECB:3000000000000000::1000000000000001:958E6E627A05557B
-DES-ECB:1111111111111111::1111111111111111:F40379AB9E0EC533
-DES-ECB:0123456789ABCDEF::1111111111111111:17668DFC7292532D
-DES-ECB:1111111111111111::0123456789ABCDEF:8A5AE1F81AB8F2DD
-DES-ECB:FEDCBA9876543210::0123456789ABCDEF:ED39D950FA74BCC4
-
-# DESX-CBC tests (from destest)
-DESX-CBC:0123456789abcdeff1e0d3c2b5a49786fedcba9876543210:fedcba9876543210:37363534333231204E6F77206973207468652074696D6520666F722000000000:846B2914851E9A2954732F8AA0A611C115CDC2D7951B1053A63C5E03B21AA3C4
-
-# DES EDE3 CBC tests (from destest)
-DES-EDE3-CBC:0123456789abcdeff1e0d3c2b5a49786fedcba9876543210:fedcba9876543210:37363534333231204E6F77206973207468652074696D6520666F722000000000:3FE301C962AC01D02213763C1CBD4CDC799657C064ECF5D41C673812CFDE9675
-
-# RC4 tests (from rc4test)
-RC4:0123456789abcdef0123456789abcdef::0123456789abcdef:75b7878099e0c596
-RC4:0123456789abcdef0123456789abcdef::0000000000000000:7494c2e7104b0879
-RC4:00000000000000000000000000000000::0000000000000000:de188941a3375d3a
-RC4:ef012345ef012345ef012345ef012345::0000000000000000000000000000000000000000:d6a141a7ec3c38dfbd615a1162e1c7ba36b67858
-RC4:0123456789abcdef0123456789abcdef::123456789ABCDEF0123456789ABCDEF0123456789ABCDEF012345678:66a0949f8af7d6891f7f832ba833c00c892ebe30143ce28740011ecf
-RC4:ef012345ef012345ef012345ef012345::00000000000000000000:d6a141a7ec3c38dfbd61
-
-
-# Camellia tests from RFC3713
-# For all ECB encrypts and decrypts, the transformed sequence is
-#   CAMELLIA-bits-ECB:key::plaintext:ciphertext:encdec
-CAMELLIA-128-ECB:0123456789abcdeffedcba9876543210::0123456789abcdeffedcba9876543210:67673138549669730857065648eabe43
-CAMELLIA-192-ECB:0123456789abcdeffedcba98765432100011223344556677::0123456789abcdeffedcba9876543210:b4993401b3e996f84ee5cee7d79b09b9
-CAMELLIA-256-ECB:0123456789abcdeffedcba987654321000112233445566778899aabbccddeeff::0123456789abcdeffedcba9876543210:9acc237dff16d76c20ef7c919e3a7509
-
-# ECB-CAMELLIA128.Encrypt
-CAMELLIA-128-ECB:000102030405060708090A0B0C0D0E0F::00112233445566778899AABBCCDDEEFF:77CF412067AF8270613529149919546F:1
-CAMELLIA-192-ECB:000102030405060708090A0B0C0D0E0F1011121314151617::00112233445566778899AABBCCDDEEFF:B22F3C36B72D31329EEE8ADDC2906C68:1
-CAMELLIA-256-ECB:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F::00112233445566778899AABBCCDDEEFF:2EDF1F3418D53B88841FC8985FB1ECF2:1
-
-# ECB-CAMELLIA128.Encrypt and ECB-CAMELLIA128.Decrypt 
-CAMELLIA-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::6BC1BEE22E409F96E93D7E117393172A:432FC5DCD628115B7C388D770B270C96
-CAMELLIA-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::AE2D8A571E03AC9C9EB76FAC45AF8E51:0BE1F14023782A22E8384C5ABB7FAB2B
-CAMELLIA-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::30C81C46A35CE411E5FBC1191A0A52EF:A0A1ABCD1893AB6FE0FE5B65DF5F8636
-CAMELLIA-128-ECB:2B7E151628AED2A6ABF7158809CF4F3C::F69F2445DF4F9B17AD2B417BE66C3710:E61925E0D5DFAA9BB29F815B3076E51A
-
-# ECB-CAMELLIA192.Encrypt and ECB-CAMELLIA192.Decrypt 
-CAMELLIA-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::6BC1BEE22E409F96E93D7E117393172A:CCCC6C4E138B45848514D48D0D3439D3
-CAMELLIA-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::AE2D8A571E03AC9C9EB76FAC45AF8E51:5713C62C14B2EC0F8393B6AFD6F5785A
-CAMELLIA-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::30C81C46A35CE411E5FBC1191A0A52EF:B40ED2B60EB54D09D030CF511FEEF366
-CAMELLIA-192-ECB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B::F69F2445DF4F9B17AD2B417BE66C3710:909DBD95799096748CB27357E73E1D26
-
-# ECB-CAMELLIA256.Encrypt and ECB-CAMELLIA256.Decrypt 
-CAMELLIA-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::6BC1BEE22E409F96E93D7E117393172A:BEFD219B112FA00098919CD101C9CCFA
-CAMELLIA-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::AE2D8A571E03AC9C9EB76FAC45AF8E51:C91D3A8F1AEA08A9386CF4B66C0169EA
-CAMELLIA-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::30C81C46A35CE411E5FBC1191A0A52EF:A623D711DC5F25A51BB8A80D56397D28
-CAMELLIA-256-ECB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4::F69F2445DF4F9B17AD2B417BE66C3710:7960109FB6DC42947FCFE59EA3C5EB6B
-
-# For all CBC encrypts and decrypts, the transformed sequence is
-#   CAMELLIA-bits-CBC:key:IV/ciphertext':plaintext:ciphertext:encdec
-# CBC-CAMELLIA128.Encrypt and CBC-CAMELLIA128.Decrypt 
-CAMELLIA-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:1607CF494B36BBF00DAEB0B503C831AB
-CAMELLIA-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:1607CF494B36BBF00DAEB0B503C831AB:AE2D8A571E03AC9C9EB76FAC45AF8E51:A2F2CF671629EF7840C5A5DFB5074887
-CAMELLIA-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:A2F2CF671629EF7840C5A5DFB5074887:30C81C46A35CE411E5FBC1191A0A52EF:0F06165008CF8B8B5A63586362543E54
-CAMELLIA-128-CBC:2B7E151628AED2A6ABF7158809CF4F3C:36A84CDAFD5F9A85ADA0F0A993D6D577:F69F2445DF4F9B17AD2B417BE66C3710:74C64268CDB8B8FAF5B34E8AF3732980
-
-# CBC-CAMELLIA192.Encrypt and CBC-CAMELLIA192.Decrypt 
-CAMELLIA-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:2A4830AB5AC4A1A2405955FD2195CF93
-CAMELLIA-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:2A4830AB5AC4A1A2405955FD2195CF93:AE2D8A571E03AC9C9EB76FAC45AF8E51:5D5A869BD14CE54264F892A6DD2EC3D5
-CAMELLIA-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:5D5A869BD14CE54264F892A6DD2EC3D5:30C81C46A35CE411E5FBC1191A0A52EF:37D359C3349836D884E310ADDF68C449
-CAMELLIA-192-CBC:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:37D359C3349836D884E310ADDF68C449:F69F2445DF4F9B17AD2B417BE66C3710:01FAAA930B4AB9916E9668E1428C6B08
-
-# CBC-CAMELLIA256.Encrypt and CBC-CAMELLIA256.Decrypt 
-CAMELLIA-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:E6CFA35FC02B134A4D2C0B6737AC3EDA
-CAMELLIA-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E6CFA35FC02B134A4D2C0B6737AC3EDA:AE2D8A571E03AC9C9EB76FAC45AF8E51:36CBEB73BD504B4070B1B7DE2B21EB50
-CAMELLIA-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:36CBEB73BD504B4070B1B7DE2B21EB50:30C81C46A35CE411E5FBC1191A0A52EF:E31A6055297D96CA3330CDF1B1860A83
-CAMELLIA-256-CBC:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E31A6055297D96CA3330CDF1B1860A83:F69F2445DF4F9B17AD2B417BE66C3710:5D563F6D1CCCF236051C0C5C1C58F28F
-
-# We don't support CFB{1,8}-CAMELLIAxxx.{En,De}crypt
-# For all CFB128 encrypts and decrypts, the transformed sequence is
-#   CAMELLIA-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec
-# CFB128-CAMELLIA128.Encrypt 
-CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:1
-CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:A53D28BB82DF741103EA4F921A44880B:1
-CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:A53D28BB82DF741103EA4F921A44880B:30C81C46A35CE411E5FBC1191A0A52EF:9C2157A664626D1DEF9EA420FDE69B96:1
-CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:9C2157A664626D1DEF9EA420FDE69B96:F69F2445DF4F9B17AD2B417BE66C3710:742A25F0542340C7BAEF24CA8482BB09:1
-
-# CFB128-CAMELLIA128.Decrypt 
-CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:0
-CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:14F7646187817EB586599146B82BD719:AE2D8A571E03AC9C9EB76FAC45AF8E51:A53D28BB82DF741103EA4F921A44880B:0
-CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:A53D28BB82DF741103EA4F921A44880B:30C81C46A35CE411E5FBC1191A0A52EF:9C2157A664626D1DEF9EA420FDE69B96:0
-CAMELLIA-128-CFB:2B7E151628AED2A6ABF7158809CF4F3C:9C2157A664626D1DEF9EA420FDE69B96:F69F2445DF4F9B17AD2B417BE66C3710:742A25F0542340C7BAEF24CA8482BB09:0
-
-# CFB128-CAMELLIA192.Encrypt
-CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:C832BB9780677DAA82D9B6860DCD565E:1
-CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:C832BB9780677DAA82D9B6860DCD565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:86F8491627906D780C7A6D46EA331F98:1
-CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:86F8491627906D780C7A6D46EA331F98:30C81C46A35CE411E5FBC1191A0A52EF:69511CCE594CF710CB98BB63D7221F01:1
-CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:69511CCE594CF710CB98BB63D7221F01:F69F2445DF4F9B17AD2B417BE66C3710:D5B5378A3ABED55803F25565D8907B84:1
-
-# CFB128-CAMELLIA192.Decrypt
-CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:C832BB9780677DAA82D9B6860DCD565E:0
-CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:C832BB9780677DAA82D9B6860DCD565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:86F8491627906D780C7A6D46EA331F98:0
-CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:86F8491627906D780C7A6D46EA331F98:30C81C46A35CE411E5FBC1191A0A52EF:69511CCE594CF710CB98BB63D7221F01:0
-CAMELLIA-192-CFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:69511CCE594CF710CB98BB63D7221F01:F69F2445DF4F9B17AD2B417BE66C3710:D5B5378A3ABED55803F25565D8907B84:0
-
-# CFB128-CAMELLIA256.Encrypt 
-CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CF6107BB0CEA7D7FB1BD31F5E7B06C93:1
-CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:CF6107BB0CEA7D7FB1BD31F5E7B06C93:AE2D8A571E03AC9C9EB76FAC45AF8E51:89BEDB4CCDD864EA11BA4CBE849B5E2B:1
-CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:89BEDB4CCDD864EA11BA4CBE849B5E2B:30C81C46A35CE411E5FBC1191A0A52EF:555FC3F34BDD2D54C62D9E3BF338C1C4:1
-CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:555FC3F34BDD2D54C62D9E3BF338C1C4:F69F2445DF4F9B17AD2B417BE66C3710:5953ADCE14DB8C7F39F1BD39F359BFFA:1
-
-# CFB128-CAMELLIA256.Decrypt 
-CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CF6107BB0CEA7D7FB1BD31F5E7B06C93:0
-CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:CF6107BB0CEA7D7FB1BD31F5E7B06C93:AE2D8A571E03AC9C9EB76FAC45AF8E51:89BEDB4CCDD864EA11BA4CBE849B5E2B:0
-CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:89BEDB4CCDD864EA11BA4CBE849B5E2B:30C81C46A35CE411E5FBC1191A0A52EF:555FC3F34BDD2D54C62D9E3BF338C1C4:0
-CAMELLIA-256-CFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:555FC3F34BDD2D54C62D9E3BF338C1C4:F69F2445DF4F9B17AD2B417BE66C3710:5953ADCE14DB8C7F39F1BD39F359BFFA:0
-
-# For all OFB encrypts and decrypts, the transformed sequence is
-#   CAMELLIA-bits-OFB:key:IV/output':plaintext:ciphertext:encdec
-# OFB-CAMELLIA128.Encrypt 
-CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:1
-CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:25623DB569CA51E01482649977E28D84:1
-CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:C776634A60729DC657D12B9FCA801E98:1
-CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:D776379BE0E50825E681DA1A4C980E8E:1
-
-# OFB-CAMELLIA128.Decrypt 
-CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:14F7646187817EB586599146B82BD719:0
-CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:50FE67CC996D32B6DA0937E99BAFEC60:AE2D8A571E03AC9C9EB76FAC45AF8E51:25623DB569CA51E01482649977E28D84:0
-CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:D9A4DADA0892239F6B8B3D7680E15674:30C81C46A35CE411E5FBC1191A0A52EF:C776634A60729DC657D12B9FCA801E98:0
-CAMELLIA-128-OFB:2B7E151628AED2A6ABF7158809CF4F3C:A78819583F0308E7A6BF36B1386ABF23:F69F2445DF4F9B17AD2B417BE66C3710:D776379BE0E50825E681DA1A4C980E8E:0
-
-# OFB-CAMELLIA192.Encrypt 
-CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:C832BB9780677DAA82D9B6860DCD565E:1
-CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:8ECEB7D0350D72C7F78562AEBDF99339:1
-CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:BDD62DBBB9700846C53B507F544696F0:1
-CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:E28014E046B802F385C4C2E13EAD4A72:1
-
-# OFB-CAMELLIA192.Decrypt 
-CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:C832BB9780677DAA82D9B6860DCD565E:0
-CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:A609B38DF3B1133DDDFF2718BA09565E:AE2D8A571E03AC9C9EB76FAC45AF8E51:8ECEB7D0350D72C7F78562AEBDF99339:0
-CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:52EF01DA52602FE0975F78AC84BF8A50:30C81C46A35CE411E5FBC1191A0A52EF:BDD62DBBB9700846C53B507F544696F0:0
-CAMELLIA-192-OFB:8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:BD5286AC63AABD7EB067AC54B553F71D:F69F2445DF4F9B17AD2B417BE66C3710:E28014E046B802F385C4C2E13EAD4A72:0
-
-# OFB-CAMELLIA256.Encrypt 
-CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CF6107BB0CEA7D7FB1BD31F5E7B06C93:1
-CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:127AD97E8E3994E4820027D7BA109368:1
-CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:6BFF6265A6A6B7A535BC65A80B17214E:1
-CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0A4A0404E26AA78A27CB271E8BF3CF20:1
-
-# OFB-CAMELLIA256.Decrypt 
-CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:000102030405060708090A0B0C0D0E0F:6BC1BEE22E409F96E93D7E117393172A:CF6107BB0CEA7D7FB1BD31F5E7B06C93:0
-CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7BF3A5DF43989DD97F0FA97EBCE2F4A:AE2D8A571E03AC9C9EB76FAC45AF8E51:127AD97E8E3994E4820027D7BA109368:0
-CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:6BFF6265A6A6B7A535BC65A80B17214E:0
-CAMELLIA-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0A4A0404E26AA78A27CB271E8BF3CF20:0
-
-# SEED test vectors from RFC4269
-SEED-ECB:00000000000000000000000000000000::000102030405060708090A0B0C0D0E0F:5EBAC6E0054E166819AFF1CC6D346CDB:0
-SEED-ECB:000102030405060708090A0B0C0D0E0F::00000000000000000000000000000000:C11F22F20140505084483597E4370F43:0
-SEED-ECB:4706480851E61BE85D74BFB3FD956185::83A2F8A288641FB9A4E9A5CC2F131C7D:EE54D13EBCAE706D226BC3142CD40D4A:0
-SEED-ECB:28DBC3BC49FFD87DCFA509B11D422BE7::B41E6BE2EBA84A148E2EED84593C5EC7:9B9B7BFCD1813CB95D0B3618F40F5122:0
-SEED-ECB:00000000000000000000000000000000::000102030405060708090A0B0C0D0E0F:5EBAC6E0054E166819AFF1CC6D346CDB:1
-SEED-ECB:000102030405060708090A0B0C0D0E0F::00000000000000000000000000000000:C11F22F20140505084483597E4370F43:1
-SEED-ECB:4706480851E61BE85D74BFB3FD956185::83A2F8A288641FB9A4E9A5CC2F131C7D:EE54D13EBCAE706D226BC3142CD40D4A:1
-SEED-ECB:28DBC3BC49FFD87DCFA509B11D422BE7::B41E6BE2EBA84A148E2EED84593C5EC7:9B9B7BFCD1813CB95D0B3618F40F5122:1
-
-# ChaCha test vectors
-ChaCha:0000000000000000000000000000000000000000000000000000000000000000:0000000000000000:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:76b8e0ada0f13d90405d6ae55386bd28bdd219b8a08ded1aa836efcc8b770dc7da41597c5157488d7724e03fb8d84a376a43b8f41518a11cc387b669b2ee6586:1
-ChaCha:0100000000000000000000000000000000000000000000000000000000000000:0000000000000000:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:c5d30a7ce1ec119378c84f487d775a8542f13ece238a9455e8229e888de85bbd29eb63d0a17a5b999b52da22be4023eb07620a54f6fa6ad8737b71eb0464dac0:1
-ChaCha:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff:ffffffffffffffff:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:d9bf3f6bce6ed0b54254557767fb57443dd4778911b606055c39cc25e674b8363feabc57fde54f790c52c8ae43240b79d49042b777bfd6cb80e931270b7f50eb:1
-ChaCha:5555555555555555555555555555555555555555555555555555555555555555:aaaaaaaaaaaaaaaa:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:aff7418293f3a553894b1e7484bd1e8ede196eced5a1d6814de37091e07e076e34bbba8107a686c982850f0a7353940d40db1ab0b5765b78b4cf473d9485a3dd:1
-ChaCha:5555555555555555555555555555555555555555555555555555555555555555:5555555555555555:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:bea9411aa453c5434a5ae8c92862f564396855a9ea6e22d6d3b50ae1b3663311a4a3606c671d605ce16c3aece8e61ea145c59775017bee2fa6f88afc758069f7:1
-ChaCha:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaa:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:9aa2a9f656efde5aa7591c5fed4b35aea2895dec7cb4543b9e9f21f5e7bcbcf3c43c748a970888f8248393a09d43e0b7e164bc4d0b0fb240a2d72115c4808906:1
-ChaCha:00112233445566778899aabbccddeeffffeeddccbbaa99887766554433221100:0f1e2d3c4b5a6978:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:9fadf409c00811d00431d67efbd88fba59218d5d6708b1d685863fabbb0e961eea480fd6fb532bfd494b2151015057423ab60a63fe4f55f7a212e2167ccab931:1
-ChaCha:c46ec1b18ce8a878725a37e780dfb7351f68ed2e194c79fbc6aebee1a667975d:1ada31d5cf688221:00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:f63a89b75c2271f9368816542ba52f06ed49241792302b00b5e8f80ae9a473afc25b218f519af0fdd406362e8d69de7f54c604a6e00f353f110f771bdca8ab92:1
diff --git a/src/regress/lib/libcrypto/exp/Makefile b/src/regress/lib/libcrypto/exp/Makefile
deleted file mode 100644
index 890b38e9fe..0000000000
--- a/src/regress/lib/libcrypto/exp/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.4 2017/01/21 09:38:58 beck Exp $
-
-PROG=   exptest
-LDADD=  ${CRYPTO_INT}
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/exp/exptest.c b/src/regress/lib/libcrypto/exp/exptest.c
deleted file mode 100644
index 9c683464f6..0000000000
--- a/src/regress/lib/libcrypto/exp/exptest.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*      $OpenBSD: exptest.c,v 1.5 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-
-int BN_mod_exp_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_exp_nonct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_exp_mont_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_mont_nonct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-
-#define NUM_BITS        (BN_BITS*2)
-
-/*
- * Test that r == 0 in test_exp_mod_zero(). Returns one on success,
- * returns zero and prints debug output otherwise.
- */
-static int a_is_zero_mod_one(const char *method, const BIGNUM *r,
-                                                         const BIGNUM *a) {
-        if (!BN_is_zero(r)) {
-                fprintf(stderr, "%s failed:\n", method);
-                fprintf(stderr, "a ** 0 mod 1 = r (should be 0)\n");
-                fprintf(stderr, "a = ");
-                BN_print_fp(stderr, a);
-                fprintf(stderr, "\nr = ");
-                BN_print_fp(stderr, r);
-                fprintf(stderr, "\n");
-                return 0;
-        }
-        return 1;
-}
-
-/*
- * test_exp_mod_zero tests that x**0 mod 1 == 0. It returns zero on success.
- */
-static int test_exp_mod_zero(void)
-{
-        BIGNUM a, p, m;
-        BIGNUM r;
-        BN_ULONG one_word = 1;
-        BN_CTX *ctx = BN_CTX_new();
-        int ret = 1, failed = 0;
-
-        BN_init(&m);
-        BN_one(&m);
-
-        BN_init(&a);
-        BN_one(&a);
-
-        BN_init(&p);
-        BN_zero(&p);
-
-        BN_init(&r);
-
-        if (!BN_rand(&a, 1024, 0, 0))
-                goto err;
-
-        if (!BN_mod_exp(&r, &a, &p, &m, ctx))
-                goto err;
-
-        if (!a_is_zero_mod_one("BN_mod_exp", &r, &a))
-                failed = 1;
-
-        if (!BN_mod_exp_ct(&r, &a, &p, &m, ctx))
-                goto err;
-
-        if (!a_is_zero_mod_one("BN_mod_exp_ct", &r, &a))
-                failed = 1;
-
-        if (!BN_mod_exp_nonct(&r, &a, &p, &m, ctx))
-                goto err;
-
-        if (!a_is_zero_mod_one("BN_mod_exp_nonct", &r, &a))
-                failed = 1;
-
-        if (!BN_mod_exp_recp(&r, &a, &p, &m, ctx))
-                goto err;
-
-        if (!a_is_zero_mod_one("BN_mod_exp_recp", &r, &a))
-                failed = 1;
-
-        if (!BN_mod_exp_simple(&r, &a, &p, &m, ctx))
-                goto err;
-
-        if (!a_is_zero_mod_one("BN_mod_exp_simple", &r, &a))
-                failed = 1;
-
-        if (!BN_mod_exp_mont(&r, &a, &p, &m, ctx, NULL))
-                goto err;
-
-        if (!a_is_zero_mod_one("BN_mod_exp_mont", &r, &a))
-                failed = 1;
-
-        if (!BN_mod_exp_mont_ct(&r, &a, &p, &m, ctx, NULL))
-                goto err;
-
-        if (!a_is_zero_mod_one("BN_mod_exp_mont_ct", &r, &a))
-                failed = 1;
-
-        if (!BN_mod_exp_mont_nonct(&r, &a, &p, &m, ctx, NULL))
-                goto err;
-
-        if (!a_is_zero_mod_one("BN_mod_exp_mont_nonct", &r, &a))
-                failed = 1;
-
-        if (!BN_mod_exp_mont_consttime(&r, &a, &p, &m, ctx, NULL)) {
-                goto err;
-        }
-
-        if (!a_is_zero_mod_one("BN_mod_exp_mont_consttime", &r, &a))
-                failed = 1;
-
-        /*
-         * A different codepath exists for single word multiplication
-         * in non-constant-time only.
-         */
-        if (!BN_mod_exp_mont_word(&r, one_word, &p, &m, ctx, NULL))
-                goto err;
-
-        if (!BN_is_zero(&r)) {
-                fprintf(stderr, "BN_mod_exp_mont_word failed:\n");
-                fprintf(stderr, "1 ** 0 mod 1 = r (should be 0)\n");
-                fprintf(stderr, "r = ");
-                BN_print_fp(stderr, &r);
-                fprintf(stderr, "\n");
-                return 0;
-        }
-
-        ret = failed;
-
- err:
-        BN_free(&r);
-        BN_free(&a);
-        BN_free(&p);
-        BN_free(&m);
-        BN_CTX_free(ctx);
-
-        return ret;
-}
-
-int main(int argc, char *argv[])
-{
-        BN_CTX *ctx;
-        BIO *out = NULL;
-        int i, ret;
-        unsigned char c;
-        BIGNUM *r_mont, *r_mont_const, *r_recp, *r_simple,
-            *r_mont_ct, *r_mont_nonct, *a, *b, *m;
-
-        ERR_load_BN_strings();
-
-        ctx = BN_CTX_new();
-        if (ctx == NULL)
-                exit(1);
-        r_mont = BN_new();
-        r_mont_const = BN_new();
-        r_mont_ct = BN_new();
-        r_mont_nonct = BN_new();
-        r_recp = BN_new();
-        r_simple = BN_new();
-        a = BN_new();
-        b = BN_new();
-        m = BN_new();
-        if ((r_mont == NULL) || (r_recp == NULL) || (a == NULL) || (b == NULL))
-                goto err;
-
-        out = BIO_new(BIO_s_file());
-
-        if (out == NULL)
-                exit(1);
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-
-        for (i = 0; i < 200; i++) {
-                arc4random_buf(&c, 1);
-                c = (c % BN_BITS) - BN_BITS2;
-                BN_rand(a, NUM_BITS + c, 0, 0);
-
-                arc4random_buf(&c, 1);
-                c = (c % BN_BITS) - BN_BITS2;
-                BN_rand(b, NUM_BITS + c, 0, 0);
-
-                arc4random_buf(&c, 1);
-                c = (c % BN_BITS) - BN_BITS2;
-                BN_rand(m, NUM_BITS + c, 0, 1);
-
-                BN_mod(a, a, m, ctx);
-                BN_mod(b, b, m, ctx);
-
-                ret = BN_mod_exp_mont(r_mont, a, b, m, ctx, NULL);
-                if (ret <= 0) {
-                        printf("BN_mod_exp_mont() problems\n");
-                        ERR_print_errors(out);
-                        exit(1);
-                }
-
-                ret = BN_mod_exp_mont_ct(r_mont_ct, a, b, m, ctx, NULL);
-                if (ret <= 0) {
-                        printf("BN_mod_exp_mont_ct() problems\n");
-                        ERR_print_errors(out);
-                        exit(1);
-                }
-
-                ret = BN_mod_exp_mont_nonct(r_mont_nonct, a, b, m, ctx, NULL);
-                if (ret <= 0) {
-                        printf("BN_mod_exp_mont_nonct() problems\n");
-                        ERR_print_errors(out);
-                        exit(1);
-                }
-
-                ret = BN_mod_exp_recp(r_recp, a, b, m, ctx);
-                if (ret <= 0) {
-                        printf("BN_mod_exp_recp() problems\n");
-                        ERR_print_errors(out);
-                        exit(1);
-                }
-
-                ret = BN_mod_exp_simple(r_simple, a, b, m, ctx);
-                if (ret <= 0) {
-                        printf("BN_mod_exp_simple() problems\n");
-                        ERR_print_errors(out);
-                        exit(1);
-                }
-
-                ret = BN_mod_exp_mont_consttime(r_mont_const, a, b, m, ctx, NULL);
-                if (ret <= 0) {
-                        printf("BN_mod_exp_mont_consttime() problems\n");
-                        ERR_print_errors(out);
-                        exit(1);
-                }
-
-                if (BN_cmp(r_simple, r_mont) == 0
-                        && BN_cmp(r_simple, r_recp) == 0
-                        && BN_cmp(r_simple, r_mont_const) == 0) {
-                        printf(".");
-                        fflush(stdout);
-                } else {
-                        if (BN_cmp(r_simple, r_mont) != 0)
-                                printf("\nsimple and mont results differ\n");
-                        if (BN_cmp(r_simple, r_mont_const) != 0)
-                                printf("\nsimple and mont const time results differ\n");
-                        if (BN_cmp(r_simple, r_recp) != 0)
-                                printf("\nsimple and recp results differ\n");
-                        if (BN_cmp(r_mont, r_mont_ct) != 0)
-                                printf("\nmont_ct and mont results differ\n");
-                        if (BN_cmp(r_mont_ct, r_mont_nonct) != 0)
-                                printf("\nmont_ct and mont_nonct results differ\n");
-
-                        printf("a (%3d) = ", BN_num_bits(a));
-                        BN_print(out, a);
-                        printf("\nb (%3d) = ", BN_num_bits(b));
-                        BN_print(out, b);
-                        printf("\nm (%3d) = ", BN_num_bits(m));
-                        BN_print(out, m);
-                        printf("\nsimple   =");
-                        BN_print(out, r_simple);
-                        printf("\nrecp   =");
-                        BN_print(out, r_recp);
-                        printf("\nmont   =");
-                        BN_print(out, r_mont);
-                        printf("\nmont_ct  =");
-                        BN_print(out, r_mont_const);
-                        printf("\n");
-                        exit(1);
-                }
-        }
-        BN_free(r_mont);
-        BN_free(r_mont_const);
-        BN_free(r_recp);
-        BN_free(r_simple);
-        BN_free(a);
-        BN_free(b);
-        BN_free(m);
-        BN_CTX_free(ctx);
-        ERR_remove_thread_state(NULL);
-        CRYPTO_mem_leaks(out);
-        BIO_free(out);
-        printf("\n");
-
-        if (test_exp_mod_zero() != 0)
-                goto err;
-
-        printf("done\n");
-
-        return (0);
- err:
-        ERR_load_crypto_strings();
-        ERR_print_errors(out);
-        return (1);
-}
diff --git a/src/regress/lib/libcrypto/free/Makefile b/src/regress/lib/libcrypto/free/Makefile
deleted file mode 100644
index 4e8a7ed38d..0000000000
--- a/src/regress/lib/libcrypto/free/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2018/08/31 17:35:21 tb Exp $
-
-TESTS = \
-        freenull
-
-PROG = ${TESTS}
-
-REGRESS_TARGETS= all_tests
-
-LDADD=          -lcrypto
-DPADD=          ${LIBCRYPTO} ${LIBSSL}
-LDFLAGS+=       -lcrypto
-CFLAGS+=        -DLIBRESSL_INTERNAL
-
-CLEANFILES+= freenull.c freenull.c.body freenull.c.tmp
-
-freenull.c: freenull.awk ../../../../lib/libcrypto/Symbols.list
-        awk -f ${.CURDIR}/freenull.awk \
-                < ${BSDSRCDIR}/lib/libcrypto/Symbols.list > freenull.c.body
-        cat ${.CURDIR}/freenull.c.head freenull.c.body \
-                ${.CURDIR}/freenull.c.tail > freenull.c.tmp
-        mv freenull.c.tmp freenull.c
-
-all_tests: ${TESTS}
-        @for test in $>; do \
-                ./$$test; \
-        done
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/free/freenull.awk b/src/regress/lib/libcrypto/free/freenull.awk
deleted file mode 100644
index 95719da956..0000000000
--- a/src/regress/lib/libcrypto/free/freenull.awk
+++ /dev/null
@@ -1,60 +0,0 @@
-# $OpenBSD: freenull.awk,v 1.1 2018/07/10 20:53:30 tb Exp $
-# Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-# usage: awk -f freenull.awk < Symbols.list > freenull.c.body
-
-# Skip this function because it calls abort(3).
-/^CRYPTO_dbg_free/ {
-        next
-}
-
-# Skip *_free functions that take more than one or no argument.
-/^ASN1_item_ex_free$/                           ||
-/^ASN1_item_free$/                              ||
-/^ASN1_primitive_free$/                         ||
-/^ASN1_template_free$/                          ||
-/^CONF_modules_free$/                           ||
-/^EVP_PKEY_asn1_set_free$/                      ||
-/^OBJ_sigid_free$/                              ||
-/^X509V3_section_free$/                         ||
-/^X509V3_string_free$/                          ||
-/^asn1_enc_free$/                               ||
-/^sk_pop_free$/ {
-        next
-}
-
-# Skip functions that are prototyped in a .c file.
-/^BIO_CONNECT_free$/                            ||
-/^CRYPTO_free$/                                 ||
-/^EC_PRIVATEKEY_free$/                          ||
-/^ECPARAMETERS_free$/                           ||
-/^ECPKPARAMETERS_free$/                         ||
-/^NETSCAPE_ENCRYPTED_PKEY_free$/                ||
-/^NETSCAPE_PKEY_free$/                          ||
-/^X9_62_CHARACTERISTIC_TWO_free$/               ||
-/^X9_62_PENTANOMIAL_free$/ {
-        next
-}
-
-/^ENGINE_free$/ {
-        printf("#ifndef OPENSSL_NO_ENGINE\n")
-        printf("\tENGINE_free(NULL);\n")
-        printf("#endif\n")
-        next
-}
-
-/_free$/ {
-        printf("\t%s(NULL);\n", $0)
-}
diff --git a/src/regress/lib/libcrypto/free/freenull.c.head b/src/regress/lib/libcrypto/free/freenull.c.head
deleted file mode 100644
index f7e2c31595..0000000000
--- a/src/regress/lib/libcrypto/free/freenull.c.head
+++ /dev/null
@@ -1,27 +0,0 @@
-/*      $OpenBSD: freenull.c.head,v 1.2 2018/07/10 20:55:57 tb Exp $    */
-
-#include <openssl/asn1.h>
-#include <openssl/cmac.h>
-#include <openssl/comp.h>
-#include <openssl/conf_api.h>
-#include <openssl/dso.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/gost.h>
-#include <openssl/hmac.h>
-#include <openssl/ocsp.h>
-#include <openssl/pkcs12.h>
-#include <openssl/ts.h>
-#include <openssl/ui.h>
-#include <openssl/txt_db.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-int
-main(int argc, char **argv)
-{
diff --git a/src/regress/lib/libcrypto/free/freenull.c.tail b/src/regress/lib/libcrypto/free/freenull.c.tail
deleted file mode 100644
index e83e9e4aa2..0000000000
--- a/src/regress/lib/libcrypto/free/freenull.c.tail
+++ /dev/null
@@ -1,28 +0,0 @@
-/*      $OpenBSD: freenull.c.tail,v 1.2 2018/07/10 20:55:57 tb Exp $    */
-
-        BIO_free_all(NULL);
-        NCONF_free_data(NULL);
-        _CONF_free_data(NULL);
-
-        lh_FUNCTION_free(NULL);
-
-        sk_ASN1_OBJECT_pop_free(NULL, NULL);
-        sk_CONF_VALUE_pop_free(NULL, NULL);
-        sk_GENERAL_NAME_pop_free(NULL, NULL);
-        sk_OCSP_CERTID_free(NULL);
-        sk_OPENSSL_STRING_free(NULL);
-        sk_PKCS12_SAFEBAG_pop_free(NULL, NULL);
-        sk_PKCS7_pop_free(NULL, NULL);
-        sk_X509_ATTRIBUTE_free(NULL);
-        sk_X509_CRL_pop_free(NULL, NULL);
-        sk_X509_EXTENSION_pop_free(NULL, NULL);
-        sk_X509_INFO_free(NULL);
-        sk_X509_INFO_pop_free(NULL, NULL);
-        sk_X509_NAME_ENTRY_pop_free(NULL, NULL);
-        sk_X509_free(NULL);
-        sk_X509_pop_free(NULL, NULL);
-
-        printf("PASS\n");
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/gcm128/Makefile b/src/regress/lib/libcrypto/gcm128/Makefile
deleted file mode 100644
index c981203e3e..0000000000
--- a/src/regress/lib/libcrypto/gcm128/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.5 2014/07/09 11:43:01 jsing Exp $
-
-PROG=   gcm128test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/gcm128/gcm128test.c b/src/regress/lib/libcrypto/gcm128/gcm128test.c
deleted file mode 100644
index 07c6128c0f..0000000000
--- a/src/regress/lib/libcrypto/gcm128/gcm128test.c
+++ /dev/null
@@ -1,926 +0,0 @@
-/*      $OpenBSD: gcm128test.c,v 1.6 2018/07/17 17:06:49 tb Exp $       */
-/* ====================================================================
- * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/aes.h>
-#include <openssl/modes.h>
-
-/* XXX - something like this should be in the public headers. */
-struct gcm128_context {
-        uint64_t opaque[64];
-};
-
-struct gcm128_test {
-        const uint8_t K[128];
-        size_t K_len;
-        const uint8_t IV[128];
-        size_t IV_len;
-        const uint8_t P[512];
-        size_t P_len;
-        const uint8_t A[128];
-        size_t A_len;
-        const uint8_t C[512];
-        size_t C_len;
-        const uint8_t T[16];
-};
-
-struct gcm128_test gcm128_tests[] = {
-        {
-                /* Test Case 1. */
-                .K = {0},
-                .K_len = 16,
-                .IV = {0},
-                .IV_len = 12,
-                .P = {0},
-                .P_len = 0,
-                .A = {0},
-                .A_len = 0,
-                .C = {0},
-                .C_len = 0,
-                .T = {
-                        0x58, 0xe2, 0xfc, 0xce, 0xfa, 0x7e, 0x30, 0x61,
-                        0x36, 0x7f, 0x1d, 0x57, 0xa4, 0xe7, 0x45, 0x5a,
-                },
-        },
-        {
-                /* Test Case 2. */
-                .K = {0},
-                .K_len = 16,
-                .IV = {0},
-                .IV_len = 12,
-                .P = {0},
-                .P_len = 16,
-                .A = {0},
-                .A_len = 0,
-                .C = {
-                        0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92,
-                        0xf3, 0x28, 0xc2, 0xb9, 0x71, 0xb2, 0xfe, 0x78,
-                },
-                .C_len = 16,
-                .T = {
-                        0xab, 0x6e, 0x47, 0xd4, 0x2c, 0xec, 0x13, 0xbd,
-                        0xf5, 0x3a, 0x67, 0xb2, 0x12, 0x57, 0xbd, 0xdf,
-                },
-        },
-        {
-                /* Test Case 3. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                },
-                .K_len = 16,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                        0xde, 0xca, 0xf8, 0x88,
-                },
-                .IV_len = 12,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55,
-                },
-                .P_len = 64,
-                .A = {0},
-                .A_len = 0,
-                .C = {
-                        0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24,
-                        0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c,
-                        0xe3, 0xaa, 0x21, 0x2f, 0x2c, 0x02, 0xa4, 0xe0,
-                        0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e,
-                        0x21, 0xd5, 0x14, 0xb2, 0x54, 0x66, 0x93, 0x1c,
-                        0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05,
-                        0x1b, 0xa3, 0x0b, 0x39, 0x6a, 0x0a, 0xac, 0x97,
-                        0x3d, 0x58, 0xe0, 0x91, 0x47, 0x3f, 0x59, 0x85,
-                },
-                .C_len = 64,
-                .T = {
-                        0x4d, 0x5c, 0x2a, 0xf3, 0x27, 0xcd, 0x64, 0xa6,
-                        0x2c, 0xf3, 0x5a, 0xbd, 0x2b, 0xa6, 0xfa, 0xb4,
-                }
-        },
-        {
-                /* Test Case 4. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                },
-                .K_len = 16,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                        0xde, 0xca, 0xf8, 0x88,
-                },
-                .IV_len = 12,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24,
-                        0x4b, 0x72, 0x21, 0xb7, 0x84, 0xd0, 0xd4, 0x9c,
-                        0xe3, 0xaa, 0x21, 0x2f, 0x2c, 0x02, 0xa4, 0xe0,
-                        0x35, 0xc1, 0x7e, 0x23, 0x29, 0xac, 0xa1, 0x2e,
-                        0x21, 0xd5, 0x14, 0xb2, 0x54, 0x66, 0x93, 0x1c,
-                        0x7d, 0x8f, 0x6a, 0x5a, 0xac, 0x84, 0xaa, 0x05,
-                        0x1b, 0xa3, 0x0b, 0x39, 0x6a, 0x0a, 0xac, 0x97,
-                        0x3d, 0x58, 0xe0, 0x91,
-                },
-                .C_len = 60,
-                .T = {
-                        0x5b, 0xc9, 0x4f, 0xbc, 0x32, 0x21, 0xa5, 0xdb,
-                        0x94, 0xfa, 0xe9, 0x5a, 0xe7, 0x12, 0x1a, 0x47,
-                },
-        },
-        {
-                /* Test Case 5. */
-                /* K, P, A are the same as TC4. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                },
-                .K_len = 16,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                },
-                .IV_len = 8,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0x61, 0x35, 0x3b, 0x4c, 0x28, 0x06, 0x93, 0x4a,
-                        0x77, 0x7f, 0xf5, 0x1f, 0xa2, 0x2a, 0x47, 0x55,
-                        0x69, 0x9b, 0x2a, 0x71, 0x4f, 0xcd, 0xc6, 0xf8,
-                        0x37, 0x66, 0xe5, 0xf9, 0x7b, 0x6c, 0x74, 0x23,
-                        0x73, 0x80, 0x69, 0x00, 0xe4, 0x9f, 0x24, 0xb2,
-                        0x2b, 0x09, 0x75, 0x44, 0xd4, 0x89, 0x6b, 0x42,
-                        0x49, 0x89, 0xb5, 0xe1, 0xeb, 0xac, 0x0f, 0x07,
-                        0xc2, 0x3f, 0x45, 0x98,
-                },
-                .C_len = 60,
-                .T = {
-                        0x36, 0x12, 0xd2, 0xe7, 0x9e, 0x3b, 0x07, 0x85,
-                        0x56, 0x1b, 0xe1, 0x4a, 0xac, 0xa2, 0xfc, 0xcb,
-                },
-        },
-        {
-                /* Test Case 6. */
-                /* K, P, A are the same as TC4. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                },
-                .K_len = 16,
-                .IV = {
-                        0x93, 0x13, 0x22, 0x5d, 0xf8, 0x84, 0x06, 0xe5,
-                        0x55, 0x90, 0x9c, 0x5a, 0xff, 0x52, 0x69, 0xaa,
-                        0x6a, 0x7a, 0x95, 0x38, 0x53, 0x4f, 0x7d, 0xa1,
-                        0xe4, 0xc3, 0x03, 0xd2, 0xa3, 0x18, 0xa7, 0x28,
-                        0xc3, 0xc0, 0xc9, 0x51, 0x56, 0x80, 0x95, 0x39,
-                        0xfc, 0xf0, 0xe2, 0x42, 0x9a, 0x6b, 0x52, 0x54,
-                        0x16, 0xae, 0xdb, 0xf5, 0xa0, 0xde, 0x6a, 0x57,
-                        0xa6, 0x37, 0xb3, 0x9b,
-                },
-                .IV_len = 60,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0x8c, 0xe2, 0x49, 0x98, 0x62, 0x56, 0x15, 0xb6,
-                        0x03, 0xa0, 0x33, 0xac, 0xa1, 0x3f, 0xb8, 0x94,
-                        0xbe, 0x91, 0x12, 0xa5, 0xc3, 0xa2, 0x11, 0xa8,
-                        0xba, 0x26, 0x2a, 0x3c, 0xca, 0x7e, 0x2c, 0xa7,
-                        0x01, 0xe4, 0xa9, 0xa4, 0xfb, 0xa4, 0x3c, 0x90,
-                        0xcc, 0xdc, 0xb2, 0x81, 0xd4, 0x8c, 0x7c, 0x6f,
-                        0xd6, 0x28, 0x75, 0xd2, 0xac, 0xa4, 0x17, 0x03,
-                        0x4c, 0x34, 0xae, 0xe5,
-                },
-                .C_len = 60,
-                .T = {
-                        0x61, 0x9c, 0xc5, 0xae, 0xff, 0xfe, 0x0b, 0xfa,
-                        0x46, 0x2a, 0xf4, 0x3c, 0x16, 0x99, 0xd0, 0x50,
-                },
-        },
-        {
-                /* Test Case 7. */
-                .K = {0},
-                .K_len = 24,
-                .IV = {0},
-                .IV_len = 12,
-                .P = {0},
-                .P_len = 0,
-                .A = {0},
-                .A_len = 0,
-                .C = {0},
-                .C_len = 0,
-                .T = {
-                        0xcd, 0x33, 0xb2, 0x8a, 0xc7, 0x73, 0xf7, 0x4b,
-                        0xa0, 0x0e, 0xd1, 0xf3, 0x12, 0x57, 0x24, 0x35,
-                },
-        },
-        {
-                /* Test Case 8. */
-                .K = {0},
-                .K_len = 24,
-                .IV = {0},
-                .IV_len = 12,
-                .P = {0},
-                .P_len = 16,
-                .A = {0},
-                .A_len = 0,
-                .C = {
-                        0x98, 0xe7, 0x24, 0x7c, 0x07, 0xf0, 0xfe, 0x41,
-                        0x1c, 0x26, 0x7e, 0x43, 0x84, 0xb0, 0xf6, 0x00,
-                },
-                .C_len = 16,
-                .T = {
-                        0x2f, 0xf5, 0x8d, 0x80, 0x03, 0x39, 0x27, 0xab,
-                        0x8e, 0xf4, 0xd4, 0x58, 0x75, 0x14, 0xf0, 0xfb,
-                },
-        },
-        {
-                /* Test Case 9. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                },
-                .K_len = 24,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                        0xde, 0xca, 0xf8, 0x88,
-                },
-                .IV_len = 12,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55,
-                },
-                .P_len = 64,
-                .A = {0},
-                .A_len = 0,
-                .C = {
-                        0x39, 0x80, 0xca, 0x0b, 0x3c, 0x00, 0xe8, 0x41,
-                        0xeb, 0x06, 0xfa, 0xc4, 0x87, 0x2a, 0x27, 0x57,
-                        0x85, 0x9e, 0x1c, 0xea, 0xa6, 0xef, 0xd9, 0x84,
-                        0x62, 0x85, 0x93, 0xb4, 0x0c, 0xa1, 0xe1, 0x9c,
-                        0x7d, 0x77, 0x3d, 0x00, 0xc1, 0x44, 0xc5, 0x25,
-                        0xac, 0x61, 0x9d, 0x18, 0xc8, 0x4a, 0x3f, 0x47,
-                        0x18, 0xe2, 0x44, 0x8b, 0x2f, 0xe3, 0x24, 0xd9,
-                        0xcc, 0xda, 0x27, 0x10, 0xac, 0xad, 0xe2, 0x56,
-                },
-                .C_len = 64,
-                .T = {
-                        0x99, 0x24, 0xa7, 0xc8, 0x58, 0x73, 0x36, 0xbf,
-                        0xb1, 0x18, 0x02, 0x4d, 0xb8, 0x67, 0x4a, 0x14,
-                },
-        },
-        {
-                /* Test Case 10. */
-                /* K and IV are the same as TC9. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                },
-                .K_len = 24,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                        0xde, 0xca, 0xf8, 0x88,
-                },
-                .IV_len = 12,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0x39, 0x80, 0xca, 0x0b, 0x3c, 0x00, 0xe8, 0x41,
-                        0xeb, 0x06, 0xfa, 0xc4, 0x87, 0x2a, 0x27, 0x57,
-                        0x85, 0x9e, 0x1c, 0xea, 0xa6, 0xef, 0xd9, 0x84,
-                        0x62, 0x85, 0x93, 0xb4, 0x0c, 0xa1, 0xe1, 0x9c,
-                        0x7d, 0x77, 0x3d, 0x00, 0xc1, 0x44, 0xc5, 0x25,
-                        0xac, 0x61, 0x9d, 0x18, 0xc8, 0x4a, 0x3f, 0x47,
-                        0x18, 0xe2, 0x44, 0x8b, 0x2f, 0xe3, 0x24, 0xd9,
-                        0xcc, 0xda, 0x27, 0x10,
-                },
-                .C_len = 60,
-                .T = {
-                        0x25, 0x19, 0x49, 0x8e, 0x80, 0xf1, 0x47, 0x8f,
-                        0x37, 0xba, 0x55, 0xbd, 0x6d, 0x27, 0x61, 0x8c,
-                },
-        },
-        {
-                /* Test Case 11. */
-                /* K is the same as TC9, P and A are the same as TC10. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                },
-                .K_len = 24,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                },
-                .IV_len = 8,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0x0f, 0x10, 0xf5, 0x99, 0xae, 0x14, 0xa1, 0x54,
-                        0xed, 0x24, 0xb3, 0x6e, 0x25, 0x32, 0x4d, 0xb8,
-                        0xc5, 0x66, 0x63, 0x2e, 0xf2, 0xbb, 0xb3, 0x4f,
-                        0x83, 0x47, 0x28, 0x0f, 0xc4, 0x50, 0x70, 0x57,
-                        0xfd, 0xdc, 0x29, 0xdf, 0x9a, 0x47, 0x1f, 0x75,
-                        0xc6, 0x65, 0x41, 0xd4, 0xd4, 0xda, 0xd1, 0xc9,
-                        0xe9, 0x3a, 0x19, 0xa5, 0x8e, 0x8b, 0x47, 0x3f,
-                        0xa0, 0xf0, 0x62, 0xf7
-                },
-                .C_len = 60,
-                .T = {
-                        0x65, 0xdc, 0xc5, 0x7f, 0xcf, 0x62, 0x3a, 0x24,
-                        0x09, 0x4f, 0xcc, 0xa4, 0x0d, 0x35, 0x33, 0xf8,
-                },
-        },
-        {
-                /* Test Case 12. */
-                /* K is the same as TC9, P and A are the same as TC10. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                },
-                .K_len = 24,
-                .IV = {
-                        0x93, 0x13, 0x22, 0x5d, 0xf8, 0x84, 0x06, 0xe5,
-                        0x55, 0x90, 0x9c, 0x5a, 0xff, 0x52, 0x69, 0xaa,
-                        0x6a, 0x7a, 0x95, 0x38, 0x53, 0x4f, 0x7d, 0xa1,
-                        0xe4, 0xc3, 0x03, 0xd2, 0xa3, 0x18, 0xa7, 0x28,
-                        0xc3, 0xc0, 0xc9, 0x51, 0x56, 0x80, 0x95, 0x39,
-                        0xfc, 0xf0, 0xe2, 0x42, 0x9a, 0x6b, 0x52, 0x54,
-                        0x16, 0xae, 0xdb, 0xf5, 0xa0, 0xde, 0x6a, 0x57,
-                        0xa6, 0x37, 0xb3, 0x9b,
-                },
-                .IV_len = 60,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0xd2, 0x7e, 0x88, 0x68, 0x1c, 0xe3, 0x24, 0x3c,
-                        0x48, 0x30, 0x16, 0x5a, 0x8f, 0xdc, 0xf9, 0xff,
-                        0x1d, 0xe9, 0xa1, 0xd8, 0xe6, 0xb4, 0x47, 0xef,
-                        0x6e, 0xf7, 0xb7, 0x98, 0x28, 0x66, 0x6e, 0x45,
-                        0x81, 0xe7, 0x90, 0x12, 0xaf, 0x34, 0xdd, 0xd9,
-                        0xe2, 0xf0, 0x37, 0x58, 0x9b, 0x29, 0x2d, 0xb3,
-                        0xe6, 0x7c, 0x03, 0x67, 0x45, 0xfa, 0x22, 0xe7,
-                        0xe9, 0xb7, 0x37, 0x3b,
-                },
-                .C_len = 60,
-                .T = {
-                        0xdc, 0xf5, 0x66, 0xff, 0x29, 0x1c, 0x25, 0xbb,
-                        0xb8, 0x56, 0x8f, 0xc3, 0xd3, 0x76, 0xa6, 0xd9,
-                },
-        },
-        {
-                /* Test Case 13. */
-                .K = {0},
-                .K_len = 32,
-                .IV = {0},
-                .IV_len = 12,
-                .P = {0},
-                .P_len = 0,
-                .A = {0},
-                .A_len = 0,
-                .C = {0},
-                .C_len = 0,
-                .T = {
-                        0x53, 0x0f, 0x8a, 0xfb, 0xc7, 0x45, 0x36, 0xb9,
-                        0xa9, 0x63, 0xb4, 0xf1, 0xc4, 0xcb, 0x73, 0x8b,
-                },
-        },
-        {
-                /* Test Case 14. */
-                .K = {0},
-                .K_len = 32,
-                .IV = {0},
-                .IV_len = 12,
-                .P = {0},
-                .P_len = 16,
-                .A = {0},
-                .A_len = 0,
-                .C = {
-                        0xce, 0xa7, 0x40, 0x3d, 0x4d, 0x60, 0x6b, 0x6e,
-                        0x07, 0x4e, 0xc5, 0xd3, 0xba, 0xf3, 0x9d, 0x18,
-                },
-                .C_len = 16,
-                .T = {
-                        0xd0, 0xd1, 0xc8, 0xa7, 0x99, 0x99, 0x6b, 0xf0,
-                        0x26, 0x5b, 0x98, 0xb5, 0xd4, 0x8a, 0xb9, 0x19,
-                },
-        },
-        {
-                /* Test Case 15. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                },
-                .K_len = 32,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                        0xde, 0xca, 0xf8, 0x88,
-                },
-                .IV_len = 12,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55,
-                },
-                .P_len = 64,
-                .A = {0},
-                .A_len = 0,
-                .C = {
-                        0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07,
-                        0xf4, 0x7f, 0x37, 0xa3, 0x2a, 0x84, 0x42, 0x7d,
-                        0x64, 0x3a, 0x8c, 0xdc, 0xbf, 0xe5, 0xc0, 0xc9,
-                        0x75, 0x98, 0xa2, 0xbd, 0x25, 0x55, 0xd1, 0xaa,
-                        0x8c, 0xb0, 0x8e, 0x48, 0x59, 0x0d, 0xbb, 0x3d,
-                        0xa7, 0xb0, 0x8b, 0x10, 0x56, 0x82, 0x88, 0x38,
-                        0xc5, 0xf6, 0x1e, 0x63, 0x93, 0xba, 0x7a, 0x0a,
-                        0xbc, 0xc9, 0xf6, 0x62, 0x89, 0x80, 0x15, 0xad,
-                },
-                .C_len = 64,
-                .T = {
-                        0xb0, 0x94, 0xda, 0xc5, 0xd9, 0x34, 0x71, 0xbd,
-                        0xec, 0x1a, 0x50, 0x22, 0x70, 0xe3, 0xcc, 0x6c,
-                },
-        },
-        {
-                /* Test Case 16. */
-                /* K and IV are the same as TC15. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                },
-                .K_len = 32,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                        0xde, 0xca, 0xf8, 0x88,
-                },
-                .IV_len = 12,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07,
-                        0xf4, 0x7f, 0x37, 0xa3, 0x2a, 0x84, 0x42, 0x7d,
-                        0x64, 0x3a, 0x8c, 0xdc, 0xbf, 0xe5, 0xc0, 0xc9,
-                        0x75, 0x98, 0xa2, 0xbd, 0x25, 0x55, 0xd1, 0xaa,
-                        0x8c, 0xb0, 0x8e, 0x48, 0x59, 0x0d, 0xbb, 0x3d,
-                        0xa7, 0xb0, 0x8b, 0x10, 0x56, 0x82, 0x88, 0x38,
-                        0xc5, 0xf6, 0x1e, 0x63, 0x93, 0xba, 0x7a, 0x0a,
-                        0xbc, 0xc9, 0xf6, 0x62,
-                },
-                .C_len = 60,
-                .T = {
-                        0x76, 0xfc, 0x6e, 0xce, 0x0f, 0x4e, 0x17, 0x68,
-                        0xcd, 0xdf, 0x88, 0x53, 0xbb, 0x2d, 0x55, 0x1b,
-                },
-        },
-        {
-                /* Test Case 17. */
-                /* K is the same as TC15, P and A are the same as TC 16. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                },
-                .K_len = 32,
-                .IV = {
-                        0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad,
-                },
-                .IV_len = 8,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0xc3, 0x76, 0x2d, 0xf1, 0xca, 0x78, 0x7d, 0x32,
-                        0xae, 0x47, 0xc1, 0x3b, 0xf1, 0x98, 0x44, 0xcb,
-                        0xaf, 0x1a, 0xe1, 0x4d, 0x0b, 0x97, 0x6a, 0xfa,
-                        0xc5, 0x2f, 0xf7, 0xd7, 0x9b, 0xba, 0x9d, 0xe0,
-                        0xfe, 0xb5, 0x82, 0xd3, 0x39, 0x34, 0xa4, 0xf0,
-                        0x95, 0x4c, 0xc2, 0x36, 0x3b, 0xc7, 0x3f, 0x78,
-                        0x62, 0xac, 0x43, 0x0e, 0x64, 0xab, 0xe4, 0x99,
-                        0xf4, 0x7c, 0x9b, 0x1f,
-                },
-                .C_len = 60,
-                .T = {
-                        0x3a, 0x33, 0x7d, 0xbf, 0x46, 0xa7, 0x92, 0xc4,
-                        0x5e, 0x45, 0x49, 0x13, 0xfe, 0x2e, 0xa8, 0xf2,
-                },
-        },
-        {
-                /* Test Case 18. */
-                /* K is the same as TC15, P and A are the same as TC 16. */
-                .K = {
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                        0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
-                        0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
-                },
-                .K_len = 32,
-                .IV = {
-                        0x93, 0x13, 0x22, 0x5d, 0xf8, 0x84, 0x06, 0xe5,
-                        0x55, 0x90, 0x9c, 0x5a, 0xff, 0x52, 0x69, 0xaa,
-                        0x6a, 0x7a, 0x95, 0x38, 0x53, 0x4f, 0x7d, 0xa1,
-                        0xe4, 0xc3, 0x03, 0xd2, 0xa3, 0x18, 0xa7, 0x28,
-                        0xc3, 0xc0, 0xc9, 0x51, 0x56, 0x80, 0x95, 0x39,
-                        0xfc, 0xf0, 0xe2, 0x42, 0x9a, 0x6b, 0x52, 0x54,
-                        0x16, 0xae, 0xdb, 0xf5, 0xa0, 0xde, 0x6a, 0x57,
-                        0xa6, 0x37, 0xb3, 0x9b,
-                },
-                .IV_len = 60,
-                .P = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39,
-                },
-                .P_len = 60,
-                .A = {
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
-                        0xab, 0xad, 0xda, 0xd2,
-                },
-                .A_len = 20,
-                .C = {
-                        0x5a, 0x8d, 0xef, 0x2f, 0x0c, 0x9e, 0x53, 0xf1,
-                        0xf7, 0x5d, 0x78, 0x53, 0x65, 0x9e, 0x2a, 0x20,
-                        0xee, 0xb2, 0xb2, 0x2a, 0xaf, 0xde, 0x64, 0x19,
-                        0xa0, 0x58, 0xab, 0x4f, 0x6f, 0x74, 0x6b, 0xf4,
-                        0x0f, 0xc0, 0xc3, 0xb7, 0x80, 0xf2, 0x44, 0x45,
-                        0x2d, 0xa3, 0xeb, 0xf1, 0xc5, 0xd8, 0x2c, 0xde,
-                        0xa2, 0x41, 0x89, 0x97, 0x20, 0x0e, 0xf8, 0x2e,
-                        0x44, 0xae, 0x7e, 0x3f,
-                },
-                .C_len = 60,
-                .T = {
-                        0xa4, 0x4a, 0x82, 0x66, 0xee, 0x1c, 0x8e, 0xb0,
-                        0xc8, 0xb5, 0xd4, 0xcf, 0x5a, 0xe9, 0xf1, 0x9a,
-                },
-        },
-        {
-                /* Test Case 19. */
-                .K = {0},
-                .K_len = 16,
-                .IV = {0},
-                .IV_len = 12,
-                .P = {0},
-                .P_len = 0,
-                .A = {
-                        0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
-                        0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
-                        0x86, 0xa7, 0xa9, 0x53, 0x15, 0x34, 0xf7, 0xda,
-                        0x2e, 0x4c, 0x30, 0x3d, 0x8a, 0x31, 0x8a, 0x72,
-                        0x1c, 0x3c, 0x0c, 0x95, 0x95, 0x68, 0x09, 0x53,
-                        0x2f, 0xcf, 0x0e, 0x24, 0x49, 0xa6, 0xb5, 0x25,
-                        0xb1, 0x6a, 0xed, 0xf5, 0xaa, 0x0d, 0xe6, 0x57,
-                        0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55,
-                        0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07,
-                        0xf4, 0x7f, 0x37, 0xa3, 0x2a, 0x84, 0x42, 0x7d,
-                        0x64, 0x3a, 0x8c, 0xdc, 0xbf, 0xe5, 0xc0, 0xc9,
-                        0x75, 0x98, 0xa2, 0xbd, 0x25, 0x55, 0xd1, 0xaa,
-                        0x8c, 0xb0, 0x8e, 0x48, 0x59, 0x0d, 0xbb, 0x3d,
-                        0xa7, 0xb0, 0x8b, 0x10, 0x56, 0x82, 0x88, 0x38,
-                        0xc5, 0xf6, 0x1e, 0x63, 0x93, 0xba, 0x7a, 0x0a,
-                        0xbc, 0xc9, 0xf6, 0x62, 0x89, 0x80, 0x15, 0xad,
-                },
-                .A_len = 128,
-                .C = {0},
-                .C_len = 0,
-                .T = {
-                        0x5f, 0xea, 0x79, 0x3a, 0x2d, 0x6f, 0x97, 0x4d,
-                        0x37, 0xe6, 0x8e, 0x0c, 0xb8, 0xff, 0x94, 0x92,
-                },
-        },
-        {
-                /* Test Case 20. */
-                .K = {0},
-                .K_len = 16,
-                .IV = {
-                        /* This results in 0xff in counter LSB. */
-                        0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                },
-                .IV_len = 64,
-                .P = {0},
-                .P_len = 288,
-                .A = {0},
-                .A_len = 0,
-                .C = {
-                        0x56, 0xb3, 0x37, 0x3c, 0xa9, 0xef, 0x6e, 0x4a,
-                        0x2b, 0x64, 0xfe, 0x1e, 0x9a, 0x17, 0xb6, 0x14,
-                        0x25, 0xf1, 0x0d, 0x47, 0xa7, 0x5a, 0x5f, 0xce,
-                        0x13, 0xef, 0xc6, 0xbc, 0x78, 0x4a, 0xf2, 0x4f,
-                        0x41, 0x41, 0xbd, 0xd4, 0x8c, 0xf7, 0xc7, 0x70,
-                        0x88, 0x7a, 0xfd, 0x57, 0x3c, 0xca, 0x54, 0x18,
-                        0xa9, 0xae, 0xff, 0xcd, 0x7c, 0x5c, 0xed, 0xdf,
-                        0xc6, 0xa7, 0x83, 0x97, 0xb9, 0xa8, 0x5b, 0x49,
-                        0x9d, 0xa5, 0x58, 0x25, 0x72, 0x67, 0xca, 0xab,
-                        0x2a, 0xd0, 0xb2, 0x3c, 0xa4, 0x76, 0xa5, 0x3c,
-                        0xb1, 0x7f, 0xb4, 0x1c, 0x4b, 0x8b, 0x47, 0x5c,
-                        0xb4, 0xf3, 0xf7, 0x16, 0x50, 0x94, 0xc2, 0x29,
-                        0xc9, 0xe8, 0xc4, 0xdc, 0x0a, 0x2a, 0x5f, 0xf1,
-                        0x90, 0x3e, 0x50, 0x15, 0x11, 0x22, 0x13, 0x76,
-                        0xa1, 0xcd, 0xb8, 0x36, 0x4c, 0x50, 0x61, 0xa2,
-                        0x0c, 0xae, 0x74, 0xbc, 0x4a, 0xcd, 0x76, 0xce,
-                        0xb0, 0xab, 0xc9, 0xfd, 0x32, 0x17, 0xef, 0x9f,
-                        0x8c, 0x90, 0xbe, 0x40, 0x2d, 0xdf, 0x6d, 0x86,
-                        0x97, 0xf4, 0xf8, 0x80, 0xdf, 0xf1, 0x5b, 0xfb,
-                        0x7a, 0x6b, 0x28, 0x24, 0x1e, 0xc8, 0xfe, 0x18,
-                        0x3c, 0x2d, 0x59, 0xe3, 0xf9, 0xdf, 0xff, 0x65,
-                        0x3c, 0x71, 0x26, 0xf0, 0xac, 0xb9, 0xe6, 0x42,
-                        0x11, 0xf4, 0x2b, 0xae, 0x12, 0xaf, 0x46, 0x2b,
-                        0x10, 0x70, 0xbe, 0xf1, 0xab, 0x5e, 0x36, 0x06,
-                        0x87, 0x2c, 0xa1, 0x0d, 0xee, 0x15, 0xb3, 0x24,
-                        0x9b, 0x1a, 0x1b, 0x95, 0x8f, 0x23, 0x13, 0x4c,
-                        0x4b, 0xcc, 0xb7, 0xd0, 0x32, 0x00, 0xbc, 0xe4,
-                        0x20, 0xa2, 0xf8, 0xeb, 0x66, 0xdc, 0xf3, 0x64,
-                        0x4d, 0x14, 0x23, 0xc1, 0xb5, 0x69, 0x90, 0x03,
-                        0xc1, 0x3e, 0xce, 0xf4, 0xbf, 0x38, 0xa3, 0xb6,
-                        0x0e, 0xed, 0xc3, 0x40, 0x33, 0xba, 0xc1, 0x90,
-                        0x27, 0x83, 0xdc, 0x6d, 0x89, 0xe2, 0xe7, 0x74,
-                        0x18, 0x8a, 0x43, 0x9c, 0x7e, 0xbc, 0xc0, 0x67,
-                        0x2d, 0xbd, 0xa4, 0xdd, 0xcf, 0xb2, 0x79, 0x46,
-                        0x13, 0xb0, 0xbe, 0x41, 0x31, 0x5e, 0xf7, 0x78,
-                        0x70, 0x8a, 0x70, 0xee, 0x7d, 0x75, 0x16, 0x5c,
-                },
-                .C_len = 288,
-                .T = {
-                        0x8b, 0x30, 0x7f, 0x6b, 0x33, 0x28, 0x6d, 0x0a,
-                        0xb0, 0x26, 0xa9, 0xed, 0x3f, 0xe1, 0xe8, 0x5f,
-                },
-        },
-};
-
-#define N_TESTS (sizeof(gcm128_tests) / sizeof(*gcm128_tests))
-
-static int
-do_gcm128_test(int test_no, struct gcm128_test *tv)
-{
-        GCM128_CONTEXT ctx;
-        AES_KEY key;
-        uint8_t *out = NULL;
-        size_t out_len;
-        int ret = 1;
-
-        out_len = tv->P_len;
-        if (out_len != 0) {
-                out = malloc(out_len);
-                if (out == NULL)
-                        err(1, "malloc");
-        }
-
-        AES_set_encrypt_key(tv->K, tv->K_len * 8, &key);
-
-        if (out_len != 0)
-                memset(out, 0, out_len);
-        CRYPTO_gcm128_init(&ctx, &key, (block128_f)AES_encrypt);
-        CRYPTO_gcm128_setiv(&ctx, tv->IV, tv->IV_len);
-        if (tv->A_len > 0)
-                CRYPTO_gcm128_aad(&ctx, tv->A, tv->A_len);
-        if (tv->P_len > 0)
-                CRYPTO_gcm128_encrypt(&ctx, tv->P, out, out_len);
-        if (CRYPTO_gcm128_finish(&ctx, tv->T, 16)) {
-                fprintf(stderr, "TEST %i: CRYPTO_gcm128_finish failed\n",
-                    test_no);
-                goto fail;
-        }
-        if (tv->C_len > 0 && memcmp(out, tv->C, out_len)) {
-                fprintf(stderr, "TEST %i: encrypt failed\n", test_no);
-                goto fail;
-        }
-
-        if (out_len != 0)
-                memset(out, 0, out_len);
-        CRYPTO_gcm128_setiv(&ctx, tv->IV, tv->IV_len);
-        if (tv->A_len > 0)
-                CRYPTO_gcm128_aad(&ctx, tv->A, tv->A_len);
-        if (tv->C_len > 0)
-                CRYPTO_gcm128_decrypt(&ctx, tv->C, out, out_len);
-        if (CRYPTO_gcm128_finish(&ctx, tv->T, 16)) {
-                fprintf(stderr, "TEST %i: CRYPTO_gcm128_finish failed\n",
-                    test_no);
-                goto fail;
-        }
-        if (tv->P_len > 0 && memcmp(out, tv->P, out_len)) {
-                fprintf(stderr, "TEST %i: decrypt failed\n", test_no);
-                goto fail;
-        }
-
-        ret = 0;
-
-fail:
-        free(out);
-        return (ret);
-}
-
-int
-main(int argc, char **argv)
-{
-        int ret = 0;
-        size_t i;
-
-        for (i = 0; i < N_TESTS; i++)
-                ret |= do_gcm128_test(i + 1, &gcm128_tests[i]);
-
-        return ret;
-}
diff --git a/src/regress/lib/libcrypto/gost/Makefile b/src/regress/lib/libcrypto/gost/Makefile
deleted file mode 100644
index 14b0f9b824..0000000000
--- a/src/regress/lib/libcrypto/gost/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/11/09 19:45:26 miod Exp $
-
-PROG=   gost2814789t
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/gost/gost2814789t.c b/src/regress/lib/libcrypto/gost/gost2814789t.c
deleted file mode 100644
index 30aaead34e..0000000000
--- a/src/regress/lib/libcrypto/gost/gost2814789t.c
+++ /dev/null
@@ -1,1459 +0,0 @@
-/*      $OpenBSD: gost2814789t.c,v 1.2 2014/12/15 06:03:15 miod Exp $   */
-/* vim: set fileencoding=ascii : Charset: ASCII */
-/* test/gostr2814789t.c */
-/* ====================================================================
- * Copyright (c) 2012 Crypto-Pro, Ltd., Serguei E. Leontiev,
- *                    lse@cryptopro.ru
- *
- * This file is distributed under the same license as OpenSSL
- * ====================================================================
- */
-#include <stdio.h>
-
-#if defined(OPENSSL_NO_GOST)
-int main(int argc, char *argv[])
-{
-    printf("No GOST 28147-89 support\n");
-    return 0;
-}
-#else
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <openssl/conf.h>
-#include <openssl/crypto.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/obj_mac.h>
-
-#define G89_MAX_TC_LEN  (2048)
-#define G89_BLOCK_LEN (8)
-
-#undef  U64
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#define U64(C)                  C##UI64
-#elif defined(_LP64) || defined(__arch64__)
-#define U64(C)                  C##UL
-#else
-#define U64(C)                  C##ULL
-#endif
-
-typedef enum g89_mode_ {
-    G89_ECB,
-    G89_CFB,
-    G89_CNT,
-    G89_IMIT
-}   g89_mode;
-
-typedef struct g89_tc_ {
-    uint64_t ullLen;                    /* ullLen > G89_MAX_TC_LEN */
-                                        /*     Clear text ullLen */
-                                        /*     of zero unsigned chars */
-    const unsigned char bIn[G89_MAX_TC_LEN];    /* Clear text, when */
-                                        /*     ullLen <= G89_MAX_TC_LEN */
-    const char *szParamSet;             /* S-Box ID */
-    const char *szDerive;               /* String for derive bRawKey */
-    const unsigned char bRawKey[EVP_MAX_KEY_LENGTH];
-    g89_mode gMode;                     /* Mode of encryption or MAC */
-    const unsigned char bIV[EVP_MAX_IV_LENGTH]; /* IV for CFB or CNT mode */
-    const unsigned char bOut[G89_MAX_TC_LEN];   /* Cipher text for ECB/CFB/CNT */
-                                        /* mode, when ullLen <= G89_MAX_TC_LEN;
-                                         * Last 16 unsigned char of cipher text for
-                                         * ECB/CFB/CNT, when ullLen >
-                                         * G89_MAX_TC_LEN;
-                                         * 4 unsigned char MAC for imitovstavka */
-}   g89_tc;
-
-const g89_tc tcs[] = {
-  /* 
-   * GOST R 34.11-94 Test cases 
-   */
-    { /* see p. A.3.1 [GOSTR341194], p. 7.3.1 [ENG-GOSTR341194] */
-      /* <http://tools.ietf.org/html/rfc5831#section-7.3.1> */
-      /* Iteration 1, K[1], see Errata for RFC 5831 */
-        8, 
-        { 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
-        },
-        "id-GostR3411-94-TestParamSet",
-        NULL,
-        {
-            0x54, 0x6d, 0x20, 0x33, 0x68, 0x65, 0x6c, 0x32,
-            0x69, 0x73, 0x65, 0x20, 0x73, 0x73, 0x6e, 0x62,
-            0x20, 0x61, 0x67, 0x79, 0x69, 0x67, 0x74, 0x74,
-            0x73, 0x65, 0x68, 0x65, 0x20, 0x2c, 0x3d, 0x73
-        },
-        G89_ECB,
-        { 0 },
-        {
-            0x1b, 0x0b, 0xbc, 0x32, 0xce, 0xbc, 0xab, 0x42
-        }
-    },
-    { /* see p. A.3.1 [GOSTR341194], p. 7.3.1 [ENG-GOSTR341194] */
-      /* <http://tools.ietf.org/html/rfc5831#section-7.3.1> */
-      /* Iteration 1, K[4] */
-        8, 
-        { 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
-        },
-        "id-GostR3411-94-TestParamSet",
-        NULL,
-        {
-            0xec, 0x0a, 0x8b, 0xa1, 0x5e, 0xc0, 0x04, 0xa8,
-            0xba, 0xc5, 0x0c, 0xac, 0x0c, 0x62, 0x1d, 0xee,
-            0xe1, 0xc7, 0xb8, 0xe7, 0x00, 0x7a, 0xe2, 0xec,
-            0xf2, 0x73, 0x1b, 0xff, 0x4e, 0x80, 0xe2, 0xa0
-        },
-        G89_ECB,
-        { 0 },
-        {
-            0x2d, 0x56, 0x2a, 0x0d, 0x19, 0x04, 0x86, 0xe7
-        }
-    },
-    { /* see p. A.3.1 [GOSTR341194], p. 7.3.1 [ENG-GOSTR341194] */
-      /* <http://tools.ietf.org/html/rfc5831#section-7.3.1> */
-      /* Iteration 2, K[1] */
-        8, 
-        { 
-            0x34, 0xc0, 0x15, 0x33, 0xe3, 0x7d, 0x1c, 0x56
-        },
-        "id-GostR3411-94-TestParamSet",
-        NULL,
-        {
-            0x34, 0x87, 0x24, 0xa4, 0xc1, 0xa6, 0x76, 0x67,
-            0x15, 0x3d, 0xde, 0x59, 0x33, 0x88, 0x42, 0x50,
-            0xe3, 0x24, 0x8c, 0x65, 0x7d, 0x41, 0x3b, 0x8c,
-            0x1c, 0x9c, 0xa0, 0x9a, 0x56, 0xd9, 0x68, 0xcf
-        },
-        G89_ECB,
-        { 0 },
-        {
-            0x86, 0x3e, 0x78, 0xdd, 0x2d, 0x60, 0xd1, 0x3c
-        }
-    },
-  /* 
-   * id-Gost28147-89-CryptoPro-A-ParamSet (1.2.643.2.2.31.1)
-   * Test cases
-   */
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        16,
-        {
-            0x74, 0x3d, 0x76, 0xf9, 0x1b, 0xee, 0x35, 0x3c,
-            0xa2, 0x5c, 0x3b, 0x10, 0xeb, 0x64, 0xcf, 0xf5
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testecb1",
-        {
-            0xbb, 0xf1, 0xed, 0xd3, 0x20, 0xaf, 0x8a, 0x62,
-            0x8e, 0x11, 0xc8, 0xa9, 0x51, 0xcc, 0xbe, 0x81,
-            0x47, 0x7b, 0x41, 0xa1, 0x6a, 0xf6, 0x7f, 0x05,
-            0xe8, 0x51, 0x2f, 0x9e, 0x01, 0xf8, 0xcf, 0x49
-        },
-        G89_ECB,
-        { 0 },
-        {
-            0xc3, 0x73, 0x90, 0x95, 0x35, 0x58, 0x08, 0x63,
-            0xcb, 0x68, 0x85, 0x96, 0x77, 0xe8, 0xfb, 0xa9
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        16,
-        {
-            0xd2, 0xfd, 0xf8, 0x3a, 0xc1, 0xb4, 0x39, 0x23,
-            0x2e, 0xaa, 0xcc, 0x98, 0x0a, 0x02, 0xda, 0x33
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testcfb1",
-        {
-            0x8d, 0x5a, 0x2c, 0x83, 0xa7, 0xc7, 0x0a, 0x61,
-            0xd6, 0x1b, 0x34, 0xb5, 0x1f, 0xdf, 0x42, 0x68,
-            0x66, 0x71, 0xa3, 0x5d, 0x87, 0x4c, 0xfd, 0x84,
-            0x99, 0x36, 0x63, 0xb6, 0x1e, 0xd6, 0x0d, 0xad
-        },
-        G89_CFB,
-        {
-            0x46, 0x60, 0x6f, 0x0d, 0x88, 0x34, 0x23, 0x5a
-        },
-        {
-            0x88, 0xb7, 0x75, 0x16, 0x74, 0xa5, 0xee, 0x2d,
-            0x14, 0xfe, 0x91, 0x67, 0xd0, 0x5c, 0xcc, 0x40
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        16,
-        {
-            0x90, 0xa2, 0x39, 0x66, 0xae, 0x01, 0xb9, 0xa3,
-            0x52, 0x4e, 0xc8, 0xed, 0x6c, 0xdd, 0x88, 0x30
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testcnt1",
-        {
-            0x59, 0x9f, 0x84, 0xba, 0xc3, 0xf3, 0xd2, 0xf1,
-            0x60, 0xe1, 0xe3, 0xf2, 0x6a, 0x96, 0x1a, 0xf9,
-            0x9c, 0x48, 0xb2, 0x4e, 0xbc, 0xbb, 0xbf, 0x7c,
-            0xd8, 0xf3, 0xac, 0xcd, 0x96, 0x8d, 0x28, 0x6a
-        },
-        G89_CNT,
-        {
-            0x8d, 0xaf, 0xa8, 0xd1, 0x58, 0xed, 0x05, 0x8d
-        },
-        {
-            0x6e, 0x72, 0x62, 0xcc, 0xe3, 0x59, 0x36, 0x90,
-            0x83, 0x3a, 0xfe, 0xa9, 0x1b, 0xc9, 0xbe, 0xce
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        16,
-        {
-            0xb5, 0xa1, 0xf0, 0xe3, 0xce, 0x2f, 0x02, 0x1d,
-            0x67, 0x61, 0x94, 0x34, 0x5c, 0x41, 0xe3, 0x6e
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testimit1",
-        {
-            0x9d, 0x05, 0xb7, 0x9e, 0x90, 0xca, 0xd0, 0x0a,
-            0x2c, 0xda, 0xd2, 0x2e, 0xf4, 0xe8, 0x6f, 0x5c,
-            0xf5, 0xdc, 0x37, 0x68, 0x19, 0x85, 0xb3, 0xbf,
-            0xaa, 0x18, 0xc1, 0xc3, 0x05, 0x0a, 0x91, 0xa2
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0xf8, 0x1f, 0x08, 0xa3
-        }
-    },
-  /* 
-   * Other paramsets and key meshing test cases.
-   */
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        1039,
-        {
-            0x8c, 0x9c, 0x44, 0x35, 0xfb, 0xe9, 0xa5, 0xa3,
-            0xa0, 0xae, 0x28, 0x56, 0x91, 0x10, 0x8e, 0x1e ,
-            0xd2, 0xbb, 0x18, 0x53, 0x81, 0x27, 0x0d, 0xa6,
-            0x68, 0x59, 0x36, 0xc5, 0x81, 0x62, 0x9a, 0x8e,
-            0x7d, 0x50, 0xf1, 0x6f, 0x97, 0x62, 0x29, 0xec,
-            0x80, 0x51, 0xe3, 0x7d, 0x6c, 0xc4, 0x07, 0x95,
-            0x28, 0x63, 0xdc, 0xb4, 0xb9, 0x2d, 0xb8, 0x13,
-            0xb1, 0x05, 0xb5, 0xf9, 0xeb, 0x75, 0x37, 0x4e,
-            0xf7, 0xbf, 0x51, 0xf1, 0x98, 0x86, 0x43, 0xc4,
-            0xe4, 0x3d, 0x3e, 0xa7, 0x62, 0xec, 0x41, 0x59,
-            0xe0, 0xbd, 0xfb, 0xb6, 0xfd, 0xec, 0xe0, 0x77,
-            0x13, 0xd2, 0x59, 0x90, 0xa1, 0xb8, 0x97, 0x6b,
-            0x3d, 0x8b, 0x7d, 0xfc, 0x9d, 0xca, 0x82, 0x73,
-            0x32, 0x70, 0x0a, 0x74, 0x03, 0xc6, 0x0c, 0x26,
-            0x7f, 0x56, 0xf0, 0x9d, 0xb2, 0xeb, 0x71, 0x40,
-            0xd7, 0xc3, 0xb1, 0xa7, 0xc5, 0x1e, 0x20, 0x17,
-            0xb3, 0x50, 0x1d, 0x8a, 0x6e, 0x19, 0xcb, 0xbe,
-            0x20, 0x86, 0x2b, 0xd6, 0x1c, 0xfd, 0xb4, 0xb7,
-            0x5d, 0x9a, 0xb3, 0xe3, 0x7d, 0x15, 0x7a, 0x35,
-            0x01, 0x9f, 0x5d, 0x65, 0x89, 0x4b, 0x34, 0xc6,
-            0xf4, 0x81, 0x3f, 0x78, 0x30, 0xcf, 0xe9, 0x15,
-            0x90, 0x9a, 0xf9, 0xde, 0xba, 0x63, 0xd0, 0x19,
-            0x14, 0x66, 0x3c, 0xb9, 0xa4, 0xb2, 0x84, 0x94,
-            0x02, 0xcf, 0xce, 0x20, 0xcf, 0x76, 0xe7, 0xc5,
-            0x48, 0xf7, 0x69, 0x3a, 0x5d, 0xec, 0xaf, 0x41,
-            0xa7, 0x12, 0x64, 0x83, 0xf5, 0x99, 0x1e, 0x9e,
-            0xb2, 0xab, 0x86, 0x16, 0x00, 0x23, 0x8e, 0xe6,
-            0xd9, 0x80, 0x0b, 0x6d, 0xc5, 0x93, 0xe2, 0x5c,
-            0x8c, 0xd8, 0x5e, 0x5a, 0xae, 0x4a, 0x85, 0xfd,
-            0x76, 0x01, 0xea, 0x30, 0xf3, 0x78, 0x34, 0x10,
-            0x72, 0x51, 0xbc, 0x9f, 0x76, 0xce, 0x1f, 0xd4,
-            0x8f, 0x33, 0x50, 0x34, 0xc7, 0x4d, 0x7b, 0xcf,
-            0x91, 0x63, 0x7d, 0x82, 0x9e, 0xa1, 0x23, 0x45,
-            0xf5, 0x45, 0xac, 0x98, 0x7a, 0x48, 0xff, 0x64,
-            0xd5, 0x59, 0x47, 0xde, 0x2b, 0x3f, 0xfa, 0xec,
-            0x50, 0xe0, 0x81, 0x60, 0x8b, 0xc3, 0xfc, 0x80,
-            0x98, 0x17, 0xc7, 0xa3, 0xc2, 0x57, 0x3d, 0xab,
-            0x91, 0x67, 0xf5, 0xc4, 0xab, 0x92, 0xc8, 0xd6,
-            0x3b, 0x6b, 0x3f, 0xff, 0x15, 0x6b, 0xcf, 0x53,
-            0x65, 0x02, 0xf1, 0x74, 0xca, 0xa9, 0xbe, 0x24,
-            0xd2, 0xf0, 0xb7, 0x26, 0xa8, 0xd7, 0x6d, 0xed,
-            0x90, 0x36, 0x7b, 0x3e, 0x41, 0xa9, 0x7f, 0xa3,
-            0x1b, 0xf4, 0x43, 0xc5, 0x51, 0xbe, 0x28, 0x59,
-            0xe9, 0x45, 0x26, 0x49, 0x38, 0x32, 0xf8, 0xf3,
-            0x92, 0x6e, 0x30, 0xcc, 0xb0, 0xa0, 0xf9, 0x01,
-            0x14, 0xc8, 0xba, 0xd9, 0xf0, 0x2a, 0x29, 0xe2,
-            0x52, 0x9a, 0x76, 0x95, 0x3a, 0x16, 0x32, 0xec,
-            0xf4, 0x10, 0xec, 0xee, 0x47, 0x00, 0x70, 0x19,
-            0xe4, 0x72, 0x35, 0x66, 0x44, 0x53, 0x2d, 0xa2,
-            0xf3, 0xaa, 0x7e, 0x8a, 0x33, 0x13, 0xcd, 0xc8,
-            0xbf, 0x0e, 0x40, 0x90, 0x00, 0xe4, 0x42, 0xc3,
-            0x09, 0x84, 0xe1, 0x66, 0x17, 0xa2, 0xaf, 0x03,
-            0xab, 0x6b, 0xa1, 0xec, 0xfb, 0x17, 0x72, 0x81,
-            0xfe, 0x9a, 0x9f, 0xf4, 0xb2, 0x33, 0x1f, 0xae,
-            0x0c, 0xd1, 0x6a, 0xae, 0x19, 0xb8, 0xaf, 0xec,
-            0xe3, 0xea, 0x00, 0xf8, 0xac, 0x87, 0x07, 0x5f,
-            0x6d, 0xb0, 0xac, 0x6b, 0x22, 0x48, 0x36, 0xbf,
-            0x22, 0x18, 0xb0, 0x03, 0x9f, 0x6c, 0x70, 0x45,
-            0x36, 0xf0, 0x6b, 0xc6, 0xc2, 0xa5, 0x72, 0x2c,
-            0xd8, 0xe0, 0x27, 0x3d, 0xec, 0x56, 0x07, 0x05,
-            0x7d, 0x83, 0xa1, 0x65, 0x7d, 0x41, 0x5b, 0xcd,
-            0x77, 0x24, 0xe5, 0xaa, 0x76, 0x47, 0xd0, 0x50,
-            0xf6, 0xe7, 0xb5, 0x59, 0x75, 0x31, 0x27, 0xef,
-            0xd8, 0xa6, 0x4e, 0x7f, 0xb8, 0x40, 0xb1, 0xdf,
-            0x53, 0x14, 0xed, 0xf1, 0x68, 0x5f, 0xfc, 0x3f,
-            0x02, 0xdb, 0x05, 0xeb, 0x31, 0xe4, 0x2c, 0x7f,
-            0x32, 0xb5, 0x70, 0x8e, 0x75, 0x85, 0xa4, 0x5c,
-            0x16, 0x23, 0x37, 0xf2, 0x10, 0x79, 0xcb, 0xdc,
-            0xf8, 0x1c, 0x25, 0xc2, 0xa1, 0x3d, 0x9c, 0x33,
-            0x6c, 0xed, 0xc3, 0xe7, 0xf3, 0x02, 0x87, 0x82,
-            0x4e, 0xfb, 0xac, 0xb3, 0x2d, 0xfc, 0xf8, 0x0d,
-            0x1d, 0x4a, 0x39, 0xd4, 0xb3, 0x09, 0xbb, 0xe9,
-            0x25, 0xc7, 0xec, 0x6a, 0x87, 0x72, 0x84, 0xed,
-            0x12, 0x60, 0x19, 0x64, 0xeb, 0x16, 0x2a, 0x5b,
-            0x10, 0x76, 0x27, 0xff, 0x7b, 0xe4, 0xae, 0xe5,
-            0xa4, 0x04, 0x02, 0x7f, 0xbb, 0x0a, 0xb5, 0xf4,
-            0x05, 0xa5, 0x56, 0x1c, 0x53, 0x31, 0x7a, 0x93,
-            0xba, 0x16, 0x15, 0xab, 0x62, 0x60, 0xfc, 0xde,
-            0x72, 0x36, 0x6e, 0x28, 0xaf, 0x98, 0x0d, 0xe6,
-            0xf4, 0xde, 0x60, 0xa7, 0x7e, 0x06, 0x07, 0x86,
-            0xf3, 0x94, 0xb6, 0x6d, 0x0d, 0x93, 0xa6, 0xbc,
-            0x60, 0x70, 0x33, 0xac, 0x3f, 0xa1, 0xa8, 0x4a,
-            0x20, 0x61, 0xb6, 0xb5, 0x43, 0xa3, 0x15, 0x5a,
-            0x00, 0xbe, 0x76, 0x98, 0x57, 0x72, 0xab, 0x7a,
-            0x0e, 0x18, 0x93, 0x82, 0x3a, 0x18, 0x78, 0x6e,
-            0x71, 0x7b, 0x78, 0x4f, 0x7e, 0x8c, 0xde, 0x7a,
-            0x62, 0xb5, 0x0a, 0x7c, 0x45, 0x1d, 0x16, 0xd5,
-            0xc3, 0x8c, 0x9b, 0x25, 0xb4, 0x50, 0x90, 0xcd,
-            0x96, 0x93, 0xad, 0x0f, 0xd4, 0x43, 0xcb, 0x49,
-            0x0f, 0xfc, 0x5a, 0x31, 0xf4, 0x19, 0xb7, 0xd4,
-            0xeb, 0x4d, 0x40, 0x58, 0xd0, 0x3b, 0xc8, 0xe0,
-            0x4a, 0x54, 0x2f, 0xdb, 0x22, 0xc3, 0x29, 0x7b,
-            0x40, 0x90, 0x61, 0x43, 0xd3, 0x7e, 0xe2, 0x30,
-            0x2b, 0x48, 0x3c, 0xce, 0x90, 0x93, 0xb1, 0x8b,
-            0x31, 0x96, 0x65, 0x6d, 0x57, 0x8b, 0x9d, 0x4d,
-            0x53, 0xf0, 0x83, 0x1c, 0xe5, 0xa1, 0x9d, 0x55,
-            0xe3, 0xbf, 0x7e, 0xca, 0x1a, 0x74, 0x66, 0x14,
-            0xcc, 0x47, 0x43, 0xd9, 0xbb, 0xef, 0x97, 0x7d,
-            0xb7, 0x6e, 0xff, 0xf1, 0x22, 0xf8, 0x10, 0x2d,
-            0x3f, 0xcd, 0x49, 0x96, 0xd9, 0x09, 0x11, 0xb8,
-            0x33, 0xd0, 0x23, 0x9a, 0xfa, 0x16, 0xcb, 0x50,
-            0x26, 0x57, 0x24, 0x5c, 0x0e, 0xba, 0xf0, 0x3f,
-            0x37, 0x2f, 0xa3, 0xf7, 0x18, 0x57, 0x48, 0x48,
-            0x95, 0xcf, 0xef, 0x87, 0x67, 0x2a, 0xe9, 0xb6,
-            0x8a, 0x21, 0x36, 0x7f, 0xff, 0x48, 0x6c, 0x46,
-            0x35, 0x57, 0xf2, 0xbc, 0x48, 0x67, 0x8f, 0x63,
-            0x23, 0x78, 0x11, 0x2b, 0xc2, 0x08, 0xde, 0x51,
-            0xe8, 0x8b, 0x92, 0x29, 0xf9, 0x9a, 0x9e, 0xad,
-            0xed, 0x0f, 0xeb, 0xa2, 0xd2, 0x40, 0x92, 0xd4,
-            0xde, 0x62, 0x95, 0x76, 0xfd, 0x6e, 0x3c, 0xbf,
-            0xc0, 0xd7, 0x0d, 0xe5, 0x1b, 0xa4, 0xc7, 0x18,
-            0xe1, 0x58, 0xa4, 0x56, 0xef, 0x2e, 0x17, 0x1b,
-            0x75, 0xcb, 0xbc, 0xf9, 0x2a, 0x95, 0x71, 0xa7,
-            0x1d, 0x7f, 0xe7, 0x73, 0x63, 0x05, 0x6b, 0x19,
-            0x4c, 0xf4, 0x22, 0x14, 0xc4, 0x59, 0x88, 0x66,
-            0x92, 0x86, 0x61, 0x5c, 0x6a, 0xae, 0xec, 0x58,
-            0xff, 0xc9, 0xf2, 0x44, 0xd4, 0xa2, 0xf5, 0x98,
-            0xeb, 0x5f, 0x09, 0xbc, 0x8a, 0xbf, 0x3c, 0xb4,
-            0x3e, 0xb1, 0x20, 0x05, 0x44, 0x96, 0x79, 0x0a,
-            0x40, 0x92, 0x7f, 0x9d, 0xd1, 0xaf, 0xbc, 0x90,
-            0x95, 0x0a, 0x81, 0xd4, 0xa7, 0xc6, 0xb8, 0xe0,
-            0xe4, 0x39, 0x30, 0x1d, 0x79, 0xc0, 0xe5, 0xfa,
-            0xb4, 0xe9, 0x63, 0xb4, 0x09, 0x72, 0x3b, 0x3e,
-            0xd9, 0xf6, 0xd9, 0x10, 0x21, 0x18, 0x7e, 0xe5,
-            0xad, 0x81, 0xd7, 0xd5, 0x82, 0xd0, 0x8c, 0x3b,
-            0x38, 0x95, 0xf8, 0x92, 0x01, 0xa9, 0x92, 0x00,
-            0x70, 0xd1, 0xa7, 0x88, 0x77, 0x1f, 0x3a, 0xeb,
-            0xb5, 0xe4, 0xf5, 0x9d, 0xc7, 0x37, 0x86, 0xb2,
-            0x12, 0x46, 0x34, 0x19, 0x72, 0x8c, 0xf5, 0x8c,
-            0xf6, 0x78, 0x98, 0xe0, 0x7c, 0xd3, 0xf4
-        },
-        "id-Gost28147-89-CryptoPro-B-ParamSet",
-        "testcfb2",
-        {
-            0x48, 0x0c, 0x74, 0x1b, 0x02, 0x6b, 0x55, 0xd5,
-            0xb6, 0x6d, 0xd7, 0x1d, 0x40, 0x48, 0x05, 0x6b,
-            0x6d, 0xeb, 0x3c, 0x29, 0x0f, 0x84, 0x80, 0x23,
-            0xee, 0x0d, 0x47, 0x77, 0xe3, 0xfe, 0x61, 0xc9
-        },
-        G89_CFB,
-        {
-            0x1f, 0x3f, 0x82, 0x1e, 0x0d, 0xd8, 0x1e, 0x22
-        },
-        {
-            0x23, 0xc6, 0x7f, 0x20, 0xa1, 0x23, 0x58, 0xbc,
-            0x7b, 0x05, 0xdb, 0x21, 0x15, 0xcf, 0x96, 0x41,
-            0xc7, 0x88, 0xef, 0x76, 0x5c, 0x49, 0xdb, 0x42,
-            0xbf, 0xf3, 0xc0, 0xf5, 0xbd, 0x5d, 0xd9, 0x8e,
-            0xaf, 0x3d, 0xf4, 0xe4, 0xda, 0x88, 0xbd, 0xbc,
-            0x47, 0x5d, 0x76, 0x07, 0xc9, 0x5f, 0x54, 0x1d,
-            0x1d, 0x6a, 0xa1, 0x2e, 0x18, 0xd6, 0x60, 0x84,
-            0x02, 0x18, 0x37, 0x92, 0x92, 0x15, 0xab, 0x21,
-            0xee, 0x21, 0xcc, 0x71, 0x6e, 0x51, 0xd9, 0x2b,
-            0xcc, 0x81, 0x97, 0x3f, 0xeb, 0x45, 0x99, 0xb8,
-            0x1b, 0xda, 0xff, 0x90, 0xd3, 0x41, 0x06, 0x9c,
-            0x3f, 0xfb, 0xe4, 0xb2, 0xdc, 0xc9, 0x03, 0x0d,
-            0xa7, 0xae, 0xd7, 0x7d, 0x02, 0xb8, 0x32, 0xab,
-            0xf3, 0x65, 0xa3, 0x65, 0x6c, 0x4e, 0xe4, 0xa2,
-            0x5e, 0x9e, 0xee, 0xcd, 0xde, 0x79, 0x36, 0x6b,
-            0x1b, 0xe1, 0x3c, 0xdf, 0x10, 0xad, 0x4f, 0x02,
-            0xe1, 0x14, 0xaa, 0x09, 0xb4, 0x0b, 0x76, 0xeb,
-            0x69, 0x38, 0x20, 0x02, 0xcb, 0x8e, 0xc0, 0xdf,
-            0xca, 0x48, 0x74, 0xc3, 0x31, 0xad, 0x42, 0x2c,
-            0x51, 0x9b, 0xd0, 0x6a, 0xc1, 0x36, 0xd7, 0x21,
-            0xdf, 0xb0, 0x45, 0xba, 0xca, 0x7f, 0x35, 0x20,
-            0x28, 0xbb, 0xc1, 0x76, 0xfd, 0x43, 0x5d, 0x23,
-            0x7d, 0x31, 0x84, 0x1a, 0x97, 0x4d, 0x83, 0xaa,
-            0x7e, 0xf1, 0xc4, 0xe6, 0x83, 0xac, 0x0d, 0xef,
-            0xef, 0x3c, 0xa4, 0x7c, 0x48, 0xe4, 0xc8, 0xca,
-            0x0d, 0x7d, 0xea, 0x7c, 0x45, 0xd7, 0x73, 0x50,
-            0x25, 0x1d, 0x01, 0xc4, 0x02, 0x1a, 0xcd, 0xe0,
-            0x38, 0x5b, 0xa8, 0x5a, 0x16, 0x9a, 0x10, 0x59,
-            0x74, 0xd7, 0x19, 0xc6, 0xf3, 0xb5, 0x17, 0xf6,
-            0x59, 0x8d, 0x62, 0xaf, 0x44, 0xe8, 0xdc, 0xe9,
-            0xc1, 0x76, 0xf1, 0xd0, 0xbd, 0x29, 0xd7, 0xec,
-            0x1d, 0xac, 0x57, 0xdb, 0x1a, 0x3f, 0xd8, 0xf6,
-            0x6e, 0xb6, 0xe6, 0xdf, 0x36, 0xe7, 0x89, 0xce,
-            0x56, 0x35, 0x43, 0x1c, 0x7d, 0x57, 0x79, 0x0e,
-            0xd8, 0xf4, 0xd7, 0xa7, 0x0d, 0xc6, 0x8f, 0x91,
-            0x66, 0x67, 0x82, 0x0f, 0x49, 0xc9, 0xc5, 0x65,
-            0x81, 0xa1, 0x39, 0x5a, 0x53, 0x9f, 0x02, 0xa5,
-            0xd5, 0x36, 0x22, 0xa8, 0xa8, 0x1c, 0x37, 0x0e,
-            0x76, 0x46, 0xdf, 0xbd, 0x6a, 0xdb, 0xfc, 0x1b,
-            0xbd, 0x10, 0xb8, 0xb1, 0xbc, 0x72, 0x4c, 0x58,
-            0x4a, 0xda, 0x6d, 0x66, 0x00, 0xda, 0x7a, 0x66,
-            0xa0, 0xe7, 0x3b, 0x39, 0xa3, 0xf7, 0x05, 0x07,
-            0xfa, 0x21, 0x4b, 0xc7, 0x94, 0xc0, 0xd3, 0x7b,
-            0x19, 0x02, 0x5d, 0x4a, 0x10, 0xf1, 0xc2, 0x0f,
-            0x19, 0x68, 0x27, 0xc7, 0x7d, 0xbf, 0x55, 0x03,
-            0x57, 0x7d, 0xaf, 0x77, 0xae, 0x80, 0x2f, 0x7a,
-            0xe6, 0x1f, 0x4b, 0xdc, 0x15, 0x18, 0xc0, 0x62,
-            0xa1, 0xe8, 0xd9, 0x1c, 0x9e, 0x8c, 0x96, 0x39,
-            0xc1, 0xc4, 0x88, 0xf7, 0x0c, 0xe1, 0x04, 0x84,
-            0x68, 0x51, 0xce, 0xf1, 0x90, 0xda, 0x7f, 0x76,
-            0xc8, 0xc0, 0x88, 0xef, 0x8e, 0x15, 0x25, 0x3e,
-            0x7b, 0xe4, 0x79, 0xb5, 0x66, 0x2d, 0x9c, 0xd1,
-            0x13, 0xda, 0xd0, 0xd5, 0x46, 0xd5, 0x8d, 0x46,
-            0x18, 0x07, 0xee, 0xd8, 0xc9, 0x64, 0xe3, 0xbe,
-            0x0e, 0x68, 0x27, 0x09, 0x96, 0x26, 0xf6, 0xe2,
-            0x19, 0x61, 0x3f, 0xf4, 0x58, 0x27, 0x0a, 0xeb,
-            0xce, 0x7c, 0xb6, 0x68, 0x92, 0xe7, 0x12, 0x3b,
-            0x31, 0xd4, 0x48, 0xdf, 0x35, 0x8d, 0xf4, 0x86,
-            0x42, 0x2a, 0x15, 0x4b, 0xe8, 0x19, 0x1f, 0x26,
-            0x65, 0x9b, 0xa8, 0xda, 0x4b, 0x79, 0x1f, 0x8e,
-            0xe6, 0x13, 0x7e, 0x49, 0x8f, 0xc1, 0xce, 0xdc,
-            0x5e, 0x64, 0x74, 0xce, 0x02, 0x78, 0xe0, 0xcf,
-            0xa0, 0xed, 0x5e, 0x31, 0x74, 0xd1, 0xd0, 0xb4,
-            0xee, 0x70, 0x19, 0x14, 0x3c, 0x8f, 0x16, 0xa6,
-            0xcf, 0x12, 0x93, 0x15, 0x88, 0xeb, 0x91, 0x65,
-            0x76, 0x98, 0xfd, 0xa1, 0x94, 0x30, 0xba, 0x43,
-            0x62, 0x65, 0x40, 0x04, 0x77, 0x9e, 0xd6, 0xab,
-            0x8b, 0x0d, 0x93, 0x80, 0x50, 0x5f, 0xa2, 0x76,
-            0x20, 0xa7, 0xd6, 0x9c, 0x27, 0x15, 0x27, 0xbc,
-            0xa5, 0x5a, 0xbf, 0xe9, 0x92, 0x82, 0x05, 0xa8,
-            0x41, 0xe9, 0xb5, 0x60, 0xd5, 0xc0, 0xd7, 0x4b,
-            0xad, 0x38, 0xb2, 0xe9, 0xd1, 0xe5, 0x51, 0x5f,
-            0x24, 0x78, 0x24, 0x9a, 0x23, 0xd2, 0xc2, 0x48,
-            0xbd, 0x0e, 0xf1, 0x37, 0x72, 0x91, 0x87, 0xb0,
-            0x4e, 0xbd, 0x99, 0x6b, 0x2c, 0x01, 0xb6, 0x79,
-            0x69, 0xec, 0x0c, 0xed, 0xe5, 0x3f, 0x50, 0x64,
-            0x7c, 0xb9, 0xdd, 0xe1, 0x92, 0x81, 0xb5, 0xd0,
-            0xcb, 0x17, 0x83, 0x86, 0x8b, 0xea, 0x4f, 0x93,
-            0x08, 0xbc, 0x22, 0x0c, 0xef, 0xe8, 0x0d, 0xf5,
-            0x9e, 0x23, 0xe1, 0xf9, 0xb7, 0x6b, 0x45, 0x0b,
-            0xcb, 0xa9, 0xb6, 0x4d, 0x28, 0x25, 0xba, 0x3e,
-            0x86, 0xf2, 0x75, 0x47, 0x5d, 0x9d, 0x6b, 0xf6,
-            0x8a, 0x05, 0x58, 0x73, 0x3d, 0x00, 0xde, 0xfd,
-            0x69, 0xb1, 0x61, 0x16, 0xf5, 0x2e, 0xb0, 0x9f,
-            0x31, 0x6a, 0x00, 0xb9, 0xef, 0x71, 0x63, 0x47,
-            0xa3, 0xca, 0xe0, 0x40, 0xa8, 0x7e, 0x02, 0x04,
-            0xfe, 0xe5, 0xce, 0x48, 0x73, 0xe3, 0x94, 0xcf,
-            0xe2, 0xff, 0x29, 0x7e, 0xf6, 0x32, 0xbb, 0xb7,
-            0x55, 0x12, 0x21, 0x7a, 0x9c, 0x75, 0x04, 0x0c,
-            0xb4, 0x7c, 0xb0, 0x3d, 0x40, 0xb3, 0x11, 0x9a,
-            0x7a, 0x9a, 0x13, 0xfb, 0x77, 0xa7, 0x51, 0x68,
-            0xf7, 0x05, 0x47, 0x3b, 0x0f, 0x52, 0x5c, 0xe6,
-            0xc2, 0x99, 0x3a, 0x37, 0x54, 0x5c, 0x4f, 0x2b,
-            0xa7, 0x01, 0x08, 0x74, 0xbc, 0x91, 0xe3, 0xe2,
-            0xfe, 0x65, 0x94, 0xfd, 0x3d, 0x18, 0xe0, 0xf0,
-            0x62, 0xed, 0xc2, 0x10, 0x82, 0x9c, 0x58, 0x7f,
-            0xb2, 0xa3, 0x87, 0x8a, 0x74, 0xd9, 0xc1, 0xfb,
-            0x84, 0x28, 0x17, 0xc7, 0x2b, 0xcb, 0x53, 0x1f,
-            0x4e, 0x8a, 0x82, 0xfc, 0xb4, 0x3f, 0xc1, 0x47,
-            0x25, 0xf3, 0x21, 0xdc, 0x4c, 0x2d, 0x08, 0xfa,
-            0xe7, 0x0f, 0x03, 0xa9, 0x68, 0xde, 0x6b, 0x41,
-            0xa0, 0xf9, 0x41, 0x6c, 0x57, 0x4d, 0x3a, 0x0e,
-            0xea, 0x51, 0xca, 0x9f, 0x97, 0x11, 0x7d, 0xf6,
-            0x8e, 0x88, 0x63, 0x67, 0xc9, 0x65, 0x13, 0xca,
-            0x38, 0xed, 0x35, 0xbe, 0xf4, 0x27, 0xa9, 0xfc,
-            0xa9, 0xe6, 0xc3, 0x40, 0x86, 0x08, 0x39, 0x72,
-            0x37, 0xee, 0xb2, 0x87, 0x09, 0x96, 0xb7, 0x40,
-            0x87, 0x36, 0x92, 0xc1, 0x5d, 0x6a, 0x2c, 0x43,
-            0xca, 0x25, 0xc8, 0x35, 0x37, 0x2d, 0xb5, 0xa9,
-            0x27, 0x44, 0x50, 0xf2, 0x6d, 0x22, 0x75, 0x41,
-            0x77, 0x2a, 0xdb, 0xb1, 0x8c, 0x6d, 0x05, 0xe8,
-            0xc9, 0x99, 0xc7, 0x08, 0xf9, 0x14, 0x8f, 0x78,
-            0xa9, 0x8f, 0xc2, 0x5a, 0x7a, 0x65, 0xc5, 0xd8,
-            0x86, 0xbb, 0x72, 0x69, 0x6b, 0x6b, 0x45, 0x83,
-            0x5b, 0xb1, 0xf7, 0xcd, 0x16, 0x73, 0xee, 0xe9,
-            0x80, 0x85, 0xfe, 0x8e, 0xe1, 0xae, 0x53, 0x8f,
-            0xde, 0xbe, 0x48, 0x8b, 0x59, 0xef, 0xf6, 0x7e,
-            0xd8, 0xb5, 0xa8, 0x47, 0xc0, 0x4e, 0x15, 0x58,
-            0xca, 0xd3, 0x2f, 0xf8, 0x6c, 0xa6, 0x3d, 0x78,
-            0x4d, 0x7a, 0x54, 0xd6, 0x10, 0xe5, 0xcc, 0x05,
-            0xe2, 0x29, 0xb5, 0x86, 0x07, 0x39, 0x7d, 0x78,
-            0x8e, 0x5a, 0x8f, 0x83, 0x4c, 0xe7, 0x3d, 0x68,
-            0x3e, 0xe5, 0x02, 0xe6, 0x64, 0x4f, 0x5e, 0xb4,
-            0x49, 0x77, 0xf0, 0xc0, 0xfa, 0x6f, 0xc8, 0xfb,
-            0x9f, 0x84, 0x6f, 0x55, 0xfb, 0x30, 0x5e, 0x89,
-            0x93, 0xa9, 0xf3, 0xa6, 0xa3, 0xd7, 0x26, 0xbb,
-            0xd8, 0xa8, 0xd9, 0x95, 0x1d, 0xfe, 0xfc, 0xd7,
-            0xa8, 0x93, 0x66, 0x2f, 0x04, 0x53, 0x06, 0x64,
-            0x7f, 0x31, 0x29, 0xae, 0xb7, 0x9f, 0xba, 0xc4,
-            0x6d, 0x68, 0xd1, 0x24, 0x32, 0xf4, 0x11
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        4,
-        {
-            0x07, 0x9c, 0x91, 0xbe
-        },
-        "id-Gost28147-89-CryptoPro-C-ParamSet",
-        "testcfb3",
-        {
-            0x77, 0xc3, 0x45, 0x8e, 0xf6, 0x42, 0xe7, 0x04,
-            0x8e, 0xfc, 0x08, 0xe4, 0x70, 0x96, 0xd6, 0x05,
-            0x93, 0x59, 0x02, 0x6d, 0x6f, 0x97, 0xca, 0xe9,
-            0xcf, 0x89, 0x44, 0x4b, 0xde, 0x6c, 0x22, 0x1d
-        },
-        G89_CFB,
-        {
-            0x43, 0x7c, 0x3e, 0x8e, 0x2f, 0x2a, 0x00, 0x98
-        },
-        {
-            0x19, 0x35, 0x81, 0x34
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        9,
-        {
-            0x2f, 0x31, 0xd8, 0x83, 0xb4, 0x20, 0xe8, 0x6e,
-            0xda
-        },
-        "id-Gost28147-89-CryptoPro-D-ParamSet",
-        "testcfb4",
-        {
-            0x38, 0x9f, 0xe8, 0x37, 0xff, 0x9c, 0x5d, 0x29,
-            0xfc, 0x48, 0x55, 0xa0, 0x87, 0xea, 0xe8, 0x40,
-            0x20, 0x87, 0x5b, 0xb2, 0x01, 0x15, 0x55, 0xa7,
-            0xe3, 0x2d, 0xcb, 0x3d, 0xd6, 0x59, 0x04, 0x73
-        },
-        G89_CFB,
-        {
-            0xc5, 0xa2, 0xd2, 0x1f, 0x2f, 0xdf, 0xb8, 0xeb
-        },
-        {
-            0x6d, 0xa4, 0xed, 0x40, 0x08, 0x88, 0x71, 0xad,
-            0x16
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        5242880+8, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test5Mcfb",
-        {
-            0x61, 0x58, 0x44, 0x5a, 0x41, 0xf6, 0xc7, 0x0f,
-            0x6b, 0xdb, 0x51, 0x91, 0x6a, 0xf6, 0x81, 0x30,
-            0x8c, 0xa7, 0x98, 0xdd, 0x38, 0x35, 0x8a, 0x60,
-            0x85, 0xb4, 0xf0, 0xf9, 0x43, 0xa2, 0x7d, 0x9a
-        },
-        G89_CFB,
-        { 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        },
-        {
-            0x1c, 0x16, 0xa0, 0xe9, 0x63, 0x94, 0xfe, 0x38,
-            0x37, 0xa7, 0x9b, 0x70, 0x25, 0x2e, 0xd6, 0x00
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        U64(4294967296)+16, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test4Gcfb",
-        {
-            0xae, 0x57, 0xa2, 0xdd, 0xa4, 0xef, 0x4f, 0x96,
-            0xb8, 0x94, 0xa5, 0xd1, 0x1b, 0xc8, 0x9b, 0x42,
-            0xa5, 0x24, 0xcc, 0x89, 0x5c, 0xb8, 0x92, 0x52,
-            0xc1, 0x12, 0x6a, 0xb0, 0x9a, 0x26, 0xe8, 0x06
-        },
-        G89_CFB,
-        { 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        },
-        {
-            0x2e, 0x62, 0xb0, 0x2e, 0xc7, 0x87, 0x4b, 0x29, 
-            0x33, 0x16, 0x6b, 0xb4, 0xd6, 0x61, 0x66, 0xd9
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        1037,
-        {
-            0x3d, 0x0b, 0x69, 0xf7, 0xa8, 0xe4, 0xfc, 0x99,
-            0x22, 0x2e, 0xee, 0xd1, 0x63, 0x12, 0xfe, 0xa8,
-            0x9d, 0xcb, 0x6c, 0x4d, 0x48, 0x8c, 0xe8, 0xbd,
-            0x8b, 0x60, 0xf1, 0xbf, 0x7b, 0xe3, 0x79, 0xd5,
-            0x2b, 0x25, 0x97, 0x13, 0xef, 0x35, 0xda, 0xf4,
-            0xbc, 0x77, 0xce, 0xea, 0xe9, 0x3f, 0xa4, 0xb6,
-            0x01, 0xd5, 0x73, 0x29, 0x58, 0xda, 0xd7, 0x67,
-            0x17, 0xac, 0xe4, 0x75, 0x2f, 0x57, 0x23, 0xac,
-            0x96, 0x21, 0xc7, 0x62, 0x2d, 0xf7, 0x32, 0xb5,
-            0x44, 0x5f, 0x72, 0xb1, 0x5f, 0xba, 0x1b, 0x1e,
-            0xdb, 0x4a, 0x09, 0x8c, 0x92, 0x61, 0xa2, 0xb0,
-            0x49, 0x68, 0xe5, 0xb3, 0xa2, 0x8f, 0x13, 0x4b,
-            0xf5, 0x4d, 0x84, 0xda, 0xab, 0xa0, 0xb6, 0xd1,
-            0x5a, 0x63, 0x19, 0xe8, 0xa2, 0x09, 0xf6, 0x76,
-            0x6f, 0x9b, 0x48, 0x0a, 0x15, 0x5d, 0xb7, 0x20,
-            0x21, 0x9a, 0x2e, 0xb9, 0x6d, 0xfa, 0x1e, 0xc2,
-            0x0e, 0xef, 0x15, 0xab, 0x59, 0x01, 0xfe, 0x43,
-            0x90, 0xf2, 0x62, 0xca, 0x4a, 0x9a, 0x48, 0x38,
-            0xab, 0x6f, 0x9d, 0x21, 0xb3, 0xad, 0xa7, 0x60,
-            0x46, 0xe3, 0xef, 0xd0, 0xe3, 0x1d, 0xc5, 0xe1,
-            0xb8, 0xa1, 0xe2, 0x99, 0x20, 0xc5, 0x76, 0xcc,
-            0xaa, 0x8a, 0xa9, 0x45, 0x55, 0xa0, 0x78, 0x00,
-            0x64, 0xde, 0xcf, 0x5b, 0xdf, 0x26, 0x48, 0xcd,
-            0xba, 0x8a, 0xb5, 0xfb, 0xfd, 0x4a, 0xd5, 0xc4,
-            0xe0, 0x43, 0xa6, 0x71, 0x90, 0xa4, 0x8b, 0xca,
-            0x2e, 0x88, 0x7b, 0xac, 0xb2, 0xdc, 0xf2, 0x01,
-            0xcb, 0xda, 0x6e, 0x91, 0x27, 0x28, 0x44, 0x88,
-            0x9a, 0xd2, 0x12, 0xf1, 0xa6, 0xf5, 0xb7, 0x61,
-            0xce, 0x79, 0x62, 0x52, 0x3c, 0xe6, 0x14, 0x73,
-            0xd1, 0x41, 0x92, 0x50, 0xbd, 0xdc, 0x3b, 0xd0,
-            0xa7, 0x11, 0x8c, 0x3a, 0xe4, 0x2d, 0xf2, 0x52,
-            0xd3, 0x2f, 0x7c, 0x8e, 0x54, 0x90, 0x4e, 0x23,
-            0xae, 0xb3, 0xa0, 0xf3, 0x25, 0x7e, 0x66, 0xaa,
-            0x0f, 0x6f, 0x81, 0x72, 0x77, 0xbb, 0xd3, 0x47,
-            0xe8, 0x05, 0xff, 0xe1, 0x5b, 0xc9, 0x37, 0x50,
-            0x33, 0x49, 0x17, 0xaf, 0xab, 0x1d, 0xe1, 0x15,
-            0xf2, 0xe5, 0x98, 0x5e, 0x2d, 0x05, 0x1f, 0x0d,
-            0x55, 0x97, 0xed, 0xff, 0x5e, 0xe0, 0x0f, 0xc3,
-            0x9c, 0xbd, 0x82, 0xc2, 0x06, 0xbe, 0x45, 0x66,
-            0xae, 0x33, 0xbe, 0x28, 0x48, 0xe9, 0x2d, 0x1a,
-            0xe6, 0x65, 0x8e, 0xdf, 0x76, 0x03, 0x73, 0x4b,
-            0xc0, 0x80, 0x71, 0xf9, 0xac, 0xba, 0xa0, 0xb0,
-            0x19, 0x1a, 0x0a, 0xd4, 0x35, 0x12, 0x88, 0x76,
-            0x05, 0x75, 0x8f, 0x7c, 0xb5, 0xf0, 0x19, 0x75,
-            0x6d, 0x05, 0xcb, 0x0d, 0xbc, 0x8d, 0xe9, 0xf0,
-            0xd4, 0xdb, 0x3c, 0x3c, 0x29, 0x8e, 0x2c, 0x32,
-            0x1d, 0xf7, 0xb6, 0x49, 0xcf, 0xdb, 0x63, 0xee,
-            0x3c, 0xfa, 0x33, 0x73, 0x6f, 0xe4, 0x97, 0x4e,
-            0x2f, 0xc9, 0x4c, 0x5c, 0x65, 0xfe, 0xea, 0xfb,
-            0xc6, 0xdd, 0xc1, 0x1c, 0x47, 0x3f, 0xf4, 0x50,
-            0x2f, 0xde, 0x1b, 0x5b, 0x0b, 0x16, 0xca, 0xb6,
-            0x46, 0x44, 0xf2, 0xc1, 0x0d, 0xa1, 0x1d, 0xa6,
-            0xdb, 0xf0, 0x3d, 0xb1, 0x6c, 0x05, 0x31, 0x85,
-            0x8e, 0x74, 0xae, 0xf2, 0x39, 0x26, 0xf7, 0xc1,
-            0xe7, 0x4c, 0xdd, 0x9d, 0x40, 0xb8, 0xf3, 0xc5,
-            0xc2, 0x16, 0x64, 0x6b, 0xaa, 0xdb, 0x4b, 0x82,
-            0x5c, 0xd3, 0x02, 0xd3, 0x8f, 0x26, 0x79, 0x8d,
-            0xb0, 0x78, 0x70, 0x19, 0x58, 0x0c, 0xb4, 0x31,
-            0x88, 0x44, 0x1c, 0x91, 0x6f, 0xf4, 0x52, 0x39,
-            0xa8, 0xf5, 0xc0, 0x1b, 0xfe, 0xf2, 0x0e, 0x4b,
-            0xac, 0x0a, 0xc2, 0x7e, 0x9c, 0x9b, 0xeb, 0x5d,
-            0x4e, 0x4f, 0x42, 0xd8, 0x71, 0x0a, 0x97, 0x27,
-            0x03, 0x14, 0x96, 0xa6, 0x3d, 0x04, 0xea, 0x9f,
-            0x14, 0x14, 0x27, 0x4c, 0xd9, 0xa2, 0x89, 0x5f,
-            0x65, 0x4a, 0xe1, 0x9d, 0x2c, 0xb8, 0xf8, 0xd4,
-            0x8f, 0x2a, 0x57, 0x36, 0xcc, 0x06, 0x9c, 0x2c,
-            0xc5, 0x13, 0x16, 0xdf, 0xfc, 0xae, 0x22, 0x16,
-            0xa8, 0x2b, 0x71, 0x6f, 0x1d, 0xb3, 0x47, 0x54,
-            0x3f, 0x2d, 0x0a, 0x68, 0x9f, 0x2e, 0xf6, 0x90,
-            0xd8, 0xa1, 0x21, 0x09, 0xd4, 0x97, 0xb9, 0x7b,
-            0x7f, 0x9b, 0x6a, 0xed, 0xd1, 0xf0, 0xe3, 0xb6,
-            0x28, 0xc7, 0x62, 0x82, 0x00, 0xc9, 0x38, 0xa1,
-            0x82, 0x78, 0xce, 0x87, 0xc8, 0x53, 0xac, 0x4f,
-            0x2e, 0x31, 0xb9, 0x50, 0x7f, 0x36, 0x00, 0x4a,
-            0x32, 0xe6, 0xd8, 0xbb, 0x59, 0x45, 0x0e, 0x91,
-            0x1b, 0x38, 0xa9, 0xbc, 0xb9, 0x5e, 0x6c, 0x6a,
-            0x9c, 0x03, 0x01, 0x1c, 0xde, 0xe8, 0x1f, 0x1e,
-            0xe3, 0xde, 0x25, 0xa2, 0x56, 0x79, 0xe1, 0xbd,
-            0x58, 0xc4, 0x93, 0xe6, 0xd0, 0x8a, 0x4d, 0x08,
-            0xab, 0xf7, 0xaa, 0xc3, 0x7d, 0xc1, 0xee, 0x68,
-            0x37, 0xbc, 0x78, 0x0b, 0x19, 0x68, 0x2b, 0x2b,
-            0x2e, 0x6d, 0xc4, 0x6f, 0xaa, 0x3b, 0xc6, 0x19,
-            0xcb, 0xf1, 0x58, 0xb9, 0x60, 0x85, 0x45, 0xae,
-            0x52, 0x97, 0xba, 0x24, 0x32, 0x13, 0x72, 0x16,
-            0x6e, 0x7b, 0xc1, 0x98, 0xac, 0xb1, 0xed, 0xb4,
-            0xcc, 0x6c, 0xcf, 0x45, 0xfc, 0x50, 0x89, 0x80,
-            0x8e, 0x7a, 0xa4, 0xd3, 0x64, 0x50, 0x63, 0x37,
-            0xc9, 0x6c, 0xf1, 0xc4, 0x3d, 0xfb, 0xde, 0x5a,
-            0x5c, 0xa8, 0x21, 0x35, 0xe6, 0x2e, 0x8c, 0x2a,
-            0x3c, 0x12, 0x17, 0x79, 0x9a, 0x0d, 0x2e, 0x79,
-            0xeb, 0x67, 0x1f, 0x2b, 0xf8, 0x6e, 0xca, 0xc1,
-            0xfa, 0x45, 0x18, 0x9e, 0xdf, 0x6a, 0xe6, 0xcb,
-            0xe9, 0x5c, 0xc3, 0x09, 0xaf, 0x93, 0x58, 0x13,
-            0xbf, 0x90, 0x84, 0x87, 0x75, 0xd6, 0x82, 0x28,
-            0x8d, 0xe7, 0x2f, 0xa3, 0xfb, 0x97, 0x74, 0x2a,
-            0x73, 0x04, 0x82, 0x06, 0x76, 0x69, 0xb1, 0x0b,
-            0x19, 0xfc, 0xae, 0xb3, 0xdd, 0x2a, 0xe5, 0xc1,
-            0x05, 0xd8, 0x80, 0x95, 0x22, 0x90, 0x71, 0xfc,
-            0xc2, 0x92, 0x42, 0xfd, 0xf1, 0x70, 0xb4, 0x68,
-            0x88, 0xa4, 0x9e, 0x0a, 0x24, 0x40, 0x13, 0xc8,
-            0xa2, 0x56, 0x4f, 0x39, 0xe6, 0x06, 0xf1, 0xdc,
-            0xf5, 0x13, 0x0e, 0xad, 0x9c, 0x8b, 0xaf, 0xe9,
-            0xe3, 0x88, 0x72, 0xff, 0xa0, 0x6d, 0xda, 0x08,
-            0x70, 0xb9, 0x2e, 0x83, 0xc5, 0xbb, 0x32, 0xa5,
-            0x74, 0xc7, 0xfb, 0x7b, 0x76, 0xaf, 0x02, 0xbb,
-            0x2b, 0xb8, 0x5e, 0x65, 0x02, 0xfe, 0x0e, 0xa0,
-            0x99, 0xce, 0x01, 0x3b, 0x35, 0xe1, 0xb0, 0x22,
-            0xe5, 0x94, 0xbd, 0xdd, 0x8e, 0xbb, 0xf6, 0x75,
-            0xbf, 0xbf, 0xee, 0x7a, 0xb1, 0x58, 0xb4, 0x81,
-            0xb8, 0x39, 0x3e, 0xb6, 0x1e, 0xde, 0xda, 0x1b,
-            0xd5, 0xf7, 0xdd, 0x7d, 0x65, 0x9c, 0xaa, 0x56,
-            0x93, 0xb8, 0xaf, 0x48, 0x53, 0xc7, 0x22, 0xe4,
-            0x1c, 0xdf, 0xe9, 0x79, 0xb4, 0x20, 0x89, 0xcc,
-            0x2a, 0x79, 0x2c, 0x09, 0xbe, 0x78, 0xcf, 0xcc,
-            0xf2, 0x90, 0xd6, 0x65, 0xc5, 0x29, 0xfc, 0xda,
-            0x69, 0xfc, 0xc0, 0xd6, 0x70, 0x99, 0x61, 0x3f,
-            0x60, 0x02, 0xd8, 0x12, 0x22, 0xc8, 0x34, 0xc6,
-            0x3b, 0xb3, 0xc2, 0x33, 0xa1, 0x5c, 0x8f, 0x4c,
-            0xd1, 0x52, 0x72, 0xf2, 0x42, 0x05, 0x8e, 0x18,
-            0x1f, 0x16, 0xda, 0xb8, 0x53, 0xa1, 0x5f, 0x01,
-            0x32, 0x1b, 0x90, 0xb3, 0x53, 0x9b, 0xd0, 0x85,
-            0x61, 0x2d, 0x17, 0xed, 0x0a, 0xa4, 0xa5, 0x27,
-            0x09, 0x75, 0x7c, 0xbc, 0x30, 0xf7, 0x5e, 0x59,
-            0x9a, 0x07, 0x96, 0x84, 0x28, 0x86, 0x4b, 0xa7,
-            0x22, 0x35, 0x28, 0xc7, 0xed, 0x0d, 0xc3, 0xce,
-            0x98, 0xcc, 0x2d, 0xec, 0xd4, 0x98, 0x09, 0x8e,
-            0x52, 0x5f, 0x2b, 0x9a, 0x13, 0xbe, 0x99, 0x16,
-            0x73, 0xd1, 0x1f, 0x81, 0xe5, 0xa2, 0x08, 0x78,
-            0xcb, 0x0c, 0x20, 0xd4, 0xa5, 0xea, 0x4b, 0x5b,
-            0x95, 0x5a, 0x92, 0x9a, 0x52
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testcnt2",
-        {
-            0x1b, 0x5d, 0xdb, 0x77, 0xcf, 0xf9, 0xec, 0x95,
-            0x5e, 0xcc, 0x67, 0x9f, 0x5d, 0x28, 0xad, 0x4a,
-            0x27, 0xf4, 0x32, 0xc6, 0xb2, 0xcb, 0xb1, 0x45,
-            0x6a, 0x88, 0x14, 0x0c, 0x9b, 0x9b, 0x5f, 0x48
-        },
-        G89_CNT,
-        {
-            0x71, 0x58, 0x8c, 0xe1, 0x55, 0xf4, 0xf6, 0xb3
-        },
-        {
-            0x8e, 0xcd, 0x8f, 0xc8, 0xac, 0xe1, 0x15, 0x48,
-            0x2d, 0xae, 0x24, 0x8a, 0xc7, 0xfb, 0xba, 0x0f,
-            0x1d, 0x8a, 0x95, 0xa2, 0x43, 0xef, 0xcb, 0xdc,
-            0x59, 0x57, 0xa7, 0xc7, 0x0e, 0xe3, 0xe2, 0xb9,
-            0x0d, 0x86, 0x29, 0x62, 0xcb, 0x83, 0x4d, 0x07,
-            0x0c, 0x40, 0xd4, 0x7b, 0x2e, 0xca, 0xba, 0xbf,
-            0x4a, 0x60, 0x3b, 0x31, 0x98, 0xc8, 0x88, 0x47,
-            0xd9, 0x82, 0xab, 0xfc, 0x8f, 0x48, 0xe2, 0x46,
-            0xab, 0xd3, 0xa1, 0xab, 0x8a, 0x05, 0x22, 0x8c,
-            0xf4, 0xec, 0x9a, 0x1e, 0x76, 0xab, 0x1a, 0x60,
-            0xd9, 0x25, 0x6b, 0xb8, 0x56, 0xe5, 0xb2, 0xea,
-            0x10, 0xf3, 0x62, 0x04, 0x32, 0x5e, 0xaa, 0x3b,
-            0x7b, 0x57, 0xbc, 0x3b, 0x8b, 0x43, 0x47, 0xf2,
-            0xd5, 0x03, 0x7e, 0x51, 0x01, 0xff, 0x77, 0x28,
-            0xca, 0x90, 0xa3, 0xfe, 0x7e, 0x2e, 0x70, 0x16,
-            0x75, 0x18, 0x44, 0xf0, 0x1b, 0x85, 0x05, 0xea,
-            0xe3, 0x21, 0xf7, 0x26, 0x86, 0x76, 0x3c, 0x67,
-            0x9d, 0xfc, 0xbc, 0x10, 0x7f, 0x77, 0xe4, 0xed,
-            0xd3, 0x12, 0xf8, 0x83, 0x00, 0x1f, 0x4b, 0x92,
-            0x95, 0x92, 0x5c, 0xf3, 0x5a, 0xf3, 0xb7, 0xd0,
-            0xa9, 0x5f, 0xf2, 0x18, 0xc4, 0x66, 0x62, 0xc1,
-            0x84, 0x0e, 0x66, 0xe8, 0x80, 0x7d, 0x1f, 0xf0,
-            0xba, 0x01, 0x9b, 0x71, 0xae, 0x93, 0xcc, 0x27,
-            0x54, 0x34, 0x9a, 0xbd, 0xca, 0xee, 0x52, 0x09,
-            0x92, 0x9d, 0xb0, 0xd5, 0xd9, 0xba, 0x2f, 0xb9,
-            0x96, 0xdc, 0xfa, 0xbd, 0xce, 0xea, 0x1a, 0x7b,
-            0x9a, 0x1d, 0x13, 0xa7, 0x11, 0xe2, 0x9a, 0x64,
-            0xf6, 0xd3, 0xee, 0xc6, 0x33, 0xb7, 0x6e, 0xef,
-            0x25, 0x9e, 0x1e, 0x7c, 0xe3, 0x1f, 0x2c, 0x6e,
-            0xa9, 0xc0, 0xf8, 0xc1, 0xbf, 0x3b, 0xf8, 0x34,
-            0x03, 0x9b, 0xa1, 0x40, 0x5b, 0x0c, 0x3c, 0x09,
-            0x66, 0x9d, 0x63, 0xe2, 0xe2, 0x04, 0x8f, 0x06,
-            0x84, 0x74, 0x68, 0xb2, 0x5c, 0x3b, 0x4c, 0xad,
-            0x0b, 0x3f, 0x03, 0xb3, 0x07, 0x8a, 0x64, 0xa7,
-            0x36, 0x56, 0x26, 0x39, 0x66, 0xda, 0xe9, 0x6d,
-            0x1b, 0xd5, 0x88, 0xe8, 0x5c, 0xaf, 0x5a, 0x4c,
-            0x49, 0xf7, 0xf5, 0xb7, 0x78, 0xf0, 0xde, 0xec,
-            0xcd, 0x16, 0x23, 0x9e, 0x8c, 0x13, 0xbe, 0x6b,
-            0x6f, 0x9b, 0x07, 0xe5, 0xbb, 0xcc, 0x3a, 0x1b,
-            0x6f, 0x43, 0xdf, 0xff, 0x46, 0x2a, 0xae, 0x47,
-            0x19, 0x18, 0x9a, 0x25, 0x09, 0xc9, 0x24, 0x40,
-            0x0c, 0x4b, 0xa7, 0xda, 0x5e, 0x0d, 0xee, 0xfa,
-            0x62, 0x45, 0x8e, 0xcc, 0x2f, 0x23, 0x08, 0x1d,
-            0x92, 0xf0, 0xfe, 0x82, 0x0f, 0xd7, 0x11, 0x60,
-            0x7e, 0x0b, 0x0b, 0x75, 0xf4, 0xf5, 0x3b, 0xc0,
-            0xa4, 0xe8, 0x72, 0xa5, 0xb6, 0xfa, 0x5a, 0xad,
-            0x5a, 0x4f, 0x39, 0xb5, 0xa2, 0x12, 0x96, 0x0a,
-            0x32, 0x84, 0xb2, 0xa1, 0x06, 0x68, 0x56, 0x57,
-            0x97, 0xa3, 0x7b, 0x22, 0x61, 0x76, 0x5d, 0x30,
-            0x1a, 0x31, 0xab, 0x99, 0x06, 0xc5, 0x1a, 0x96,
-            0xcf, 0xcf, 0x14, 0xff, 0xb2, 0xc4, 0xcc, 0x2b,
-            0xbf, 0x0c, 0x9d, 0x91, 0x8f, 0x79, 0x5b, 0xbc,
-            0xa9, 0x6b, 0x91, 0x6a, 0xb4, 0x93, 0x5c, 0x7b,
-            0x5d, 0xc2, 0x8a, 0x75, 0xc0, 0xc1, 0x08, 0xfa,
-            0x99, 0xf9, 0x4d, 0x5e, 0x0c, 0x06, 0x64, 0x60,
-            0xa9, 0x01, 0x4a, 0x34, 0x0f, 0x33, 0x84, 0x95,
-            0x69, 0x30, 0xc1, 0x1c, 0x36, 0xf8, 0xfc, 0x30,
-            0x23, 0xb2, 0x71, 0xe5, 0x52, 0x4d, 0x12, 0x1a,
-            0xc9, 0xbe, 0xee, 0xc9, 0xcb, 0x01, 0x85, 0xf3,
-            0xdb, 0x30, 0xf9, 0x41, 0xa9, 0x40, 0xb0, 0x06,
-            0x29, 0x77, 0xcd, 0xc5, 0xec, 0x58, 0x02, 0x48,
-            0x83, 0x53, 0x44, 0x6a, 0xd2, 0xca, 0x05, 0xd8,
-            0x5a, 0x08, 0xeb, 0xa9, 0xf4, 0xe6, 0xc7, 0x9d,
-            0xd5, 0x7b, 0x74, 0x0b, 0x31, 0xb7, 0xa5, 0x57,
-            0x7c, 0x7a, 0xfd, 0x1a, 0x0e, 0xd7, 0x97, 0x41,
-            0xbf, 0xdd, 0xc6, 0x19, 0x6c, 0x77, 0x8c, 0x18,
-            0x52, 0x57, 0x83, 0xba, 0x71, 0x25, 0xee, 0x39,
-            0xbb, 0xe2, 0x43, 0xa0, 0x14, 0xdc, 0x0e, 0x84,
-            0xb4, 0x2b, 0xde, 0x3e, 0xe5, 0x36, 0xb7, 0xa2,
-            0x92, 0x98, 0x05, 0xb8, 0x96, 0xe5, 0xd0, 0x8c,
-            0x08, 0x93, 0x35, 0xc2, 0x81, 0xe0, 0xfc, 0x59,
-            0x71, 0xe2, 0x44, 0x49, 0x5d, 0xda, 0xfb, 0x9c,
-            0xaa, 0x70, 0x9f, 0x43, 0xa8, 0xa5, 0xd9, 0x67,
-            0xd9, 0x8f, 0xa3, 0x1e, 0xbe, 0x0e, 0xec, 0xdf,
-            0x12, 0x2b, 0x6a, 0xe7, 0x1c, 0x12, 0x17, 0xe7,
-            0xc4, 0x6d, 0x50, 0xc9, 0x52, 0x7a, 0xd5, 0xe8,
-            0x7f, 0xbc, 0x07, 0x15, 0xac, 0xdb, 0x93, 0x66,
-            0xb1, 0xf0, 0xa7, 0x7b, 0x2f, 0xe9, 0xec, 0xd0,
-            0x47, 0x69, 0x59, 0x87, 0xf1, 0x4c, 0x3e, 0x4b,
-            0x9b, 0x11, 0x79, 0x13, 0xe4, 0x96, 0xf6, 0x56,
-            0x04, 0x6e, 0x0b, 0x33, 0xfc, 0x40, 0xf6, 0xc7,
-            0xc1, 0x43, 0xb1, 0xbf, 0x0e, 0xb3, 0x87, 0xfd,
-            0x0b, 0x1c, 0x63, 0x46, 0x3a, 0xd3, 0xa0, 0x17,
-            0x59, 0x25, 0x94, 0x6c, 0x9c, 0x3d, 0x0c, 0x81,
-            0xce, 0x82, 0x72, 0x42, 0x28, 0xf9, 0x37, 0x6a,
-            0x6d, 0xe4, 0x12, 0xf4, 0x21, 0xaa, 0xf7, 0xfe,
-            0x27, 0x55, 0x40, 0x1a, 0x14, 0xc3, 0x39, 0x5b,
-            0xbf, 0x63, 0xc2, 0x5f, 0x10, 0x1f, 0x14, 0x25,
-            0xd0, 0xce, 0xf3, 0x14, 0x48, 0x13, 0xa5, 0x0b,
-            0x4d, 0x38, 0xcf, 0x0d, 0x34, 0xc0, 0x0a, 0x11,
-            0xb4, 0xb5, 0x72, 0xc8, 0x4b, 0xc2, 0x6f, 0xe7,
-            0x9d, 0x93, 0xf7, 0xdf, 0xb8, 0x43, 0x72, 0x7e,
-            0xda, 0x3e, 0x20, 0x1f, 0xbc, 0x21, 0x2a, 0xce,
-            0x00, 0xfa, 0x96, 0x9f, 0x3d, 0xe5, 0x88, 0x96,
-            0xef, 0x29, 0x84, 0xdf, 0x6c, 0x1c, 0x96, 0xd8,
-            0x58, 0x47, 0xaa, 0x92, 0xf3, 0x07, 0xe5, 0xfb,
-            0xaf, 0xea, 0x95, 0x7e, 0x0b, 0x71, 0xcd, 0x81,
-            0x0f, 0xb7, 0x0a, 0x59, 0x8f, 0x31, 0x4d, 0xd1,
-            0xc3, 0xf3, 0x2f, 0x70, 0x5c, 0x59, 0x18, 0x97,
-            0xaf, 0x77, 0x95, 0x5e, 0xaf, 0x40, 0x06, 0x12,
-            0x81, 0x61, 0x86, 0x08, 0x4e, 0xbc, 0x89, 0x46,
-            0x07, 0x2e, 0x5b, 0x10, 0xaa, 0x12, 0xf0, 0xa7,
-            0x84, 0xe2, 0x9a, 0x08, 0xf1, 0xde, 0x59, 0xe3,
-            0x0e, 0x47, 0x4b, 0xff, 0xc3, 0xc9, 0x18, 0xaf,
-            0x95, 0x9c, 0x67, 0x2a, 0xde, 0x8a, 0x7a, 0x99,
-            0x04, 0xc4, 0xb8, 0x97, 0x4c, 0x04, 0x29, 0x71,
-            0x05, 0xda, 0xb3, 0xd6, 0xdb, 0x6c, 0x71, 0xe6,
-            0xe8, 0x03, 0xbf, 0x94, 0x7d, 0xde, 0x3d, 0xc8,
-            0x44, 0xfa, 0x7d, 0x62, 0xb4, 0x36, 0x03, 0xee,
-            0x36, 0x52, 0x64, 0xb4, 0x85, 0x6d, 0xd5, 0x78,
-            0xf0, 0x6f, 0x67, 0x2d, 0x0e, 0xe0, 0x2c, 0x88,
-            0x9b, 0x55, 0x19, 0x29, 0x40, 0xf6, 0x8c, 0x12,
-            0xbb, 0x2c, 0x83, 0x96, 0x40, 0xc0, 0x36, 0xf5,
-            0x77, 0xff, 0x70, 0x8c, 0x75, 0x92, 0x0b, 0xad,
-            0x05, 0x9b, 0x7e, 0xa2, 0xfc, 0xa9, 0xd1, 0x64,
-            0x76, 0x82, 0x13, 0xba, 0x22, 0x5e, 0x33, 0x0e,
-            0x26, 0x70, 0xa9, 0xbe, 0x74, 0x28, 0xf5, 0xe2,
-            0xc4, 0x96, 0xee, 0x3a, 0xbc, 0x97, 0xa6, 0x2c,
-            0x2a, 0xe0, 0x64, 0x8d, 0x35, 0xc6, 0x1a, 0xca,
-            0xf4, 0x92, 0xfa, 0xc3, 0xf1, 0x1f, 0x98, 0xe4,
-            0x43, 0x88, 0x69, 0x3a, 0x09, 0xbf, 0x63, 0xe5,
-            0x96, 0x29, 0x0b, 0x9b, 0x62, 0x23, 0x14, 0x8a,
-            0x95, 0xe4, 0x1c, 0x5c, 0x0a, 0xa9, 0xc5, 0xb9,
-            0x6f, 0x4f, 0x2b, 0x25, 0x6f, 0x74, 0x1e, 0x18,
-            0xd5, 0xfe, 0x27, 0x7d, 0x3f, 0x6e, 0x55, 0x2c,
-            0x67, 0xe6, 0xde, 0xb5, 0xcc, 0xc0, 0x2d, 0xff,
-            0xc4, 0xe4, 0x06, 0x21, 0xa5, 0xc8, 0xd3, 0xd6,
-            0x6c, 0xa1, 0xc3, 0xfb, 0x88, 0x92, 0xb1, 0x1d,
-            0x90, 0xe1, 0x35, 0x05, 0x9b, 0x29, 0x6d, 0xba,
-            0xf1, 0xf4, 0x1e, 0x23, 0x2e
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        5242880+8, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test5Mcnt",
-        {
-            0x07, 0x52, 0x65, 0xe7, 0xca, 0xa3, 0xca, 0x45,
-            0xcf, 0x3a, 0x05, 0x1d, 0x38, 0x03, 0x53, 0x0c,
-            0x22, 0x31, 0xba, 0x99, 0x4f, 0x9b, 0x6a, 0x1b,
-            0x7e, 0x09, 0x9d, 0x4e, 0xb5, 0xc9, 0x84, 0x2e
-        },
-        G89_CNT,
-        { 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        },
-        {
-            0x3d, 0x05, 0x07, 0x57, 0xc0, 0x75, 0x89, 0x97,
-            0xd6, 0x94, 0x49, 0x11, 0x1d, 0xd0, 0x91, 0xee
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        U64(4294967296)+16, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test4Gcnt",
-        {
-            0x75, 0xa3, 0x3c, 0xae, 0x03, 0x6b, 0x10, 0xdb,
-            0xc1, 0x56, 0x50, 0x89, 0x03, 0xd2, 0x9f, 0x91,
-            0xee, 0xe8, 0x64, 0x1d, 0x43, 0xf2, 0x4e, 0xf8,
-            0xf2, 0x6c, 0xed, 0xda, 0x8f, 0xe4, 0x88, 0xe9
-        },
-        G89_CNT,
-        { 
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        },
-        {
-            0xfa, 0x6c, 0x96, 0x78, 0xe2, 0xf8, 0xdd, 0xaa, 
-            0x67, 0x5a, 0xc9, 0x5d, 0x57, 0xf1, 0xbd, 0x99
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        1035,
-        {
-            0xd6, 0xcf, 0x31, 0x96, 0x9c, 0xa1, 0xfb, 0xd6,
-            0x8d, 0xa3, 0xdd, 0x01, 0xd9, 0x88, 0xc0, 0x2f,
-            0xbc, 0x46, 0xc7, 0x3a, 0xe4, 0x21, 0x86, 0x96,
-            0x8d, 0xe2, 0xca, 0xb6, 0x37, 0xa2, 0xe1, 0xa8,
-            0x7e, 0xa7, 0x79, 0x2e, 0xa4, 0x56, 0x75, 0x7f,
-            0x3e, 0x55, 0x8b, 0x43, 0xae, 0x65, 0xdf, 0xaa,
-            0x42, 0xb6, 0x00, 0xa6, 0x61, 0x03, 0x0d, 0xd3,
-            0x41, 0x02, 0x27, 0x23, 0x95, 0x79, 0x9b, 0x34,
-            0x81, 0xa9, 0x86, 0xb5, 0xa7, 0x90, 0xe2, 0xae,
-            0xc4, 0x2f, 0xc3, 0x8e, 0x32, 0x56, 0x13, 0xfa,
-            0x4d, 0x4e, 0x9f, 0x15, 0x75, 0x7e, 0x74, 0xdc,
-            0x32, 0x2d, 0xee, 0x4d, 0x67, 0x70, 0x9f, 0x62,
-            0xb9, 0xc4, 0xdb, 0x24, 0x84, 0xcc, 0x16, 0x7b,
-            0xda, 0x22, 0xf7, 0xc5, 0xf3, 0x93, 0x35, 0x73,
-            0xc6, 0x03, 0x1c, 0x77, 0xa5, 0xf2, 0x76, 0x56,
-            0xb4, 0x95, 0xd4, 0x7e, 0x0d, 0x20, 0xc6, 0x6e,
-            0xee, 0x8f, 0x25, 0x48, 0xff, 0x7e, 0x01, 0x3a,
-            0xb4, 0x1f, 0xaa, 0x35, 0xc0, 0x33, 0x58, 0x9c,
-            0xb5, 0xba, 0x65, 0x4b, 0xd3, 0x51, 0x14, 0xec,
-            0x61, 0xce, 0xe4, 0xba, 0x49, 0xba, 0x39, 0x32,
-            0xab, 0xce, 0x81, 0x72, 0xce, 0xab, 0xed, 0xd4,
-            0xd2, 0x19, 0x87, 0x85, 0x92, 0xfa, 0x64, 0x34,
-            0xd8, 0x86, 0xf4, 0x8a, 0x08, 0x3c, 0xde, 0xee,
-            0x97, 0x92, 0x92, 0x69, 0xba, 0x9b, 0x5f, 0x7a,
-            0x03, 0xc1, 0x5d, 0x43, 0x02, 0x8c, 0xbe, 0xd2,
-            0x46, 0x72, 0x81, 0x40, 0x7d, 0x68, 0x98, 0x45,
-            0x0b, 0x54, 0x27, 0x1c, 0xaf, 0x80, 0x42, 0xe4,
-            0xd5, 0xd4, 0xe4, 0xa2, 0x98, 0x07, 0x8f, 0x03,
-            0xf5, 0x2c, 0x8c, 0x88, 0xca, 0x5a, 0xde, 0xe4,
-            0x9f, 0xb1, 0x5f, 0x82, 0xff, 0x20, 0x67, 0x52,
-            0x85, 0x84, 0x4f, 0xc8, 0xfe, 0xa7, 0x9e, 0xae,
-            0x1c, 0xfa, 0xb8, 0x75, 0xd3, 0xf7, 0x9f, 0x0d,
-            0xda, 0x2d, 0xe6, 0xcc, 0x86, 0x6b, 0xa4, 0x14,
-            0x65, 0xc3, 0xf9, 0x15, 0xbc, 0x87, 0xf5, 0xae,
-            0x8c, 0x10, 0xd4, 0xce, 0x5b, 0x9c, 0xe2, 0xdd,
-            0x42, 0x03, 0x09, 0x87, 0x47, 0xed, 0x5d, 0xd0,
-            0x7a, 0x69, 0x4c, 0xfa, 0x43, 0x7d, 0xbf, 0x07,
-            0x85, 0x6a, 0xee, 0x68, 0xe6, 0x7a, 0x57, 0xb2,
-            0x20, 0x8d, 0x80, 0xf2, 0x91, 0x6f, 0x5c, 0x07,
-            0x8c, 0xe4, 0x6a, 0x49, 0x90, 0x85, 0x8b, 0x77,
-            0x29, 0x56, 0x1c, 0x5e, 0xa9, 0x3f, 0xab, 0x8b,
-            0x79, 0xa3, 0x6f, 0x6b, 0x34, 0xcb, 0x61, 0xf6,
-            0xe6, 0x92, 0xd1, 0x48, 0x9e, 0x11, 0xa2, 0x82,
-            0xc0, 0x4e, 0x23, 0xd2, 0x15, 0x0d, 0x8d, 0xff,
-            0xfa, 0x17, 0x9d, 0x81, 0xb8, 0xbc, 0xd7, 0x5b,
-            0x08, 0x81, 0x20, 0x40, 0xc0, 0x3c, 0x06, 0x8b,
-            0x1a, 0x88, 0x0b, 0x4b, 0x7b, 0x31, 0xf5, 0xd4,
-            0x4e, 0x09, 0xd1, 0x4d, 0x0d, 0x7f, 0x45, 0xd1,
-            0x09, 0x35, 0xba, 0xce, 0x65, 0xdd, 0xf2, 0xb8,
-            0xfb, 0x7a, 0xbc, 0xc4, 0x4b, 0xc8, 0x75, 0xda,
-            0x6b, 0xce, 0x3d, 0xe8, 0x94, 0xcc, 0x23, 0x6f,
-            0xb0, 0x3b, 0x4f, 0x7d, 0x07, 0xb9, 0x0f, 0x62,
-            0x92, 0x7e, 0xda, 0x70, 0x50, 0xce, 0xd3, 0x28,
-            0x12, 0x11, 0x00, 0xeb, 0x8d, 0x63, 0x70, 0x78,
-            0xa8, 0x7b, 0x76, 0xab, 0xc6, 0x40, 0xc0, 0x4e,
-            0x80, 0xdd, 0xf0, 0xfe, 0x83, 0x72, 0x56, 0x4c,
-            0x09, 0x4c, 0xf1, 0x72, 0x72, 0x86, 0x26, 0x31,
-            0xc3, 0xc2, 0xdc, 0x8e, 0xc7, 0xf4, 0x35, 0xec,
-            0x17, 0x06, 0x63, 0x47, 0x49, 0x88, 0x47, 0xaf,
-            0xb3, 0x38, 0x4f, 0x7e, 0x44, 0x95, 0xb5, 0xbb,
-            0x1d, 0xbd, 0x5a, 0x91, 0x5b, 0xd0, 0x1a, 0xdf,
-            0x0d, 0x0b, 0x50, 0xd8, 0xe2, 0x0e, 0xc5, 0x00,
-            0x2d, 0x5b, 0x29, 0x19, 0xaa, 0x2b, 0x64, 0xc5,
-            0x40, 0x31, 0x48, 0x11, 0xbc, 0x04, 0xd1, 0xcf,
-            0x6d, 0xf9, 0xa5, 0x2f, 0x4a, 0xc9, 0x82, 0xfa,
-            0x59, 0xe1, 0xfc, 0xab, 0x1c, 0x33, 0x26, 0x0a,
-            0x5f, 0xef, 0xf2, 0x06, 0xd8, 0xd3, 0x7e, 0x16,
-            0x58, 0x16, 0x78, 0x73, 0xae, 0xba, 0xeb, 0xe5,
-            0x3d, 0xb2, 0x0a, 0xb3, 0x32, 0x2d, 0x14, 0xa4,
-            0xfa, 0x3f, 0x1f, 0x43, 0xf9, 0x7b, 0xa9, 0x43,
-            0x98, 0x18, 0x94, 0x07, 0x07, 0xe5, 0x19, 0x34,
-            0xa8, 0x16, 0x5f, 0x71, 0x67, 0xaa, 0x29, 0xe5,
-            0xfa, 0xf0, 0x83, 0x06, 0x1d, 0x9d, 0xfc, 0xfe,
-            0xfe, 0x8c, 0xb5, 0xb2, 0xa9, 0xe7, 0xa0, 0x40,
-            0x60, 0xb6, 0x71, 0x9e, 0xab, 0x5b, 0x83, 0xb9,
-            0x0c, 0x2b, 0x58, 0x23, 0x80, 0x09, 0x9e, 0x5d,
-            0x94, 0x7d, 0x40, 0x76, 0xa9, 0x16, 0x96, 0x9e,
-            0x83, 0xe0, 0x0d, 0xec, 0xa0, 0xec, 0x76, 0x2a,
-            0xb7, 0xa0, 0xff, 0xb8, 0x50, 0x4c, 0x5b, 0xc6,
-            0x8b, 0x0a, 0x65, 0x2e, 0xfe, 0xb4, 0x40, 0x9a,
-            0x01, 0xd8, 0xc6, 0xa3, 0xab, 0x99, 0xa2, 0xc5,
-            0x0c, 0x08, 0xc4, 0xb7, 0xee, 0x4d, 0x1d, 0xc4,
-            0x08, 0x15, 0xd0, 0xdb, 0xaa, 0x63, 0x4f, 0x31,
-            0xeb, 0x14, 0x97, 0x43, 0xbd, 0xc1, 0x94, 0x08,
-            0xe6, 0xde, 0x43, 0x9f, 0x95, 0x0b, 0x96, 0x7e,
-            0x7f, 0x3c, 0x68, 0xba, 0x6f, 0xc4, 0xc9, 0x35,
-            0x2b, 0xc4, 0x0e, 0xda, 0x1f, 0x91, 0x68, 0x64,
-            0x63, 0x34, 0x73, 0xbe, 0x57, 0x75, 0xb9, 0xed,
-            0xf7, 0x2d, 0x3b, 0x05, 0x21, 0x93, 0x28, 0x48,
-            0x96, 0x95, 0x97, 0xa0, 0xd2, 0x7d, 0x78, 0xbb,
-            0x6a, 0x49, 0x8f, 0x76, 0x55, 0x74, 0x63, 0xb9,
-            0xc5, 0x36, 0x12, 0x25, 0xbf, 0x03, 0x82, 0x8f,
-            0xf0, 0xf6, 0x80, 0xbb, 0x33, 0xb4, 0xf4, 0x17,
-            0x27, 0x1c, 0xf3, 0x4c, 0x10, 0xa3, 0xe4, 0xd1,
-            0x55, 0xd9, 0x68, 0x21, 0x4e, 0x5a, 0x83, 0x67,
-            0xbf, 0xf8, 0x3c, 0x7d, 0x4e, 0x62, 0xd3, 0x28,
-            0xa7, 0x26, 0x6f, 0xe9, 0xee, 0xc2, 0x0b, 0x2d,
-            0x03, 0x84, 0xb1, 0xff, 0xd6, 0x68, 0x1f, 0xb6,
-            0xf2, 0xe4, 0x0f, 0xda, 0x2d, 0xee, 0x5f, 0x6e,
-            0x21, 0xc8, 0xe1, 0xfc, 0xad, 0x6b, 0x0e, 0x04,
-            0x7d, 0xaf, 0xc2, 0x3b, 0xa5, 0x68, 0x9b, 0x0c,
-            0xf3, 0x56, 0xf3, 0xda, 0x8d, 0xc8, 0x7d, 0x39,
-            0xdc, 0xd5, 0x99, 0xc6, 0x01, 0x10, 0xce, 0x42,
-            0x1b, 0xac, 0x48, 0xdc, 0x97, 0x78, 0x0a, 0xec,
-            0xb3, 0x8f, 0x47, 0x35, 0xa3, 0x6a, 0x64, 0xb2,
-            0x8e, 0x63, 0x69, 0x22, 0x66, 0xae, 0x2e, 0xe0,
-            0x88, 0xf9, 0x40, 0x3c, 0xc9, 0xa2, 0x57, 0x61,
-            0xf6, 0xad, 0xf0, 0xdc, 0x90, 0x56, 0x3f, 0x06,
-            0x9b, 0x7d, 0xbd, 0xc2, 0x81, 0x02, 0xab, 0xb8,
-            0x15, 0x09, 0x88, 0x4a, 0xff, 0x2f, 0x31, 0xbf,
-            0x5e, 0xfa, 0x6a, 0x7e, 0xf6, 0xc5, 0xa7, 0xf7,
-            0xd5, 0xab, 0x55, 0xac, 0xae, 0x0d, 0x8c, 0x8d,
-            0x7f, 0x4b, 0x25, 0xbb, 0x32, 0xff, 0x11, 0x33,
-            0x2e, 0x37, 0x37, 0x69, 0x96, 0x15, 0x17, 0xb1,
-            0x17, 0x49, 0xe0, 0x9a, 0x9c, 0xd9, 0x5b, 0x8d,
-            0x58, 0xa3, 0x1d, 0x92, 0x87, 0xf8, 0x80, 0xb9,
-            0xbd, 0x5a, 0xec, 0x40, 0xe1, 0x00, 0x33, 0x60,
-            0xe4, 0x86, 0x16, 0x6d, 0x61, 0x81, 0xf2, 0x28,
-            0x6a, 0xa7, 0xce, 0x3f, 0x95, 0xae, 0x43, 0xca,
-            0xe1, 0x3f, 0x81, 0x74, 0x7e, 0x1c, 0x47, 0x17,
-            0x95, 0xc6, 0x60, 0xda, 0x74, 0x77, 0xd9, 0x9f,
-            0xfa, 0x92, 0xb4, 0xbe, 0xe1, 0x23, 0x98, 0x18,
-            0x95, 0x63, 0x03, 0x13, 0x4c, 0x1a, 0x2d, 0x41,
-            0xcd, 0xe4, 0x84, 0xf7, 0xe6, 0x38, 0xef, 0xff,
-            0x95, 0xb2, 0xe8, 0x7c, 0x8f, 0x58, 0xb5, 0xb5,
-            0xed, 0x27, 0x7f, 0x3c, 0x18, 0xab, 0xbe, 0x7f,
-            0x4f, 0xe2, 0x35, 0x15, 0x71, 0xb7, 0x6f, 0x85,
-            0x38, 0x9b, 0x88, 0xf6, 0x9c, 0x8d, 0x43, 0xb5,
-            0x58, 0x9e, 0xf2, 0xd1, 0x96, 0xbe, 0xb7, 0xad,
-            0x1a, 0xa0, 0x98
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testimit2",
-        {
-            0x80, 0xd9, 0xa0, 0xdc, 0x21, 0xf9, 0x30, 0x40,
-            0x75, 0xfe, 0x49, 0x1b, 0x9e, 0x71, 0x90, 0x91,
-            0x78, 0x88, 0x21, 0x60, 0x39, 0xe7, 0xc9, 0x2b,
-            0xfb, 0x55, 0x1d, 0xf4, 0xdd, 0x2b, 0x0a, 0x01
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0x90, 0xf2, 0x11, 0x9a
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        10,
-        {
-            0x1d, 0xeb, 0xe6, 0x79, 0x0a, 0x59, 0x00, 0xe6,
-            0x8e, 0x5c
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testimit3",
-        {
-            0xa9, 0xb6, 0x37, 0xcc, 0x6d, 0x9b, 0x2f, 0x25,
-            0xb0, 0xdf, 0x47, 0x04, 0x50, 0x68, 0xb0, 0x27,
-            0x41, 0x27, 0x58, 0x6a, 0xbd, 0x0a, 0x6e, 0x50,
-            0x2f, 0xc6, 0xfc, 0xc0, 0x3e, 0x29, 0x42, 0xa5
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0x31, 0x7c, 0x16, 0xe4
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        6,
-        {
-            0xef, 0x06, 0x8f, 0x14, 0xc9, 0x04
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testimit4",
-        {
-            0xb0, 0x6c, 0x48, 0x23, 0x0a, 0x6e, 0xf4, 0xec,
-            0x27, 0x98, 0x01, 0x23, 0xa7, 0xd8, 0xbf, 0x60,
-            0x89, 0xef, 0xad, 0xe8, 0x8f, 0x79, 0x14, 0x8c,
-            0x18, 0x5c, 0x9a, 0xda, 0xef, 0x0b, 0xdd, 0xa0
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0xe9, 0x72, 0xae, 0xbf
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        16, 
-        {
-            0x02, 0xf8, 0xec, 0x2b, 0x4d, 0x1f, 0xbc, 0x7c,
-            0x6e, 0x47, 0xe3, 0x87, 0x22, 0x75, 0x41, 0xa7
-        },
-        "id-Gost28147-89-CryptoPro-B-ParamSet",
-        "testimit5",
-        {
-            0x33, 0xd3, 0xef, 0x01, 0x19, 0x95, 0x0e, 0x15,
-            0xa1, 0x69, 0x75, 0xae, 0x56, 0x27, 0x17, 0x79,
-            0x63, 0x47, 0xab, 0x62, 0x9d, 0x4a, 0xf0, 0x34,
-            0xd3, 0x1e, 0x69, 0x74, 0xec, 0x31, 0x48, 0xfc
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0xf5, 0x55, 0x1f, 0x28
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        8, 
-        {
-            0xf3, 0xb2, 0x29, 0xd2, 0x7a, 0x37, 0x03, 0x12
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testimit6",
-        {
-            0x42, 0x35, 0x81, 0x91, 0x0b, 0xa9, 0x99, 0xff,
-            0xd9, 0x43, 0xf8, 0xc6, 0x19, 0x55, 0x1f, 0x2f,
-            0x2d, 0x45, 0x40, 0x20, 0x1e, 0x1d, 0x32, 0x7a,
-            0xb1, 0x07, 0x6b, 0x4f, 0x45, 0x90, 0xd9, 0x80
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0x6e, 0x15, 0xfa, 0xe8
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        0, 
-        {
-            0
-        },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "testimit7",
-        {
-            0x26, 0xcb, 0xb9, 0xf0, 0x0c, 0x62, 0x9f, 0xaa,
-            0x4a, 0x1d, 0xb6, 0x30, 0x09, 0x01, 0x56, 0x89,
-            0x66, 0xd4, 0xe4, 0x0e, 0xfe, 0xf6, 0x10, 0x6b,
-            0x6c, 0xe8, 0x04, 0x3a, 0xe3, 0x61, 0x4b, 0x19
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0x00, 0x00, 0x00, 0x00
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        5242880, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test5Mimit",
-        {
-            0xaa, 0x85, 0x84, 0xcd, 0x65, 0x28, 0xe1, 0xdb,
-            0xb8, 0x20, 0x19, 0x43, 0xe0, 0x36, 0x35, 0x10,
-            0x19, 0xc3, 0x70, 0x5b, 0x27, 0xc1, 0x9d, 0x84,
-            0x75, 0xa3, 0xc6, 0x49, 0x46, 0x8f, 0x7c, 0x4e
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0x2a, 0xe6, 0x23, 0xc6
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        3221225472U + 16, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test3Gimit1",
-        {
-            0xd5, 0xda, 0xfe, 0x06, 0x60, 0xdc, 0xf0, 0xb3,
-            0x49, 0x5a, 0x02, 0x59, 0xc8, 0x2e, 0x4a, 0x2b,
-            0xcc, 0x9b, 0x98, 0x04, 0xb7, 0xf2, 0x78, 0xb7,
-            0xce, 0xa3, 0xf2, 0xdb, 0x9e, 0xa8, 0x49, 0x1d
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0xcc, 0x46, 0x67, 0xe4
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        U64(4)*1024*1024*1024, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test4Gimit3",
-        {
-            0x0d, 0xf1, 0xa8, 0x7f, 0x57, 0x03, 0x44, 0xcc,
-            0xdb, 0x20, 0xde, 0xed, 0x85, 0x50, 0x38, 0xda,
-            0xc9, 0x44, 0xec, 0x2c, 0x0d, 0x66, 0xb7, 0xdc,
-            0x17, 0x14, 0x55, 0x95, 0x33, 0x6e, 0x43, 0x3e
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0xb7, 0x21, 0x2e, 0x48
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        U64(4)*1024*1024*1024+4, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test4Gimit1",
-        {
-            0x0c, 0xf3, 0xe9, 0xb0, 0x28, 0x3b, 0x9f, 0x8b,
-            0xe3, 0x82, 0xb9, 0xa2, 0xa6, 0xbd, 0x80, 0xd2,
-            0xcd, 0xfa, 0x3f, 0xf7, 0x90, 0xa7, 0x55, 0x06,
-            0x9b, 0x7a, 0x58, 0xee, 0xe7, 0xf1, 0x9d, 0xbe
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0xda, 0x15, 0x10, 0x73
-        }
-    },
-    { /* Calculated by libcapi10, CryptoPro CSP 3.6R2, Mac OSX */
-        U64(4)*1024*1024*1024+10, 
-        { 0 },
-        "id-Gost28147-89-CryptoPro-A-ParamSet",
-        "test4Gimit2",
-        {
-            0x97, 0x1a, 0x42, 0x22, 0xfa, 0x07, 0xb2, 0xca,
-            0xf9, 0xd2, 0x34, 0x5a, 0x92, 0xb1, 0x1f, 0x6b,
-            0x53, 0xf8, 0xaf, 0xed, 0x9a, 0x73, 0xc4, 0x38,
-            0xd7, 0x7d, 0x25, 0x81, 0x00, 0x0d, 0xd4, 0x29
-        },
-        G89_IMIT,
-        { 0 },
-        {
-            0x52, 0xaa, 0x22, 0xb4
-        }
-    }
-};
-
-/* const */ unsigned char bZB[40*1024*1024];
-unsigned char bTS[40*1024*1024];
-
-int main(int argc, char *argv[])
-{
-    unsigned int t;
-    uint64_t ullMaxLen = 6*1000*1000;
-    int ignore = 0;
-    EVP_MD_CTX mctx;
-    EVP_CIPHER_CTX ectx;
-    EVP_PKEY *mac_key;
-    unsigned char bDerive[EVP_MAX_KEY_LENGTH];
-    unsigned char bTest[G89_MAX_TC_LEN];
-    unsigned char bTest1[G89_MAX_TC_LEN];
-    uint64_t ullLeft;
-    unsigned int mdl = 0;
-    int enlu = 0;
-    int enlf = 0;
-    size_t siglen;
-    size_t l = 0;
-    BIO *bio_err;
-    const EVP_MD *md_gost94 = NULL;
-    const EVP_CIPHER *cp_g89ecb = NULL;
-    const EVP_CIPHER *cp_g89cfb = NULL;
-    const EVP_CIPHER *cp_g89cnt = NULL;
-    const EVP_CIPHER *ctype = NULL;
-    const EVP_MD *md_g89imit = NULL;
-
-    printf("Testing GOST 28147-89 ");
-
-    if(1 < argc) {
-       if(1 != sscanf(argv[1], "%" SCNu64, &ullMaxLen) ||
-          ( 2 < argc ? 
-            1 != sscanf(argv[2], "%d", &ignore) : 0)) {
-           fflush(NULL);
-           fprintf(stderr, "Usage: %s [maxlen [ignore-error]]\n", 
-                               argv[0]);
-           return 1;
-       }
-    }
-
-    ERR_load_crypto_strings();
-    ENGINE_load_builtin_engines();
-    OPENSSL_load_builtin_modules();
-    OpenSSL_add_all_algorithms();
-
-        memset(bZB, 0, sizeof bZB);
-        memset(bTS, 0, sizeof bTS);
-
-        /* Test load engine */
-    if(NULL == (md_gost94 = EVP_get_digestbyname(SN_id_GostR3411_94))) {
-        fflush(NULL);
-        fprintf(stderr, "\"" SN_id_GostR3411_94 "\" - not found\n");
-        if(!ignore) {
-            return 7;
-        }
-    }
-    if(NULL == (cp_g89cfb = EVP_get_cipherbyname(SN_id_Gost28147_89))) {
-        fflush(NULL);
-        fprintf(stderr, "\"" SN_id_Gost28147_89 "\" - not found\n");
-        if(!ignore) {
-            return 8;
-        }
-    }
-    if(NULL == (cp_g89cnt = EVP_get_cipherbyname(SN_gost89_cnt))) {
-        fflush(NULL);
-        fprintf(stderr, "\"" SN_gost89_cnt "\" - not found\n");
-        if(!ignore) {
-            return 9;
-        }
-    }
-    if(NULL == (cp_g89ecb = EVP_get_cipherbyname(SN_gost89_ecb))) {
-        fflush(NULL);
-        fprintf(stderr, "\"" SN_gost89_ecb "\" - not found\n");
-        if(!ignore) {
-            return 8;
-        }
-    }
-    if(NULL == (md_g89imit = EVP_get_digestbyname(SN_id_Gost28147_89_MAC))) {
-        fflush(NULL);
-        fprintf(stderr, "\"" SN_id_Gost28147_89_MAC "\" - not found\n");
-        if(!ignore) {
-            return 10;
-        }
-    }
-
-        /* Test cases */
-    for(t = 0; t < sizeof(tcs)/sizeof(tcs[0]); t++) {
-        if(NULL != tcs[t].szDerive) {
-        memset(bDerive, 0x3c, sizeof(bDerive));
-        mdl = sizeof(bDerive);
-        EVP_Digest(tcs[t].szDerive, strlen(tcs[t].szDerive), 
-                        bDerive, &mdl,
-                        md_gost94, NULL);
-        if(0 != memcmp(tcs[t].bRawKey, bDerive, mdl)) {
-            fflush(NULL);
-            fprintf(stderr, "Engine test t=%d "
-                        "derive key error.\n", t);
-            if(!ignore) {
-                return 12;
-            }
-        }
-        }
-        if(ullMaxLen < tcs[t].ullLen) {
-            printf("@");
-            continue;
-        }
-        memset(bTest, 0xa5, sizeof(bTest));
-        memset(bTest1, 0x5a, sizeof(bTest1));
-
-        switch(tcs[t].gMode) {
-        case G89_ECB:
-            ctype = cp_g89ecb;
-            goto engine_cipher_check;
-        case G89_CFB:
-            ctype = cp_g89cfb;
-            goto engine_cipher_check;
-        case G89_CNT:
-            ctype = cp_g89cnt;
-engine_cipher_check:
-            EVP_CIPHER_CTX_init(&ectx);
-            EVP_EncryptInit_ex(&ectx, ctype, NULL,
-                                    tcs[t].bRawKey, tcs[t].bIV);
-            EVP_CIPHER_CTX_ctrl(&ectx, EVP_CTRL_GOST_SET_SBOX, OBJ_txt2nid(tcs[t].szParamSet), 0);
-            if(G89_MAX_TC_LEN >= tcs[t].ullLen) {
-                enlu = sizeof(bTest);
-                EVP_EncryptUpdate(&ectx, bTest, &enlu, 
-                                    tcs[t].bIn, (int)tcs[t].ullLen);
-                l = (size_t)tcs[t].ullLen;
-            } else {
-                for(ullLeft = tcs[t].ullLen; 
-                            ullLeft >= sizeof(bZB); 
-                                    ullLeft -= sizeof(bZB)) {
-                    printf("B"); 
-                    fflush(NULL);
-                    enlu = sizeof(bTS);
-                    EVP_EncryptUpdate(&ectx, bTS, &enlu, 
-                                            bZB, sizeof(bZB));
-                }
-                printf("b%" PRIu64 "/%" PRIu64, ullLeft, tcs[t].ullLen); 
-                fflush(NULL);
-                EVP_EncryptUpdate(&ectx, bTS, &enlu, 
-                                        bZB, (int)ullLeft);
-                memcpy(bTest, &bTS[enlu-16], 16);
-                enlu = (int)tcs[t].ullLen;
-                l = 16;
-            }
-            enlf = sizeof(bTest1);
-            if (tcs[t].gMode == G89_ECB)
-                enlf = 0;
-            else
-                EVP_EncryptFinal_ex(&ectx, bTest1, &enlf);
-            EVP_CIPHER_CTX_cleanup(&ectx);
-            break;
-        case G89_IMIT:
-            EVP_MD_CTX_init(&mctx);
-            mac_key = EVP_PKEY_new_mac_key(
-                                NID_id_Gost28147_89_MAC, NULL,
-                                bDerive, mdl);
-            if (!mac_key)
-                goto imit_fail;
-            EVP_DigestSignInit(&mctx, NULL, 
-                                    md_g89imit, NULL, mac_key);
-            EVP_MD_CTX_ctrl(&mctx, EVP_MD_CTRL_GOST_SET_SBOX, OBJ_txt2nid(tcs[t].szParamSet), 0);
-            if(G89_MAX_TC_LEN >= tcs[t].ullLen) {
-                EVP_DigestSignUpdate(&mctx, tcs[t].bIn, 
-                                    (unsigned int)tcs[t].ullLen);
-            } else {
-                for(ullLeft = tcs[t].ullLen; 
-                            ullLeft >= sizeof(bZB); 
-                                    ullLeft -= sizeof(bZB)) {
-                    printf("B"); 
-                    fflush(NULL);
-                    EVP_DigestSignUpdate(&mctx, bZB, sizeof(bZB));
-                }
-                printf("b%" PRIu64 "/%" PRIu64, ullLeft, tcs[t].ullLen); 
-                fflush(NULL);
-                EVP_DigestSignUpdate(&mctx, bZB, 
-                                        (unsigned int)ullLeft);
-            }
-            siglen = 4;
-            OPENSSL_assert(EVP_DigestSignFinal(&mctx, bTest, &siglen));
-            EVP_MD_CTX_cleanup(&mctx);
-            EVP_PKEY_free(mac_key);
-            enlu = (int)tcs[t].ullLen;
-            enlf = 0;
-            l = siglen;
-            break;
-        }
-        if((int)tcs[t].ullLen != enlu || 0 != enlf ||
-           0 != memcmp(tcs[t].bOut, bTest, l)) {
-imit_fail:
-            fflush(NULL);
-            fprintf(stderr, "\nEngine test t=%d len=%" PRIu64
-                            " mode=%d failed.\n", t, tcs[t].ullLen, tcs[t].gMode);
-            if(!ignore) {
-                return 13;
-            }
-        } else {
-            printf(".");
-            fflush(NULL);
-        }
-    }
-
-    printf(" passed\n");
-    fflush(NULL);
-
-    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-    ERR_print_errors(bio_err);
-    (void)BIO_flush(bio_err);
-    BIO_free(bio_err);
-    return 0;
-}
-#endif
diff --git a/src/regress/lib/libcrypto/hkdf/Makefile b/src/regress/lib/libcrypto/hkdf/Makefile
deleted file mode 100644
index 38d7f5b1f9..0000000000
--- a/src/regress/lib/libcrypto/hkdf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2017/05/06 20:42:57 beck Exp $
-
-PROG=   hkdf_test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/hkdf/hkdf_test.c b/src/regress/lib/libcrypto/hkdf/hkdf_test.c
deleted file mode 100644
index 5e89f3384c..0000000000
--- a/src/regress/lib/libcrypto/hkdf/hkdf_test.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*      $OpenBSD: hkdf_test.c,v 1.2 2018/07/17 17:06:49 tb Exp $        */
-/* Copyright (c) 2014, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <openssl/crypto.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <openssl/hkdf.h>
-
-#define OPENSSL_ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
-typedef struct HKDFTestVector_st {
-        const EVP_MD *(*md_func)(void);
-        const uint8_t ikm[80];
-        const size_t ikm_len;
-        const uint8_t salt[80];
-        const size_t salt_len;
-        const uint8_t info[80];
-        const size_t info_len;
-        const uint8_t prk[EVP_MAX_MD_SIZE];
-        const size_t prk_len;
-        const size_t out_len;
-        const uint8_t out[82];
-} HKDFTestVector;
-
-/* These test vectors are from RFC 5869. */
-static const HKDFTestVector kTests[] = {
-  {
-    EVP_sha256,
-    {
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-    }, 22,
-    {
-      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
-      0x0c,
-    }, 13,
-    {
-      0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
-    }, 10,
-    {
-      0x07, 0x77, 0x09, 0x36, 0x2c, 0x2e, 0x32, 0xdf, 0x0d, 0xdc, 0x3f, 0x0d,
-      0xc4, 0x7b, 0xba, 0x63, 0x90, 0xb6, 0xc7, 0x3b, 0xb5, 0x0f, 0x9c, 0x31,
-      0x22, 0xec, 0x84, 0x4a, 0xd7, 0xc2, 0xb3, 0xe5,
-    }, 32,
-    42, {
-      0x3c, 0xb2, 0x5f, 0x25, 0xfa, 0xac, 0xd5, 0x7a, 0x90, 0x43, 0x4f, 0x64,
-      0xd0, 0x36, 0x2f, 0x2a, 0x2d, 0x2d, 0x0a, 0x90, 0xcf, 0x1a, 0x5a, 0x4c,
-      0x5d, 0xb0, 0x2d, 0x56, 0xec, 0xc4, 0xc5, 0xbf, 0x34, 0x00, 0x72, 0x08,
-      0xd5, 0xb8, 0x87, 0x18, 0x58, 0x65
-    }
-  },
-  {
-    EVP_sha256,
-    {
-      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
-      0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
-      0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-      0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
-      0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-      0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f
-    }, 80,
-    {
-      0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
-      0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
-      0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-      0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
-      0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-      0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf
-    }, 80,
-    {
-      0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
-      0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-      0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3,
-      0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-      0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
-      0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-      0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-    }, 80,
-    {
-       0x06, 0xa6, 0xb8, 0x8c, 0x58, 0x53, 0x36, 0x1a, 0x06, 0x10, 0x4c, 0x9c,
-       0xeb, 0x35, 0xb4, 0x5c, 0xef, 0x76, 0x00, 0x14, 0x90, 0x46, 0x71, 0x01,
-       0x4a, 0x19, 0x3f, 0x40, 0xc1, 0x5f, 0xc2, 0x44,
-    }, 32,
-    82, {
-      0xb1, 0x1e, 0x39, 0x8d, 0xc8, 0x03, 0x27, 0xa1, 0xc8, 0xe7, 0xf7, 0x8c,
-      0x59, 0x6a, 0x49, 0x34, 0x4f, 0x01, 0x2e, 0xda, 0x2d, 0x4e, 0xfa, 0xd8,
-      0xa0, 0x50, 0xcc, 0x4c, 0x19, 0xaf, 0xa9, 0x7c, 0x59, 0x04, 0x5a, 0x99,
-      0xca, 0xc7, 0x82, 0x72, 0x71, 0xcb, 0x41, 0xc6, 0x5e, 0x59, 0x0e, 0x09,
-      0xda, 0x32, 0x75, 0x60, 0x0c, 0x2f, 0x09, 0xb8, 0x36, 0x77, 0x93, 0xa9,
-      0xac, 0xa3, 0xdb, 0x71, 0xcc, 0x30, 0xc5, 0x81, 0x79, 0xec, 0x3e, 0x87,
-      0xc1, 0x4c, 0x01, 0xd5, 0xc1, 0xf3, 0x43, 0x4f, 0x1d, 0x87
-    }
-  },
-  {
-    EVP_sha256,
-    {
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-    }, 22,
-    {
-       0,
-    }, 0,
-    {
-       0,
-    }, 0,
-    {
-      0x19, 0xef, 0x24, 0xa3, 0x2c, 0x71, 0x7b, 0x16, 0x7f, 0x33, 0xa9, 0x1d,
-      0x6f, 0x64, 0x8b, 0xdf, 0x96, 0x59, 0x67, 0x76, 0xaf, 0xdb, 0x63, 0x77,
-      0xac, 0x43, 0x4c, 0x1c, 0x29, 0x3c, 0xcb, 0x04
-    }, 32,
-    42, {
-      0x8d, 0xa4, 0xe7, 0x75, 0xa5, 0x63, 0xc1, 0x8f, 0x71, 0x5f, 0x80, 0x2a,
-      0x06, 0x3c, 0x5a, 0x31, 0xb8, 0xa1, 0x1f, 0x5c, 0x5e, 0xe1, 0x87, 0x9e,
-      0xc3, 0x45, 0x4e, 0x5f, 0x3c, 0x73, 0x8d, 0x2d, 0x9d, 0x20, 0x13, 0x95,
-      0xfa, 0xa4, 0xb6, 0x1a, 0x96, 0xc8
-    }
-  },
-  {
-    EVP_sha1,
-    {
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-    }, 11,
-    {
-      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
-      0x0c,
-    }, 13,
-    {
-      0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
-    }, 10,
-    {
-      0x9b, 0x6c, 0x18, 0xc4, 0x32, 0xa7, 0xbf, 0x8f, 0x0e, 0x71, 0xc8, 0xeb,
-      0x88, 0xf4, 0xb3, 0x0b, 0xaa, 0x2b, 0xa2, 0x43
-    }, 20,
-    42, {
-      0x08, 0x5a, 0x01, 0xea, 0x1b, 0x10, 0xf3, 0x69, 0x33, 0x06, 0x8b, 0x56,
-      0xef, 0xa5, 0xad, 0x81, 0xa4, 0xf1, 0x4b, 0x82, 0x2f, 0x5b, 0x09, 0x15,
-      0x68, 0xa9, 0xcd, 0xd4, 0xf1, 0x55, 0xfd, 0xa2, 0xc2, 0x2e, 0x42, 0x24,
-      0x78, 0xd3, 0x05, 0xf3, 0xf8, 0x96
-    }
-  },
-  {
-    EVP_sha1,
-    {
-      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
-      0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
-      0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-      0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
-      0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-      0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f
-    }, 80,
-    {
-      0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
-      0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-      0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
-      0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-      0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
-      0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-      0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf
-    }, 80,
-    {
-      0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
-      0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-      0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3,
-      0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-      0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
-      0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-      0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-    }, 80,
-    {
-      0x8a, 0xda, 0xe0, 0x9a, 0x2a, 0x30, 0x70, 0x59, 0x47, 0x8d, 0x30, 0x9b,
-      0x26, 0xc4, 0x11, 0x5a, 0x22, 0x4c, 0xfa, 0xf6,
-    }, 20,
-    82, {
-      0x0b, 0xd7, 0x70, 0xa7, 0x4d, 0x11, 0x60, 0xf7, 0xc9, 0xf1, 0x2c, 0xd5,
-      0x91, 0x2a, 0x06, 0xeb, 0xff, 0x6a, 0xdc, 0xae, 0x89, 0x9d, 0x92, 0x19,
-      0x1f, 0xe4, 0x30, 0x56, 0x73, 0xba, 0x2f, 0xfe, 0x8f, 0xa3, 0xf1, 0xa4,
-      0xe5, 0xad, 0x79, 0xf3, 0xf3, 0x34, 0xb3, 0xb2, 0x02, 0xb2, 0x17, 0x3c,
-      0x48, 0x6e, 0xa3, 0x7c, 0xe3, 0xd3, 0x97, 0xed, 0x03, 0x4c, 0x7f, 0x9d,
-      0xfe, 0xb1, 0x5c, 0x5e, 0x92, 0x73, 0x36, 0xd0, 0x44, 0x1f, 0x4c, 0x43,
-      0x00, 0xe2, 0xcf, 0xf0, 0xd0, 0x90, 0x0b, 0x52, 0xd3, 0xb4
-    }
-  },
-  {
-    EVP_sha1,
-    {
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-      0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-    }, 22,
-    {
-       0,
-    }, 0,
-    {
-       0,
-    }, 0,
-    {
-      0xda, 0x8c, 0x8a, 0x73, 0xc7, 0xfa, 0x77, 0x28, 0x8e, 0xc6, 0xf5, 0xe7,
-      0xc2, 0x97, 0x78, 0x6a, 0xa0, 0xd3, 0x2d, 0x01,
-    }, 20,
-    42, {
-      0x0a, 0xc1, 0xaf, 0x70, 0x02, 0xb3, 0xd7, 0x61, 0xd1, 0xe5, 0x52, 0x98,
-      0xda, 0x9d, 0x05, 0x06, 0xb9, 0xae, 0x52, 0x05, 0x72, 0x20, 0xa3, 0x06,
-      0xe0, 0x7b, 0x6b, 0x87, 0xe8, 0xdf, 0x21, 0xd0, 0xea, 0x00, 0x03, 0x3d,
-      0xe0, 0x39, 0x84, 0xd3, 0x49, 0x18
-    }
-  },
-  {
-    EVP_sha1,
-    {
-      0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-      0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-    }, 22,
-    {
-       0,
-    }, 0,
-    {
-       0,
-    }, 0,
-    {
-      0x2a, 0xdc, 0xca, 0xda, 0x18, 0x77, 0x9e, 0x7c, 0x20, 0x77, 0xad, 0x2e,
-      0xb1, 0x9d, 0x3f, 0x3e, 0x73, 0x13, 0x85, 0xdd,
-    }, 20,
-    42, {
-      0x2c, 0x91, 0x11, 0x72, 0x04, 0xd7, 0x45, 0xf3, 0x50, 0x0d, 0x63, 0x6a,
-      0x62, 0xf6, 0x4f, 0x0a, 0xb3, 0xba, 0xe5, 0x48, 0xaa, 0x53, 0xd4, 0x23,
-      0xb0, 0xd1, 0xf2, 0x7e, 0xbb, 0xa6, 0xf5, 0xe5, 0x67, 0x3a, 0x08, 0x1d,
-      0x70, 0xcc, 0xe7, 0xac, 0xfc, 0x48
-    }
-  },
-};
-
-int main(void) {
-        size_t i;
-        OPENSSL_add_all_algorithms_noconf();
-
-        for (i = 0; i < OPENSSL_ARRAY_SIZE(kTests); i++) {
-                const HKDFTestVector *test = &kTests[i];
-                uint8_t prk[EVP_MAX_MD_SIZE];
-                uint8_t buf[82];
-                size_t prk_len;
-                if (!HKDF_extract(prk, &prk_len, test->md_func(), test->ikm,
-                    test->ikm_len, test->salt, test->salt_len)) {
-                        fprintf(stderr, "Call to HKDF_extract failed\n");
-                        ERR_print_errors_fp(stderr);
-                        return 1;
-                }
-                if (prk_len != test->prk_len ||
-                    memcmp(prk, test->prk, test->prk_len) != 0) {
-                        fprintf(stderr, "%zu: Resulting PRK does not match"
-                            "test vector\n", i);
-                        return 1;
-                }
-                if (!HKDF_expand(buf, test->out_len, test->md_func(), prk, prk_len,
-                    test->info, test->info_len)) {
-                        fprintf(stderr, "Call to HKDF_expand failed\n");
-                        ERR_print_errors_fp(stderr);
-                        return 1;
-                }
-                if (memcmp(buf, test->out, test->out_len) != 0) {
-                        fprintf(stderr,
-                            "%zu: Resulting key material does not match test"
-                            "vector\n", i);
-                        return 1;
-                }
-
-                if (!HKDF(buf, test->out_len, test->md_func(), test->ikm,
-                    test->ikm_len, test->salt, test->salt_len, test->info,
-                    test->info_len)) {
-                        fprintf(stderr, "Call to HKDF failed\n");
-                        ERR_print_errors_fp(stderr);
-                        return 1;
-                }
-                if (memcmp(buf, test->out, test->out_len) != 0) {
-                        fprintf(stderr,
-                            "%zu: Resulting key material does not match test"
-                            "vector\n", i);
-                        return 1;
-                }
-        }
-
-        printf("PASS\n");
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/hmac/Makefile b/src/regress/lib/libcrypto/hmac/Makefile
deleted file mode 100644
index 6705336211..0000000000
--- a/src/regress/lib/libcrypto/hmac/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   hmactest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/hmac/hmactest.c b/src/regress/lib/libcrypto/hmac/hmactest.c
deleted file mode 100644
index 1f120da5d9..0000000000
--- a/src/regress/lib/libcrypto/hmac/hmactest.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*      $OpenBSD: hmactest.c,v 1.4 2018/07/17 17:06:49 tb Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/hmac.h>
-#ifndef OPENSSL_NO_MD5
-#include <openssl/md5.h>
-#endif
-
-#ifndef OPENSSL_NO_MD5
-static struct test_st {
-        unsigned char key[16];
-        int key_len;
-        unsigned char data[64];
-        int data_len;
-        unsigned char *digest;
-} test[8] = {
-        {       "",
-                0,
-                "More text test vectors to stuff up EBCDIC machines :-)",
-                54,
-                (unsigned char *)"e9139d1e6ee064ef8cf514fc7dc83e86",
-        },
-        {       {0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,
-                 0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,},
-                16,
-                "Hi There",
-                8,
-                (unsigned char *)"9294727a3638bb1c13f48ef8158bfc9d",
-        },
-        {       "Jefe",
-                4,
-                "what do ya want for nothing?",
-                28,
-                (unsigned char *)"750c783e6ab0b503eaa86e310a5db738",
-        },
-        {       {0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
-                 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,},
-                16,
-                {0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,
-                 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,
-                 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,
-                 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,
-                 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,
-                 0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,0xdd,
-                 0xdd,0xdd},
-                50,
-                (unsigned char *)"56be34521d144c88dbb8c733f0e8b3f6",
-        },
-        {       "",
-                0,
-                "My test data",
-                12,
-                (unsigned char *)"61afdecb95429ef494d61fdee15990cabf0826fc"
-        },
-        {       "",
-                0,
-                "My test data",
-                12,
-                (unsigned char *)"2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776"
-        },
-        {       "123456",
-                6,
-                "My test data",
-                12,
-                (unsigned char *)"bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd"
-        },
-        {       "12345",
-                5,
-                "My test data again",
-                12,
-                (unsigned char *)"7dbe8c764c068e3bcd6e6b0fbcd5e6fc197b15bb"
-        }
-};
-#endif
-
-static char *pt(unsigned char *md, unsigned int len);
-
-int
-main(int argc, char *argv[])
-{
-#ifndef OPENSSL_NO_MD5
-        int i;
-        char *p;
-#endif
-        int err = 0;
-        HMAC_CTX ctx, ctx2;
-        unsigned char buf[EVP_MAX_MD_SIZE];
-        unsigned int len;
-
-#ifdef OPENSSL_NO_MD5
-        printf("test skipped: MD5 disabled\n");
-#else
-
-        for (i = 0; i < 4; i++) {
-                p = pt(HMAC(EVP_md5(),
-                        test[i].key, test[i].key_len,
-                        test[i].data, test[i].data_len, NULL, NULL),
-                        MD5_DIGEST_LENGTH);
-
-                if (strcmp(p, (char *)test[i].digest) != 0) {
-                        printf("error calculating HMAC on %d entry'\n", i);
-                        printf("got %s instead of %s\n", p, test[i].digest);
-                        err++;
-                } else
-                        printf("test %d ok\n", i);
-        }
-#endif /* OPENSSL_NO_MD5 */
-
-/* test4 */
-        HMAC_CTX_init(&ctx);
-        if (HMAC_Init_ex(&ctx, NULL, 0, NULL, NULL)) {
-                printf("Should fail to initialise HMAC with empty MD and key (test 4)\n");
-                err++;
-                goto test5;
-        }
-        if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
-                printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
-                err++;
-                goto test5;
-        }
-        if (HMAC_Init_ex(&ctx, NULL, 0, EVP_sha1(), NULL)) {
-                printf("Should fail to initialise HMAC with empty key (test 4)\n");
-                err++;
-                goto test5;
-        }
-        if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
-                printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
-                err++;
-                goto test5;
-        }
-        printf("test 4 ok\n");
- test5:
-        HMAC_CTX_cleanup(&ctx);
-        HMAC_CTX_init(&ctx);
-        if (HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) {
-                printf("Should fail to initialise HMAC with empty MD (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
-                printf("Should fail HMAC_Update with ctx not set up (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (HMAC_Init_ex(&ctx, test[4].key, -1, EVP_sha1(), NULL)) {
-                printf("Should fail to initialise HMAC with invalid key len(test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) {
-                printf("Failed to initialise HMAC (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
-                printf("Error updating HMAC with data (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Final(&ctx, buf, &len)) {
-                printf("Error finalising data (test 5)\n");
-                err++;
-                goto test6;
-        }
-        p = pt(buf, len);
-        if (strcmp(p, (char *)test[4].digest) != 0) {
-                printf("Error calculating interim HMAC on test 5\n");
-                printf("got %s instead of %s\n", p, test[4].digest);
-                err++;
-                goto test6;
-        }
-        if (HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) {
-                printf("Should disallow changing MD without a new key (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha256(), NULL)) {
-                printf("Failed to reinitialise HMAC (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Update(&ctx, test[5].data, test[5].data_len)) {
-                printf("Error updating HMAC with data (sha256) (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Final(&ctx, buf, &len)) {
-                printf("Error finalising data (sha256) (test 5)\n");
-                err++;
-                goto test6;
-        }
-        p = pt(buf, len);
-        if (strcmp(p, (char *)test[5].digest) != 0) {
-                printf("Error calculating 2nd interim HMAC on test 5\n");
-                printf("got %s instead of %s\n", p, test[5].digest);
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Init_ex(&ctx, test[6].key, test[6].key_len, NULL, NULL)) {
-                printf("Failed to reinitialise HMAC with key (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Update(&ctx, test[6].data, test[6].data_len)) {
-                printf("Error updating HMAC with data (new key) (test 5)\n");
-                err++;
-                goto test6;
-        }
-        if (!HMAC_Final(&ctx, buf, &len)) {
-                printf("Error finalising data (new key) (test 5)\n");
-                err++;
-                goto test6;
-        }
-        p = pt(buf, len);
-        if (strcmp(p, (char *)test[6].digest) != 0) {
-                printf("error calculating HMAC on test 5\n");
-                printf("got %s instead of %s\n", p, test[6].digest);
-                err++;
-        } else {
-                printf("test 5 ok\n");
-        }
- test6:
-        HMAC_CTX_cleanup(&ctx);
-        HMAC_CTX_init(&ctx);
-        if (!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) {
-                printf("Failed to initialise HMAC (test 6)\n");
-                err++;
-                goto end;
-        }
-        if (!HMAC_Update(&ctx, test[7].data, test[7].data_len)) {
-                printf("Error updating HMAC with data (test 6)\n");
-                err++;
-                goto end;
-        }
-        if (!HMAC_CTX_copy(&ctx2, &ctx)) {
-                printf("Failed to copy HMAC_CTX (test 6)\n");
-                err++;
-                goto end;
-        }
-        if (!HMAC_Final(&ctx2, buf, &len)) {
-                printf("Error finalising data (test 6)\n");
-                err++;
-                goto end;
-        }
-        p = pt(buf, len);
-        if (strcmp(p, (char *)test[7].digest) != 0) {
-                printf("Error calculating HMAC on test 6\n");
-                printf("got %s instead of %s\n", p, test[7].digest);
-                err++;
-        } else {
-                printf("test 6 ok\n");
-        }
-end:
-        HMAC_CTX_cleanup(&ctx);
-        exit(err);
-        return(0);
-}
-
-#ifndef OPENSSL_NO_MD5
-static char *
-pt(unsigned char *md, unsigned int len)
-{
-        unsigned int i;
-        static char buf[80];
-
-        for (i = 0; i < len; i++)
-                snprintf(buf + i * 2, sizeof(buf) - i * 2, "%02x", md[i]);
-        return(buf);
-}
-#endif
diff --git a/src/regress/lib/libcrypto/idea/Makefile b/src/regress/lib/libcrypto/idea/Makefile
deleted file mode 100644
index b04ff3d2b5..0000000000
--- a/src/regress/lib/libcrypto/idea/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   ideatest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/idea/ideatest.c b/src/regress/lib/libcrypto/idea/ideatest.c
deleted file mode 100644
index b33b824ae7..0000000000
--- a/src/regress/lib/libcrypto/idea/ideatest.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*      $OpenBSD: ideatest.c,v 1.2 2018/07/17 17:06:49 tb Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/idea.h>
-
-unsigned char k[16]={
-        0x00,0x01,0x00,0x02,0x00,0x03,0x00,0x04,
-        0x00,0x05,0x00,0x06,0x00,0x07,0x00,0x08};
-
-unsigned char in[8]={0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x03};
-unsigned char  c[8]={0x11,0xFB,0xED,0x2B,0x01,0x98,0x6D,0xE5};
-unsigned char out[80];
-
-char *text="Hello to all people out there";
-
-static unsigned char cfb_key[16]={
-        0xe1,0xf0,0xc3,0xd2,0xa5,0xb4,0x87,0x96,
-        0x69,0x78,0x4b,0x5a,0x2d,0x3c,0x0f,0x1e,
-        };
-static unsigned char cfb_iv[80]={0x34,0x12,0x78,0x56,0xab,0x90,0xef,0xcd};
-static unsigned char cfb_buf1[40],cfb_buf2[40],cfb_tmp[8];
-#define CFB_TEST_SIZE 24
-static unsigned char plain[CFB_TEST_SIZE]=
-        {
-        0x4e,0x6f,0x77,0x20,0x69,0x73,
-        0x20,0x74,0x68,0x65,0x20,0x74,
-        0x69,0x6d,0x65,0x20,0x66,0x6f,
-        0x72,0x20,0x61,0x6c,0x6c,0x20
-        };
-static unsigned char cfb_cipher64[CFB_TEST_SIZE]={
-        0x59,0xD8,0xE2,0x65,0x00,0x58,0x6C,0x3F,
-        0x2C,0x17,0x25,0xD0,0x1A,0x38,0xB7,0x2A,
-        0x39,0x61,0x37,0xDC,0x79,0xFB,0x9F,0x45
-
-/*      0xF9,0x78,0x32,0xB5,0x42,0x1A,0x6B,0x38,
-        0x9A,0x44,0xD6,0x04,0x19,0x43,0xC4,0xD9,
-        0x3D,0x1E,0xAE,0x47,0xFC,0xCF,0x29,0x0B,*/
-        }; 
-
-static int cfb64_test(unsigned char *cfb_cipher);
-static char *pt(unsigned char *p);
-int main(int argc, char *argv[])
-        {
-        int i,err=0;
-        IDEA_KEY_SCHEDULE key,dkey; 
-        unsigned char iv[8];
-
-        idea_set_encrypt_key(k,&key);
-        idea_ecb_encrypt(in,out,&key);
-        if (memcmp(out,c,8) != 0)
-                {
-                printf("ecb idea error encrypting\n");
-                printf("got     :");
-                for (i=0; i<8; i++)
-                        printf("%02X ",out[i]);
-                printf("\n");
-                printf("expected:");
-                for (i=0; i<8; i++)
-                        printf("%02X ",c[i]);
-                err=20;
-                printf("\n");
-                }
-
-        idea_set_decrypt_key(&key,&dkey);
-        idea_ecb_encrypt(c,out,&dkey);
-        if (memcmp(out,in,8) != 0)
-                {
-                printf("ecb idea error decrypting\n");
-                printf("got     :");
-                for (i=0; i<8; i++)
-                        printf("%02X ",out[i]);
-                printf("\n");
-                printf("expected:");
-                for (i=0; i<8; i++)
-                        printf("%02X ",in[i]);
-                printf("\n");
-                err=3;
-                }
-
-        if (err == 0) printf("ecb idea ok\n");
-
-        memcpy(iv,k,8);
-        idea_cbc_encrypt((unsigned char *)text,out,strlen(text)+1,&key,iv,1);
-        memcpy(iv,k,8);
-        idea_cbc_encrypt(out,out,8,&dkey,iv,0);
-        idea_cbc_encrypt(&(out[8]),&(out[8]),strlen(text)+1-8,&dkey,iv,0);
-        if (memcmp(text,out,strlen(text)+1) != 0)
-                {
-                printf("cbc idea bad\n");
-                err=4;
-                }
-        else
-                printf("cbc idea ok\n");
-
-        printf("cfb64 idea ");
-        if (cfb64_test(cfb_cipher64))
-                {
-                printf("bad\n");
-                err=5;
-                }
-        else
-                printf("ok\n");
-
-        exit(err);
-        }
-
-static int cfb64_test(unsigned char *cfb_cipher)
-        {
-        IDEA_KEY_SCHEDULE eks,dks;
-        int err=0,i,n;
-
-        idea_set_encrypt_key(cfb_key,&eks);
-        idea_set_decrypt_key(&eks,&dks);
-        memcpy(cfb_tmp,cfb_iv,8);
-        n=0;
-        idea_cfb64_encrypt(plain,cfb_buf1,(long)12,&eks,
-                cfb_tmp,&n,IDEA_ENCRYPT);
-        idea_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
-                (long)CFB_TEST_SIZE-12,&eks,
-                cfb_tmp,&n,IDEA_ENCRYPT);
-        if (memcmp(cfb_cipher,cfb_buf1,CFB_TEST_SIZE) != 0)
-                {
-                err=1;
-                printf("idea_cfb64_encrypt encrypt error\n");
-                for (i=0; i<CFB_TEST_SIZE; i+=8)
-                        printf("%s\n",pt(&(cfb_buf1[i])));
-                }
-        memcpy(cfb_tmp,cfb_iv,8);
-        n=0;
-        idea_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,&eks,
-                cfb_tmp,&n,IDEA_DECRYPT);
-        idea_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
-                (long)CFB_TEST_SIZE-17,&dks,
-                cfb_tmp,&n,IDEA_DECRYPT);
-        if (memcmp(plain,cfb_buf2,CFB_TEST_SIZE) != 0)
-                {
-                err=1;
-                printf("idea_cfb_encrypt decrypt error\n");
-                for (i=0; i<24; i+=8)
-                        printf("%s\n",pt(&(cfb_buf2[i])));
-                }
-        return(err);
-        }
-
-static char *pt(unsigned char *p)
-        {
-        static char bufs[10][20];
-        static int bnum=0;
-        char *ret;
-        int i;
-        static char *f="0123456789ABCDEF";
-
-        ret= &(bufs[bnum++][0]);
-        bnum%=10;
-        for (i=0; i<8; i++)
-                {
-                ret[i*2]=f[(p[i]>>4)&0xf];
-                ret[i*2+1]=f[p[i]&0xf];
-                }
-        ret[16]='\0';
-        return(ret);
-        }
diff --git a/src/regress/lib/libcrypto/ige/Makefile b/src/regress/lib/libcrypto/ige/Makefile
deleted file mode 100644
index a0197e059f..0000000000
--- a/src/regress/lib/libcrypto/ige/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   igetest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ige/igetest.c b/src/regress/lib/libcrypto/ige/igetest.c
deleted file mode 100644
index 2191af85b7..0000000000
--- a/src/regress/lib/libcrypto/ige/igetest.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/*      $OpenBSD: igetest.c,v 1.4 2018/07/17 17:06:49 tb Exp $  */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/aes.h>
-
-#define TEST_SIZE       128
-#define BIG_TEST_SIZE 10240
-
-static void hexdump(FILE *f,const char *title,const unsigned char *s,int l)
-    {
-    int n=0;
-
-    fprintf(f,"%s",title);
-    for( ; n < l ; ++n)
-                {
-                if((n%16) == 0)
-                        fprintf(f,"\n%04x",n);
-                fprintf(f," %02x",s[n]);
-                }
-    fprintf(f,"\n");
-    }
-
-#define MAX_VECTOR_SIZE 64
-
-struct ige_test
-        {
-        const unsigned char key[16];
-        const unsigned char iv[32];
-        const unsigned char in[MAX_VECTOR_SIZE];
-        const unsigned char out[MAX_VECTOR_SIZE];
-        const size_t length;
-        const int encrypt;
-        };
-
-static struct ige_test const ige_test_vectors[] = {
-{ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, /* key */
-  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, /* iv */
-  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* in */
-  { 0x1a, 0x85, 0x19, 0xa6, 0x55, 0x7b, 0xe6, 0x52,
-    0xe9, 0xda, 0x8e, 0x43, 0xda, 0x4e, 0xf4, 0x45,
-    0x3c, 0xf4, 0x56, 0xb4, 0xca, 0x48, 0x8a, 0xa3,
-    0x83, 0xc7, 0x9c, 0x98, 0xb3, 0x47, 0x97, 0xcb }, /* out */
-  32, AES_ENCRYPT }, /* test vector 0 */
-
-{ { 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
-    0x61, 0x6e, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65 }, /* key */
-  { 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
-    0x6e, 0x20, 0x6f, 0x66, 0x20, 0x49, 0x47, 0x45,
-    0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x66, 0x6f,
-    0x72, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x53 }, /* iv */
-  { 0x4c, 0x2e, 0x20, 0x4c, 0x65, 0x74, 0x27, 0x73,
-    0x20, 0x68, 0x6f, 0x70, 0x65, 0x20, 0x42, 0x65,
-    0x6e, 0x20, 0x67, 0x6f, 0x74, 0x20, 0x69, 0x74,
-    0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x21, 0x0a }, /* in */
-  { 0x99, 0x70, 0x64, 0x87, 0xa1, 0xcd, 0xe6, 0x13,
-    0xbc, 0x6d, 0xe0, 0xb6, 0xf2, 0x4b, 0x1c, 0x7a,
-    0xa4, 0x48, 0xc8, 0xb9, 0xc3, 0x40, 0x3e, 0x34,
-    0x67, 0xa8, 0xca, 0xd8, 0x93, 0x40, 0xf5, 0x3b }, /* out */
-  32, AES_DECRYPT }, /* test vector 1 */
-};
-
-static int run_test_vectors(void)
-        {
-        unsigned int n;
-        int errs = 0;
-
-        for(n=0 ; n < sizeof(ige_test_vectors)/sizeof(ige_test_vectors[0]) ; ++n)
-                {
-                const struct ige_test * const v = &ige_test_vectors[n];
-                AES_KEY key;
-                unsigned char buf[MAX_VECTOR_SIZE];
-                unsigned char iv[AES_BLOCK_SIZE*2];
-
-                assert(v->length <= MAX_VECTOR_SIZE);
-
-                if(v->encrypt == AES_ENCRYPT)
-                        AES_set_encrypt_key(v->key, 8*sizeof v->key, &key);
-                else
-                        AES_set_decrypt_key(v->key, 8*sizeof v->key, &key);
-                memcpy(iv, v->iv, sizeof iv);
-                AES_ige_encrypt(v->in, buf, v->length, &key, iv, v->encrypt);
-
-                if(memcmp(v->out, buf, v->length))
-                        {
-                        printf("IGE test vector %d failed\n", n);
-                        hexdump(stdout, "key", v->key, sizeof v->key);
-                        hexdump(stdout, "iv", v->iv, sizeof v->iv);
-                        hexdump(stdout, "in", v->in, v->length);
-                        hexdump(stdout, "expected", v->out, v->length);
-                        hexdump(stdout, "got", buf, v->length);
-
-                        ++errs;
-                        }
-
-                /* try with in == out */
-                memcpy(iv, v->iv, sizeof iv);
-                memcpy(buf, v->in, v->length);
-                AES_ige_encrypt(buf, buf, v->length, &key, iv, v->encrypt);
-
-                if(memcmp(v->out, buf, v->length))
-                        {
-                        printf("IGE test vector %d failed (with in == out)\n", n);
-                        hexdump(stdout, "key", v->key, sizeof v->key);
-                        hexdump(stdout, "iv", v->iv, sizeof v->iv);
-                        hexdump(stdout, "in", v->in, v->length);
-                        hexdump(stdout, "expected", v->out, v->length);
-                        hexdump(stdout, "got", buf, v->length);
-
-                        ++errs;
-                        }
-                }
-
-        return errs;
-        }
-
-int main(int argc, char **argv)
-        {
-        unsigned char rkey[16];
-        unsigned char rkey2[16];
-        AES_KEY key;
-        AES_KEY key2;
-        unsigned char plaintext[BIG_TEST_SIZE];
-        unsigned char ciphertext[BIG_TEST_SIZE];
-        unsigned char checktext[BIG_TEST_SIZE];
-        unsigned char iv[AES_BLOCK_SIZE*4];
-        unsigned char saved_iv[AES_BLOCK_SIZE*4];
-        int err = 0;
-        unsigned int n;
-        unsigned matches;
-
-        assert(BIG_TEST_SIZE >= TEST_SIZE);
-
-        arc4random_buf(rkey, sizeof(rkey));
-        arc4random_buf(plaintext, sizeof(plaintext));
-        arc4random_buf(iv, sizeof(iv));
-        memcpy(saved_iv, iv, sizeof(saved_iv));
-
-        /* Forward IGE only... */
-
-        /* Straight encrypt/decrypt */
-        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
-        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, iv,
-                                        AES_ENCRYPT);
-
-        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
-        memcpy(iv, saved_iv, sizeof iv);
-        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, iv,
-                                        AES_DECRYPT);
-
-        if(memcmp(checktext, plaintext, TEST_SIZE))
-                {
-                printf("Encrypt+decrypt doesn't match\n");
-                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
-                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
-                ++err;
-                }
-
-        /* Now check encrypt chaining works */
-        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
-        memcpy(iv, saved_iv, sizeof iv);
-        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE/2, &key, iv,
-                                        AES_ENCRYPT);
-        AES_ige_encrypt(plaintext+TEST_SIZE/2,
-                                        ciphertext+TEST_SIZE/2, TEST_SIZE/2,
-                                        &key, iv, AES_ENCRYPT);
-
-        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
-        memcpy(iv, saved_iv, sizeof iv);
-        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, iv,
-                                        AES_DECRYPT);
-
-        if(memcmp(checktext, plaintext, TEST_SIZE))
-                {
-                printf("Chained encrypt+decrypt doesn't match\n");
-                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
-                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
-                ++err;
-                }
-
-        /* And check decrypt chaining */
-        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
-        memcpy(iv, saved_iv, sizeof iv);
-        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE/2, &key, iv,
-                                        AES_ENCRYPT);
-        AES_ige_encrypt(plaintext+TEST_SIZE/2,
-                                        ciphertext+TEST_SIZE/2, TEST_SIZE/2,
-                                        &key, iv, AES_ENCRYPT);
-
-        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
-        memcpy(iv, saved_iv, sizeof iv);
-        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE/2, &key, iv,
-                                        AES_DECRYPT);
-        AES_ige_encrypt(ciphertext+TEST_SIZE/2,
-                                        checktext+TEST_SIZE/2, TEST_SIZE/2, &key, iv,
-                                        AES_DECRYPT);
-
-        if(memcmp(checktext, plaintext, TEST_SIZE))
-                {
-                printf("Chained encrypt+chained decrypt doesn't match\n");
-                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
-                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
-                ++err;
-                }
-
-        /* make sure garble extends forwards only */
-        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
-        memcpy(iv, saved_iv, sizeof iv);
-        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
-                                        AES_ENCRYPT);
-
-        /* corrupt halfway through */
-        ++ciphertext[sizeof ciphertext/2];
-        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
-        memcpy(iv, saved_iv, sizeof iv);
-        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
-                                        AES_DECRYPT);
-
-        matches=0;
-        for(n=0 ; n < sizeof checktext ; ++n)
-                if(checktext[n] == plaintext[n])
-                        ++matches;
-
-        if(matches > sizeof checktext/2+sizeof checktext/100)
-                {
-                printf("More than 51%% matches after garbling\n");
-                ++err;
-                }
-
-        if(matches < sizeof checktext/2)
-                {
-                printf("Garble extends backwards!\n");
-                ++err;
-                }
-
-        /* make sure garble extends both ways */
-        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
-        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
-        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
-                                        AES_ENCRYPT);
-
-        /* corrupt halfway through */
-        ++ciphertext[sizeof ciphertext/2];
-        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
-        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
-        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
-                                        AES_DECRYPT);
-
-        matches=0;
-        for(n=0 ; n < sizeof checktext ; ++n)
-                if(checktext[n] == plaintext[n])
-                        ++matches;
-
-        if(matches > sizeof checktext/100)
-                {
-                printf("More than 1%% matches after bidirectional garbling\n");
-                ++err;
-                }
-
-        /* make sure garble extends both ways (2) */
-        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
-        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
-        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
-                                        AES_ENCRYPT);
-
-        /* corrupt right at the end */
-        ++ciphertext[sizeof ciphertext-1];
-        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
-        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
-        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
-                                        AES_DECRYPT);
-
-        matches=0;
-        for(n=0 ; n < sizeof checktext ; ++n)
-                if(checktext[n] == plaintext[n])
-                        ++matches;
-
-        if(matches > sizeof checktext/100)
-                {
-                printf("More than 1%% matches after bidirectional garbling (2)\n");
-                ++err;
-                }
-
-        /* make sure garble extends both ways (3) */
-        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
-        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
-        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
-                                        AES_ENCRYPT);
-
-        /* corrupt right at the start */
-        ++ciphertext[0];
-        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
-        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
-        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
-                                        AES_DECRYPT);
-
-        matches=0;
-        for(n=0 ; n < sizeof checktext ; ++n)
-                if(checktext[n] == plaintext[n])
-                        ++matches;
-
-        if(matches > sizeof checktext/100)
-                {
-                printf("More than 1%% matches after bidirectional garbling (3)\n");
-                ++err;
-                }
-
-        err += run_test_vectors();
-
-        return err;
-        }
diff --git a/src/regress/lib/libcrypto/init/Makefile b/src/regress/lib/libcrypto/init/Makefile
deleted file mode 100644
index 33b0a2aa76..0000000000
--- a/src/regress/lib/libcrypto/init/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2018/03/19 14:34:33 beck Exp $
-PROG=   init_pledge
-SRCS+=  init_pledge.c
-NOMAN=  yes
-
-LDADD+=         -lcrypto -lutil
-CFLAGS+=        -Wall -Werror
-
-REGRESS_TARGETS+=       test_normal
-
-test_normal: ${PROG}
-        ./${PROG} 
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/init/init_pledge.c b/src/regress/lib/libcrypto/init/init_pledge.c
deleted file mode 100644
index 76f5668ab8..0000000000
--- a/src/regress/lib/libcrypto/init/init_pledge.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*      $OpenBSD: init_pledge.c,v 1.1 2018/03/19 14:34:33 beck Exp $ */
-
-/*
- * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/err.h>
-
-#include <stdio.h>
-#include <unistd.h>
-
-
-int
-main (int argc, char *argv[])
-{
-        pledge("stdio", NULL);
-
-        ERR_load_ERR_strings();
-        printf("[SUCCESS] - crypto autoinit is pledge(\"stdio\") safe\n");
-
-        exit(0);
-}
diff --git a/src/regress/lib/libcrypto/md4/Makefile b/src/regress/lib/libcrypto/md4/Makefile
deleted file mode 100644
index ddb4acf2d1..0000000000
--- a/src/regress/lib/libcrypto/md4/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.5 2015/09/14 01:45:03 doug Exp $
-
-PROG=   md4test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/md4/md4test.c b/src/regress/lib/libcrypto/md4/md4test.c
deleted file mode 100644
index 7279e40f16..0000000000
--- a/src/regress/lib/libcrypto/md4/md4test.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*      $OpenBSD: md4test.c,v 1.4 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/evp.h>
-#include <openssl/md4.h>
-
-static char *test[]={
-        "",
-        "a",
-        "abc",
-        "message digest",
-        "abcdefghijklmnopqrstuvwxyz",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-        NULL,
-        };
-
-static char *ret[]={
-"31d6cfe0d16ae931b73c59d7e0c089c0",
-"bde52cb31de33e46245e05fbdbd6fb24",
-"a448017aaf21d8525fc10ae87aa6729d",
-"d9130a8164549fe818874806e1c7014b",
-"d79e1c308aa5bbcdeea8ed63df412da9",
-"043f8582f241db351ce627e153e7f0e4",
-"e33b4ddc9c38f2199c3e7b164fcc0536",
-};
-
-static char *pt(unsigned char *md);
-int main(int argc, char *argv[])
-        {
-        int i,err=0;
-        char **P,**R;
-        char *p;
-        unsigned char md[MD4_DIGEST_LENGTH];
-
-        P=test;
-        R=ret;
-        i=1;
-        while (*P != NULL)
-                {
-                EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md4(), NULL);
-                p=pt(md);
-                if (strcmp(p,(char *)*R) != 0)
-                        {
-                        printf("error calculating MD4 on '%s'\n",*P);
-                        printf("got %s instead of %s\n",p,*R);
-                        err++;
-                        }
-                else
-                        printf("test %d ok\n",i);
-                i++;
-                R++;
-                P++;
-                }
-        exit(err);
-        }
-
-static char *pt(unsigned char *md)
-        {
-        int i;
-        static char buf[80];
-
-        for (i=0; i<MD4_DIGEST_LENGTH; i++)
-                snprintf(buf + i*2, sizeof(buf) - i*2, "%02x",md[i]);
-        return(buf);
-        }
diff --git a/src/regress/lib/libcrypto/md5/Makefile b/src/regress/lib/libcrypto/md5/Makefile
deleted file mode 100644
index d620dfa48a..0000000000
--- a/src/regress/lib/libcrypto/md5/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:52 jsing Exp $
-
-PROG=   md5test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/md5/md5test.c b/src/regress/lib/libcrypto/md5/md5test.c
deleted file mode 100644
index 92b1b4a273..0000000000
--- a/src/regress/lib/libcrypto/md5/md5test.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*      $OpenBSD: md5test.c,v 1.2 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/evp.h>
-#include <openssl/md5.h>
-
-static char *test[]={
-        "",
-        "a",
-        "abc",
-        "message digest",
-        "abcdefghijklmnopqrstuvwxyz",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-        NULL,
-        };
-
-static char *ret[]={
-        "d41d8cd98f00b204e9800998ecf8427e",
-        "0cc175b9c0f1b6a831c399e269772661",
-        "900150983cd24fb0d6963f7d28e17f72",
-        "f96b697d7cb7938d525a2f31aaf161d0",
-        "c3fcd3d76192e4007dfb496cca67e13b",
-        "d174ab98d277d9f5a5611c2c9f419d9f",
-        "57edf4a22be3c955ac49da2e2107b67a",
-        };
-
-static char *pt(unsigned char *md);
-int main(int argc, char *argv[])
-        {
-        int i,err=0;
-        char **P,**R;
-        char *p;
-        unsigned char md[MD5_DIGEST_LENGTH];
-
-        P=test;
-        R=ret;
-        i=1;
-        while (*P != NULL)
-                {
-                EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_md5(), NULL);
-                p=pt(md);
-                if (strcmp(p,(char *)*R) != 0)
-                        {
-                        printf("error calculating MD5 on '%s'\n",*P);
-                        printf("got %s instead of %s\n",p,*R);
-                        err++;
-                        }
-                else
-                        printf("test %d ok\n",i);
-                i++;
-                R++;
-                P++;
-                }
-
-        exit(err);
-        }
-
-static char *pt(unsigned char *md)
-        {
-        int i;
-        static char buf[80];
-
-        for (i=0; i<MD5_DIGEST_LENGTH; i++)
-                snprintf(buf + i*2, sizeof(buf) - i*2, "%02x",md[i]);
-        return(buf);
-        }
diff --git a/src/regress/lib/libcrypto/ocsp/Makefile b/src/regress/lib/libcrypto/ocsp/Makefile
deleted file mode 100644
index 62fb985647..0000000000
--- a/src/regress/lib/libcrypto/ocsp/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2016/11/05 12:45:25 miod Exp $
-
-REGRESS_TARGETS= all_tests
-
-PROG=           ocsp_test
-LDADD=          -lcrypto -lssl
-DPADD=          ${LIBCRYPTO} ${LIBSSL}
-WARNINGS=       Yes
-LDFLAGS+=       -lcrypto -lssl
-CFLAGS+=        -DLIBRESSL_INTERNAL -Wall -Wundef -Werror
-
-all_tests: ${PROG}
-        ${.OBJDIR}/${PROG} www.amazon.com 443
-        ${.OBJDIR}/${PROG} cloudflare.com 443
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/ocsp/ocsp_test.c b/src/regress/lib/libcrypto/ocsp/ocsp_test.c
deleted file mode 100644
index 5914729828..0000000000
--- a/src/regress/lib/libcrypto/ocsp/ocsp_test.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*      $OpenBSD: ocsp_test.c,v 1.6 2018/07/18 16:24:16 tb Exp $        */
-/*
- * Copyright (c) 2016 Bob Beck <beck@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdio.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <err.h>
-#include <sys/socket.h>
-
-#include <openssl/ssl.h>
-#include <openssl/ocsp.h>
-
-static int
-tcp_connect(char *host, char *port)
-{
-        int error, sd = -1;
-        struct addrinfo hints, *res, *r;
-
-        memset(&hints, 0, sizeof(struct addrinfo));
-        hints.ai_family = AF_INET;
-        hints.ai_socktype = SOCK_STREAM;
-
-        error = getaddrinfo(host, port, &hints, &res);
-        if (error != 0) {
-                perror("getaddrinfo()");
-                exit(-1);
-        }
-
-        for (r = res; r != NULL; r = r->ai_next) {
-                sd = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
-                if (sd == -1)
-                        continue;
-
-                if (connect(sd, r->ai_addr, r->ai_addrlen) == 0)
-                        break;
-
-                close(sd);
-        }
-
-        freeaddrinfo(res);
-
-        return sd;
-}
-
-int
-main(int argc, char *argv[])
-{
-        int sd, ocsp_status;
-        const unsigned char *p;
-        long len;
-        OCSP_RESPONSE *rsp = NULL;
-        OCSP_BASICRESP *br = NULL;
-        X509_STORE     *st = NULL;
-        STACK_OF(X509) *ch = NULL;
-        char *host, *port;
-#ifdef _PATH_SSL_CA_FILE
-        char *cafile = _PATH_SSL_CA_FILE;
-#else
-        char *cafile = "/etc/ssl/cert.pem";
-#endif
-
-        SSL *ssl;
-        SSL_CTX *ctx;
-
-        SSL_library_init();
-        SSL_load_error_strings();
-
-        ctx = SSL_CTX_new(SSLv23_client_method());
-
-        if (!SSL_CTX_load_verify_locations(ctx, cafile, NULL)) {
-                printf("failed to load %s\n", cafile);
-                exit(-1);
-        }
-
-        if (argc != 3)
-                errx(-1, "need a host and port to connect to");
-        else {
-                host = argv[1];
-                port = argv[2];
-        }
-
-        sd = tcp_connect(host, port);
-
-        ssl = SSL_new(ctx);
-
-        SSL_set_fd(ssl, (int) sd);
-        SSL_set_tlsext_status_type(ssl, TLSEXT_STATUSTYPE_ocsp);
-
-        if (SSL_connect(ssl) <= 0) {
-                printf("SSL connect error\n");
-                exit(-1);
-        }
-
-        if (SSL_get_verify_result(ssl) != X509_V_OK) {
-                printf("Certificate doesn't verify from host %s port %s\n", host, port);
-                exit(-1);
-        }
-
-        /* ==== VERIFY OCSP RESPONSE ==== */
-
-
-        len = SSL_get_tlsext_status_ocsp_resp(ssl, &p);
-
-        if (!p) {
-                printf("No OCSP response received for %s port %s\n", host, port);
-                exit(-1);
-        }
-
-        rsp = d2i_OCSP_RESPONSE(NULL, &p, len);
-        if (!rsp) {
-                puts("Invalid OCSP response");
-                exit(-1);
-        }
-
-        ocsp_status = OCSP_response_status(rsp);
-        if (ocsp_status != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
-                printf("Invalid OCSP response status: %s (%d)",
-                       OCSP_response_status_str(ocsp_status), ocsp_status);
-                exit(-1);
-        }
-
-        br = OCSP_response_get1_basic(rsp);
-        if (!br) {
-                puts("Invalid OCSP response");
-                exit(-1);
-        }
-
-        ch = SSL_get_peer_cert_chain(ssl);
-        st = SSL_CTX_get_cert_store(ctx);
-
-        if (OCSP_basic_verify(br, ch, st, 0) <= 0) {
-                puts("OCSP response verification failed");
-                exit(-1);
-        }
-
-        printf("OCSP validated from %s %s\n", host, port);
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/pbkdf2/Makefile b/src/regress/lib/libcrypto/pbkdf2/Makefile
deleted file mode 100644
index 7f39430aa3..0000000000
--- a/src/regress/lib/libcrypto/pbkdf2/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/07/11 20:37:59 miod Exp $
-
-PROG=   pbkdf2
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/pbkdf2/pbkdf2.c b/src/regress/lib/libcrypto/pbkdf2/pbkdf2.c
deleted file mode 100644
index 9cbc031821..0000000000
--- a/src/regress/lib/libcrypto/pbkdf2/pbkdf2.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*      $OpenBSD: pbkdf2.c,v 1.2 2018/07/17 17:06:49 tb Exp $   */
-/* Written by Christian Heimes, 2013 */
-/*
- * Copyright (c) 2013 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include <openssl/opensslconf.h>
-#include <openssl/evp.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/err.h>
-#include <openssl/conf.h>
-
-typedef struct {
-        const char *pass;
-        int passlen;
-        const char *salt;
-        int saltlen;
-        int iter;
-} testdata;
-
-static const testdata test_cases[] = {
-        {"password", 8, "salt", 4, 1},
-        {"password", 8, "salt", 4, 2},
-        {"password", 8, "salt", 4, 4096},
-        {"passwordPASSWORDpassword", 24,
-         "saltSALTsaltSALTsaltSALTsaltSALTsalt", 36, 4096},
-        {"pass\0word", 9, "sa\0lt", 5, 4096},
-        {NULL},
-};
-
-static const char *sha1_results[] = {
-        "0c60c80f961f0e71f3a9b524af6012062fe037a6",
-        "ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957",
-        "4b007901b765489abead49d926f721d065a429c1",
-        "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038",
-        "56fa6aa75548099dcc37d7f03425e0c3",
-};
-
-static const char *sha256_results[] = {
-        "120fb6cffcf8b32c43e7225256c4f837a86548c92ccc35480805987cb70be17b",
-        "ae4d0c95af6b46d32d0adff928f06dd02a303f8ef3c251dfd6e2d85a95474c43",
-        "c5e478d59288c841aa530db6845c4c8d962893a001ce4e11a4963873aa98134a",
-        "348c89dbcbd32b2f32d814b8116e84cf2b17347ebc1800181c4e2a1fb8dd53e1c63551"
-                "8c7dac47e9",
-        "89b69d0516f829893c696226650a8687",
-};
-
-static const char *sha512_results[] = {
-        "867f70cf1ade02cff3752599a3a53dc4af34c7a669815ae5d513554e1c8cf252c02d47"
-                "0a285a0501bad999bfe943c08f050235d7d68b1da55e63f73b60a57fce",
-        "e1d9c16aa681708a45f5c7c4e215ceb66e011a2e9f0040713f18aefdb866d53cf76cab"
-                "2868a39b9f7840edce4fef5a82be67335c77a6068e04112754f27ccf4e",
-        "d197b1b33db0143e018b12f3d1d1479e6cdebdcc97c5c0f87f6902e072f457b5143f30"
-                "602641b3d55cd335988cb36b84376060ecd532e039b742a239434af2d5",
-        "8c0511f4c6e597c6ac6315d8f0362e225f3c501495ba23b868c005174dc4ee71115b59"
-                "f9e60cd9532fa33e0f75aefe30225c583a186cd82bd4daea9724a3d3b8",
-        "9d9e9c4cd21fe4be24d5b8244c759665",
-};
-
-static void
-hexdump(FILE *f, const char *title, const unsigned char *s, size_t len)
-{
-        fprintf(f, "%s", title);
-        for (; len != 0; len--)
-                fprintf(f, " 0x%02x", *(s++));
-        fprintf(f, "\n");
-}
-
-static int
-convert(unsigned char *dst, const unsigned char *src, size_t len)
-{
-        unsigned int n;
-
-        for (; len != 0; src += 2, len--) {
-                if (sscanf((char *)src, "%2x", &n) != 1)
-                        return EINVAL;
-                *dst++ = (unsigned char)n;
-        }
-        return 0;
-}
-
-static void
-test_p5_pbkdf2(unsigned int n, const char *digestname, const testdata *test,
-    const char *hex)
-{
-        const EVP_MD *digest;
-        unsigned char *out;
-        unsigned char *expected;
-        size_t keylen;
-        int r;
-
-        digest = EVP_get_digestbyname(digestname);
-        if (digest == NULL) {
-                fprintf(stderr, "unknown digest %s\n", digestname);
-                exit(5);
-        }
-
-        keylen = strlen(hex);
-        if ((keylen % 2) != 0) {
-                fprintf(stderr, "odd hex string %s, digest %u\n", digestname, n);
-                exit(5);
-        }
-        keylen /= 2;
-        expected = malloc(keylen);
-        out = malloc(keylen);
-        if (expected == NULL || out == NULL) {
-                fprintf(stderr, "malloc() failed\n");
-                exit(5);
-        }
-        if (convert(expected, (const unsigned char *)hex, keylen) != 0) {
-                fprintf(stderr, "invalid hex string %s, digest %u\n", hex, n);
-                exit(5);
-        }
-
-        r = PKCS5_PBKDF2_HMAC(test->pass, test->passlen,
-            (const unsigned char *)test->salt, test->saltlen,
-            test->iter, digest, keylen, out);
-
-        if (r == 0) {
-                fprintf(stderr, "PKCS5_PBKDF2_HMAC(%s) failure test %u\n",
-                    digestname, n);
-                exit(3);
-        }
-        if (memcmp(expected, out, keylen) != 0) {
-                fprintf(stderr,
-                    "Wrong result for PKCS5_PBKDF2_HMAC(%s) test %u\n",
-                    digestname, n);
-                hexdump(stderr, "expected: ", expected, keylen);
-                hexdump(stderr, "result:   ", out, keylen);
-                exit(2);
-        }
-        free(expected);
-        free(out);
-}
-
-int
-main(int argc,char **argv)
-{
-        unsigned int n;
-        const testdata *test = test_cases;
-
-        OpenSSL_add_all_digests();
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE_load_builtin_engines();
-        ENGINE_register_all_digests();
-#endif
-
-        for (n = 0; test->pass != NULL; n++, test++) {
-                test_p5_pbkdf2(n, "sha1", test, sha1_results[n]);
-                test_p5_pbkdf2(n, "sha256", test, sha256_results[n]);
-                test_p5_pbkdf2(n, "sha512", test, sha512_results[n]);
-        }
-
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE_cleanup();
-#endif
-        EVP_cleanup();
-        CRYPTO_cleanup_all_ex_data();
-        ERR_remove_thread_state(NULL);
-        ERR_free_strings();
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/pkcs7/Makefile b/src/regress/lib/libcrypto/pkcs7/Makefile
deleted file mode 100644
index aceb169e16..0000000000
--- a/src/regress/lib/libcrypto/pkcs7/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   pkcs7test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/pkcs7/pkcs7test.c b/src/regress/lib/libcrypto/pkcs7/pkcs7test.c
deleted file mode 100644
index 5548307375..0000000000
--- a/src/regress/lib/libcrypto/pkcs7/pkcs7test.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*      $OpenBSD: pkcs7test.c,v 1.3 2014/11/26 05:48:00 bcook Exp $     */
-/*
- * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/pkcs7.h>
-#include <openssl/x509.h>
-
-const char certificate[] = "\
------BEGIN CERTIFICATE----- \n\
-MIIDpTCCAo2gAwIBAgIJAPYm3GvOr5eTMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV \n\
-BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT \n\
-VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt \n\
-ZWRpYXRlIENBMB4XDTE0MDUyNDE0NDUxMVoXDTI0MDQwMTE0NDUxMVowZDELMAkG \n\
-A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU \n\
-RVNUSU5HIFBVUlBPU0VTIE9OTFkxGTAXBgNVBAMMEFRlc3QgQ2xpZW50IENlcnQw \n\
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0ranbHRLcLVqN+0BzcZpY \n\
-+yOLqxzDWT1LD9eW1stC4NzXX9/DCtSIVyN7YIHdGLrIPr64IDdXXaMRzgZ2rOKs \n\
-lmHCAiFpO/ja99gGCJRxH0xwQatqAULfJVHeUhs7OEGOZc2nWifjqKvGfNTilP7D \n\
-nwi69ipQFq9oS19FmhwVHk2wg7KZGHI1qDyG04UrfCZMRitvS9+UVhPpIPjuiBi2 \n\
-x3/FZIpL5gXJvvFK6xHY63oq2asyzBATntBgnP4qJFWWcvRx24wF1PnZabxuVoL2 \n\
-bPnQ/KvONDrw3IdqkKhYNTul7jEcu3OlcZIMw+7DiaKJLAzKb/bBF5gm/pwW6As9 \n\
-AgMBAAGjTjBMMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXgMCwGCWCGSAGG \n\
-+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTANBgkqhkiG9w0B \n\
-AQUFAAOCAQEAJzA4KTjkjXGSC4He63yX9Br0DneGBzjAwc1H6f72uqnCs8m7jgkE \n\
-PQJFdTzQUKh97QPUuayZ2gl8XHagg+iWGy60Kw37gQ0+lumCN2sllvifhHU9R03H \n\
-bWtS4kue+yQjMbrzf3zWygMDgwvFOUAIgBpH9qGc+CdNu97INTYd0Mvz51vLlxRn \n\
-sC5aBYCWaZFnw3lWYxf9eVFRy9U+DkYFqX0LpmbDtcKP7AZGE6ZwSzaim+Cnoz1u \n\
-Cgn+QmpFXgJKMFIZ82iSZISn+JkCCGxctZX1lMvai4Wi8Y0HxW9FTFZ6KBNwwE4B \n\
-zjbN/ehBkgLlW/DWfi44DvwUHmuU6QP3cw== \n\
------END CERTIFICATE----- \n\
-";
-
-const char private_key[] = "\
------BEGIN RSA PRIVATE KEY----- \n\
-MIIEpQIBAAKCAQEAtK2p2x0S3C1ajftAc3GaWPsji6scw1k9Sw/XltbLQuDc11/f \n\
-wwrUiFcje2CB3Ri6yD6+uCA3V12jEc4GdqzirJZhwgIhaTv42vfYBgiUcR9McEGr \n\
-agFC3yVR3lIbOzhBjmXNp1on46irxnzU4pT+w58IuvYqUBavaEtfRZocFR5NsIOy \n\
-mRhyNag8htOFK3wmTEYrb0vflFYT6SD47ogYtsd/xWSKS+YFyb7xSusR2Ot6Ktmr \n\
-MswQE57QYJz+KiRVlnL0cduMBdT52Wm8blaC9mz50PyrzjQ68NyHapCoWDU7pe4x \n\
-HLtzpXGSDMPuw4miiSwMym/2wReYJv6cFugLPQIDAQABAoIBAAZOyc9MhIwLSU4L \n\
-p4RgQvM4UVVe8/Id+3XTZ8NsXExJbWxXfIhiqGjaIfL8u4vsgRjcl+v1s/jo2/iT \n\
-KMab4o4D8gXD7UavQVDjtjb/ta79WL3SjRl2Uc9YjjMkyq6WmDNQeo2NKDdafCTB \n\
-1uzSJtLNipB8Z53ELPuHJhxX9QMHrMnuha49riQgXZ7buP9iQrHJFhImBjSzbxJx \n\
-L+TI6rkyLSf9Wi0Pd3L27Ob3QWNfNRYNSeTE+08eSRChkur5W0RuXAcuAICdQlCl \n\
-LBvWO/LmmvbzCqiDcgy/TliSb6CGGwgiNG7LJZmlkYNj8laGwalNlYZs3UrVv6NO \n\
-Br2loAECgYEA2kvCvPGj0Dg/6g7WhXDvAkEbcaL1tSeCxBbNH+6HS2UWMWvyTtCn \n\
-/bbD519QIdkvayy1QjEf32GV/UjUVmlULMLBcDy0DGjtL3+XpIhLKWDNxN1v1/ai \n\
-1oz23ZJCOgnk6K4qtFtlRS1XtynjA+rBetvYvLP9SKeFrnpzCgaA2r0CgYEA0+KX \n\
-1ACXDTNH5ySX3kMjSS9xdINf+OOw4CvPHFwbtc9aqk2HePlEsBTz5I/W3rKwXva3 \n\
-NqZ/bRqVVeZB/hHKFywgdUQk2Uc5z/S7Lw70/w1HubNTXGU06Ngb6zOFAo/o/TwZ \n\
-zTP1BMIKSOB6PAZPS3l+aLO4FRIRotfFhgRHOoECgYEAmiZbqt8cJaJDB/5YYDzC \n\
-mp3tSk6gIb936Q6M5VqkMYp9pIKsxhk0N8aDCnTU+kIK6SzWBpr3/d9Ecmqmfyq7 \n\
-5SvWO3KyVf0WWK9KH0abhOm2BKm2HBQvI0DB5u8sUx2/hsvOnjPYDISbZ11t0MtK \n\
-u35Zy89yMYcSsIYJjG/ROCUCgYEAgI2P9G5PNxEP5OtMwOsW84Y3Xat/hPAQFlI+ \n\
-HES+AzbFGWJkeT8zL2nm95tVkFP1sggZ7Kxjz3w7cpx7GX0NkbWSE9O+T51pNASV \n\
-tN1sQ3p5M+/a+cnlqgfEGJVvc7iAcXQPa3LEi5h2yPR49QYXAgG6cifn3dDSpmwn \n\
-SUI7PQECgYEApGCIIpSRPLAEHTGmP87RBL1smurhwmy2s/pghkvUkWehtxg0sGHh \n\
-kuaqDWcskogv+QC0sVdytiLSz8G0DwcEcsHK1Fkyb8A+ayiw6jWJDo2m9+IF4Fww \n\
-1Te6jFPYDESnbhq7+TLGgHGhtwcu5cnb4vSuYXGXKupZGzoLOBbv1Zw= \n\
------END RSA PRIVATE KEY----- \n\
-";
-
-const char message[] = "\
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do \r\n\
-eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut   \r\n\
-enim ad minim veniam, quis nostrud exercitation ullamco laboris  \r\n\
-nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor   \r\n\
-in reprehenderit in voluptate velit esse cillum dolore eu fugiat \r\n\
-nulla pariatur. Excepteur sint occaecat cupidatat non proident,  \r\n\
-sunt in culpa qui officia deserunt mollit anim id est laborum.   \r\n\
-";
-
-static int
-x509_store_callback(int ok, X509_STORE_CTX *ctx)
-{
-        /* Pretend the certificate issuer is valid... */
-        return 1;
-}
-
-static void
-fatal(const char *msg)
-{
-        warnx("%s", msg);
-        ERR_print_errors(BIO_new_fd(STDERR_FILENO, 0));
-        exit(1);
-}
-
-static void
-message_compare(const char *out, size_t len)
-{
-        if (len != sizeof(message)) {
-                fprintf(stderr, "FAILURE: length mismatch (%zu != %zu)\n",
-                    len, sizeof(message));
-                exit(1);
-        }
-        if (memcmp(out, message, len) != 0) {
-                fprintf(stderr, "FAILURE: message mismatch\n");
-                fprintf(stderr, "Got:\n%s\n", out);
-                fprintf(stderr, "Want:\n%s\n", message);
-                exit(1);
-        }
-}
-
-int
-main(int argc, char **argv)
-{
-        BIO *bio_in, *bio_content, *bio_out, *bio_cert, *bio_pkey;
-        STACK_OF(X509) *certs;
-        const EVP_CIPHER *cipher;
-        EVP_PKEY *pkey;
-        X509_STORE *store;
-        X509 *cert;
-        PKCS7 *p7;
-        size_t len;
-        char *out;
-        int flags;
-
-        ERR_load_crypto_strings();
-        OpenSSL_add_all_algorithms();
-
-        /*
-         * A bunch of setup...
-         */
-        cipher = EVP_aes_256_cbc();
-        if (cipher == NULL)
-                fatal("cipher");
-
-        certs = sk_X509_new_null();
-        if (certs == NULL)
-                fatal("sk_X509_new_null");
-
-        bio_cert = BIO_new_mem_buf((char *)certificate, sizeof(certificate));
-        if (bio_cert == NULL)
-                fatal("BIO_new_mem_buf certificate");
-
-        cert = PEM_read_bio_X509_AUX(bio_cert, NULL, NULL, NULL);
-        if (cert == NULL)
-                fatal("PEM_read_bio_X509_AUX");
-        sk_X509_push(certs, cert);
-
-        store = X509_STORE_new();
-        if (store == NULL)
-                fatal("X509_STORE_new");
-        X509_STORE_set_verify_cb(store, x509_store_callback);
-
-        bio_pkey = BIO_new_mem_buf((char *)private_key, sizeof(private_key));
-        if (bio_pkey == NULL)
-                fatal("BIO_new_mem_buf private_key");
-
-        pkey = PEM_read_bio_PrivateKey(bio_pkey, NULL, NULL, NULL);
-        if (pkey == NULL)
-                fatal("PEM_read_bio_PrivateKey");
-
-        bio_content = BIO_new_mem_buf((char *)message, sizeof(message));
-        if (bio_content == NULL)
-                fatal("BIO_new_mem_buf message");
-
-        /*
-         * Encrypt and then decrypt.
-         */
-        if (BIO_reset(bio_content) != 1)
-                fatal("BIO_reset");
-        bio_out = BIO_new(BIO_s_mem());
-        if (bio_out == NULL)
-                fatal("BIO_new");
-
-        p7 = PKCS7_encrypt(certs, bio_content, cipher, 0);
-        if (p7 == NULL)
-                fatal("PKCS7_encrypt");
-        if (PEM_write_bio_PKCS7(bio_out, p7) != 1)
-                fatal("PEM_write_bio_PKCS7");
-        PKCS7_free(p7);
-
-        bio_in = bio_out;
-        bio_out = BIO_new(BIO_s_mem());
-        if (bio_out == NULL)
-                fatal("BIO_new");
-
-        p7 = PEM_read_bio_PKCS7(bio_in, NULL, NULL, NULL);
-        if (p7 == NULL)
-                fatal("PEM_read_bio_PKCS7");
-        if (PKCS7_decrypt(p7, pkey, cert, bio_out, 0) != 1)
-                fatal("PKCS7_decrypt");
-
-        len = BIO_get_mem_data(bio_out, &out);
-        message_compare(out, len);
-
-        BIO_free(bio_out);
-
-        /*
-         * Sign and then verify.
-         */
-        if (BIO_reset(bio_content) != 1)
-                fatal("BIO_reset");
-        bio_out = BIO_new(BIO_s_mem());
-        if (bio_out == NULL)
-                fatal("BIO_new");
-
-        p7 = PKCS7_sign(cert, pkey, certs, bio_content, 0);
-        if (p7 == NULL)
-                fatal("PKCS7_sign");
-        if (PEM_write_bio_PKCS7(bio_out, p7) != 1)
-                fatal("PEM_write_bio_PKCS7");
-        PKCS7_free(p7);
-
-        bio_in = bio_out;
-        bio_out = BIO_new(BIO_s_mem());
-        if (bio_out == NULL)
-                fatal("BIO_new");
-
-        p7 = PEM_read_bio_PKCS7(bio_in, NULL, NULL, NULL);
-        if (p7 == NULL)
-                fatal("PEM_read_bio_PKCS7");
-        if (PKCS7_verify(p7, certs, store, NULL, bio_out, 0) != 1)
-                fatal("PKCS7_verify");
-
-        len = BIO_get_mem_data(bio_out, &out);
-        message_compare(out, len);
-
-        BIO_free(bio_in);
-        BIO_free(bio_out);
-
-        /*
-         * Sign and then verify with a detached signature.
-         */
-        if (BIO_reset(bio_content) != 1)
-                fatal("BIO_reset");
-        bio_out = BIO_new(BIO_s_mem());
-        if (bio_out == NULL)
-                fatal("BIO_new");
-
-        flags = PKCS7_DETACHED|PKCS7_PARTIAL;
-        p7 = PKCS7_sign(NULL, NULL, NULL, bio_content, flags);
-        if (p7 == NULL)
-                fatal("PKCS7_sign");
-        if (PKCS7_sign_add_signer(p7, cert, pkey, NULL, flags) == NULL)
-                fatal("PKCS7_sign_add_signer");
-        if (PKCS7_final(p7, bio_content, flags) != 1)
-                fatal("PKCS7_final");
-        if (PEM_write_bio_PKCS7(bio_out, p7) != 1)
-                fatal("PEM_write_bio_PKCS7");
-        PKCS7_free(p7);
-
-        /* bio_out contains only the detached signature. */
-        bio_in = bio_out;
-        if (BIO_reset(bio_content) != 1)
-                fatal("BIO_reset");
-
-        bio_out = BIO_new(BIO_s_mem());
-        if (bio_out == NULL)
-                fatal("BIO_new");
-
-        p7 = PEM_read_bio_PKCS7(bio_in, NULL, NULL, NULL);
-        if (p7 == NULL)
-                fatal("PEM_read_bio_PKCS7");
-        if (PKCS7_verify(p7, certs, store, bio_content, bio_out, flags) != 1)
-                fatal("PKCS7_verify");
-
-        len = BIO_get_mem_data(bio_out, &out);
-        message_compare(out, len);
-
-        BIO_free(bio_in);
-        BIO_free(bio_out);
-        BIO_free(bio_content);
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/poly1305/Makefile b/src/regress/lib/libcrypto/poly1305/Makefile
deleted file mode 100644
index 4e3096c2cd..0000000000
--- a/src/regress/lib/libcrypto/poly1305/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   poly1305test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/poly1305/poly1305test.c b/src/regress/lib/libcrypto/poly1305/poly1305test.c
deleted file mode 100644
index 3f9af0db00..0000000000
--- a/src/regress/lib/libcrypto/poly1305/poly1305test.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*      $OpenBSD: poly1305test.c,v 1.3 2018/07/17 17:06:49 tb Exp $     */
-/*
- * Public Domain poly1305 from Andrew Moon
- * Based on poly1305-donna.c from:
- *   https://github.com/floodyberry/poly1305-donna
- */
-
-#include <stdio.h>
-
-#include <openssl/poly1305.h>
-
-void poly1305_auth(unsigned char mac[16], const unsigned char *m, size_t bytes,
-    const unsigned char key[32]);
-
-int poly1305_verify(const unsigned char mac1[16], const unsigned char mac2[16]);
-int poly1305_power_on_self_test(void);
-
-void
-poly1305_auth(unsigned char mac[16], const unsigned char *m, size_t bytes,
-const unsigned char key[32]) {
-        poly1305_context ctx;
-        CRYPTO_poly1305_init(&ctx, key);
-        CRYPTO_poly1305_update(&ctx, m, bytes);
-        CRYPTO_poly1305_finish(&ctx, mac);
-}
-
-int
-poly1305_verify(const unsigned char mac1[16], const unsigned char mac2[16])
-{
-        size_t i;
-        unsigned int dif = 0;
-        for (i = 0; i < 16; i++)
-                dif |= (mac1[i] ^ mac2[i]);
-        dif = (dif - 1) >> ((sizeof(unsigned int) * 8) - 1);
-        return (dif & 1);
-}
-
-/* test a few basic operations */
-int
-poly1305_power_on_self_test(void)
-{
-        /* example from nacl */
-        static const unsigned char nacl_key[32] = {
-                0xee, 0xa6, 0xa7, 0x25, 0x1c, 0x1e, 0x72, 0x91,
-                0x6d, 0x11, 0xc2, 0xcb, 0x21, 0x4d, 0x3c, 0x25,
-                0x25, 0x39, 0x12, 0x1d, 0x8e, 0x23, 0x4e, 0x65,
-                0x2d, 0x65, 0x1f, 0xa4, 0xc8, 0xcf, 0xf8, 0x80,
-        };
-
-        static const unsigned char nacl_msg[131] = {
-                0x8e, 0x99, 0x3b, 0x9f, 0x48, 0x68, 0x12, 0x73,
-                0xc2, 0x96, 0x50, 0xba, 0x32, 0xfc, 0x76, 0xce,
-                0x48, 0x33, 0x2e, 0xa7, 0x16, 0x4d, 0x96, 0xa4,
-                0x47, 0x6f, 0xb8, 0xc5, 0x31, 0xa1, 0x18, 0x6a,
-                0xc0, 0xdf, 0xc1, 0x7c, 0x98, 0xdc, 0xe8, 0x7b,
-                0x4d, 0xa7, 0xf0, 0x11, 0xec, 0x48, 0xc9, 0x72,
-                0x71, 0xd2, 0xc2, 0x0f, 0x9b, 0x92, 0x8f, 0xe2,
-                0x27, 0x0d, 0x6f, 0xb8, 0x63, 0xd5, 0x17, 0x38,
-                0xb4, 0x8e, 0xee, 0xe3, 0x14, 0xa7, 0xcc, 0x8a,
-                0xb9, 0x32, 0x16, 0x45, 0x48, 0xe5, 0x26, 0xae,
-                0x90, 0x22, 0x43, 0x68, 0x51, 0x7a, 0xcf, 0xea,
-                0xbd, 0x6b, 0xb3, 0x73, 0x2b, 0xc0, 0xe9, 0xda,
-                0x99, 0x83, 0x2b, 0x61, 0xca, 0x01, 0xb6, 0xde,
-                0x56, 0x24, 0x4a, 0x9e, 0x88, 0xd5, 0xf9, 0xb3,
-                0x79, 0x73, 0xf6, 0x22, 0xa4, 0x3d, 0x14, 0xa6,
-                0x59, 0x9b, 0x1f, 0x65, 0x4c, 0xb4, 0x5a, 0x74,
-                0xe3, 0x55, 0xa5
-        };
-
-        static const unsigned char nacl_mac[16] = {
-                0xf3, 0xff, 0xc7, 0x70, 0x3f, 0x94, 0x00, 0xe5,
-                0x2a, 0x7d, 0xfb, 0x4b, 0x3d, 0x33, 0x05, 0xd9
-        };
-
-        /* generates a final value of (2^130 - 2) == 3 */
-        static const unsigned char wrap_key[32] = {
-                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        };
-
-        static const unsigned char wrap_msg[16] = {
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-        };
-
-        static const unsigned char wrap_mac[16] = {
-                0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        };
-
-        /*
-                mac of the macs of messages of length 0 to 256, where the key and messages
-                have all their values set to the length
-        */
-        static const unsigned char total_key[32] = {
-                0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-        };
-
-        static const unsigned char total_mac[16] = {
-                0x64, 0xaf, 0xe2, 0xe8, 0xd6, 0xad, 0x7b, 0xbd,
-                0xd2, 0x87, 0xf9, 0x7c, 0x44, 0x62, 0x3d, 0x39
-        };
-
-        poly1305_context ctx;
-        poly1305_context total_ctx;
-        unsigned char all_key[32];
-        unsigned char all_msg[256];
-        unsigned char mac[16];
-        size_t i, j;
-        int result = 1;
-
-        for (i = 0; i < sizeof(mac); i++)
-                mac[i] = 0;
-        poly1305_auth(mac, nacl_msg, sizeof(nacl_msg), nacl_key);
-        result &= poly1305_verify(nacl_mac, mac);
-
-        for (i = 0; i < sizeof(mac); i++)
-                mac[i] = 0;
-        CRYPTO_poly1305_init(&ctx, nacl_key);
-        CRYPTO_poly1305_update(&ctx, nacl_msg +   0, 32);
-        CRYPTO_poly1305_update(&ctx, nacl_msg +  32, 64);
-        CRYPTO_poly1305_update(&ctx, nacl_msg +  96, 16);
-        CRYPTO_poly1305_update(&ctx, nacl_msg + 112,  8);
-        CRYPTO_poly1305_update(&ctx, nacl_msg + 120,  4);
-        CRYPTO_poly1305_update(&ctx, nacl_msg + 124,  2);
-        CRYPTO_poly1305_update(&ctx, nacl_msg + 126,  1);
-        CRYPTO_poly1305_update(&ctx, nacl_msg + 127,  1);
-        CRYPTO_poly1305_update(&ctx, nacl_msg + 128,  1);
-        CRYPTO_poly1305_update(&ctx, nacl_msg + 129,  1);
-        CRYPTO_poly1305_update(&ctx, nacl_msg + 130,  1);
-        CRYPTO_poly1305_finish(&ctx, mac);
-        result &= poly1305_verify(nacl_mac, mac);
-
-        for (i = 0; i < sizeof(mac); i++)
-                mac[i] = 0;
-        poly1305_auth(mac, wrap_msg, sizeof(wrap_msg), wrap_key);
-        result &= poly1305_verify(wrap_mac, mac);
-
-        CRYPTO_poly1305_init(&total_ctx, total_key);
-        for (i = 0; i < 256; i++) {
-                /* set key and message to 'i,i,i..' */
-                for (j = 0; j < sizeof(all_key); j++)
-                        all_key[j] = i;
-                for (j = 0; j < i; j++)
-                        all_msg[j] = i;
-                poly1305_auth(mac, all_msg, i, all_key);
-                CRYPTO_poly1305_update(&total_ctx, mac, 16);
-        }
-        CRYPTO_poly1305_finish(&total_ctx, mac);
-        result &= poly1305_verify(total_mac, mac);
-
-        return result;
-}
-
-int
-main(int argc, char **argv)
-{
-        if (!poly1305_power_on_self_test()) {
-                fprintf(stderr, "One or more self tests failed!\n");
-                return 1;
-        }
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/rand/Makefile b/src/regress/lib/libcrypto/rand/Makefile
deleted file mode 100644
index 0235a43ef1..0000000000
--- a/src/regress/lib/libcrypto/rand/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   randtest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/rand/randtest.c b/src/regress/lib/libcrypto/rand/randtest.c
deleted file mode 100644
index d0f02ad22d..0000000000
--- a/src/regress/lib/libcrypto/rand/randtest.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*      $OpenBSD: randtest.c,v 1.3 2018/07/17 17:06:49 tb Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#undef LIBRESSL_INTERNAL        /* Needed to get RAND_pseudo_bytes(). */
-#include <openssl/rand.h>
-
-/* some FIPS 140-1 random number test */
-/* some simple tests */
-
-int main(int argc,char **argv)
-        {
-        unsigned char buf[2500];
-        int i,j,k,s,sign,nsign,err=0;
-        unsigned long n1;
-        unsigned long n2[16];
-        unsigned long runs[2][34];
-        /*double d; */
-        long d;
-
-        i = RAND_pseudo_bytes(buf,2500);
-        if (i < 0)
-                {
-                printf ("init failed, the rand method is not properly installed\n");
-                err++;
-                goto err;
-                }
-
-        n1=0;
-        for (i=0; i<16; i++) n2[i]=0;
-        for (i=0; i<34; i++) runs[0][i]=runs[1][i]=0;
-
-        /* test 1 and 2 */
-        sign=0;
-        nsign=0;
-        for (i=0; i<2500; i++)
-                {
-                j=buf[i];
-
-                n2[j&0x0f]++;
-                n2[(j>>4)&0x0f]++;
-
-                for (k=0; k<8; k++)
-                        {
-                        s=(j&0x01);
-                        if (s == sign)
-                                nsign++;
-                        else
-                                {
-                                if (nsign > 34) nsign=34;
-                                if (nsign != 0)
-                                        {
-                                        runs[sign][nsign-1]++;
-                                        if (nsign > 6)
-                                                runs[sign][5]++;
-                                        }
-                                sign=s;
-                                nsign=1;
-                                }
-
-                        if (s) n1++;
-                        j>>=1;
-                        }
-                }
-                if (nsign > 34) nsign=34;
-                if (nsign != 0) runs[sign][nsign-1]++;
-
-        /* test 1 */
-        if (!((9654 < n1) && (n1 < 10346)))
-                {
-                printf("test 1 failed, X=%lu\n",n1);
-                err++;
-                }
-        printf("test 1 done\n");
-
-        /* test 2 */
-        d=0;
-        for (i=0; i<16; i++)
-                d+=n2[i]*n2[i];
-        d=(d*8)/25-500000;
-        if (!((103 < d) && (d < 5740)))
-                {
-                printf("test 2 failed, X=%ld.%02ld\n",d/100L,d%100L);
-                err++;
-                }
-        printf("test 2 done\n");
-
-        /* test 3 */
-        for (i=0; i<2; i++)
-                {
-                if (!((2267 < runs[i][0]) && (runs[i][0] < 2733)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,1,runs[i][0]);
-                        err++;
-                        }
-                if (!((1079 < runs[i][1]) && (runs[i][1] < 1421)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,2,runs[i][1]);
-                        err++;
-                        }
-                if (!(( 502 < runs[i][2]) && (runs[i][2] <  748)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,3,runs[i][2]);
-                        err++;
-                        }
-                if (!(( 223 < runs[i][3]) && (runs[i][3] <  402)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,4,runs[i][3]);
-                        err++;
-                        }
-                if (!((  90 < runs[i][4]) && (runs[i][4] <  223)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,5,runs[i][4]);
-                        err++;
-                        }
-                if (!((  90 < runs[i][5]) && (runs[i][5] <  223)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,6,runs[i][5]);
-                        err++;
-                        }
-                }
-        printf("test 3 done\n");
-        
-        /* test 4 */
-        if (runs[0][33] != 0)
-                {
-                printf("test 4 failed, bit=%d run=%d num=%lu\n",
-                        0,34,runs[0][33]);
-                err++;
-                }
-        if (runs[1][33] != 0)
-                {
-                printf("test 4 failed, bit=%d run=%d num=%lu\n",
-                        1,34,runs[1][33]);
-                err++;
-                }
-        printf("test 4 done\n");
- err:
-        err=((err)?1:0);
-        exit(err);
-        }
diff --git a/src/regress/lib/libcrypto/rc2/Makefile b/src/regress/lib/libcrypto/rc2/Makefile
deleted file mode 100644
index 99e7c748d7..0000000000
--- a/src/regress/lib/libcrypto/rc2/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   rc2test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/rc2/rc2test.c b/src/regress/lib/libcrypto/rc2/rc2test.c
deleted file mode 100644
index a8d33077dd..0000000000
--- a/src/regress/lib/libcrypto/rc2/rc2test.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*      $OpenBSD: rc2test.c,v 1.2 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* This has been a quickly hacked 'ideatest.c'.  When I add tests for other
- * RC2 modes, more of the code will be uncommented. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/rc2.h>
-
-static unsigned char RC2key[4][16]={
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-         0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F},
-        };
-
-static unsigned char RC2plain[4][8]={
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        };
-
-static unsigned char RC2cipher[4][8]={
-        {0x1C,0x19,0x8A,0x83,0x8D,0xF0,0x28,0xB7},
-        {0x21,0x82,0x9C,0x78,0xA9,0xF9,0xC0,0x74},
-        {0x13,0xDB,0x35,0x17,0xD3,0x21,0x86,0x9E},
-        {0x50,0xDC,0x01,0x62,0xBD,0x75,0x7F,0x31},
-        };
-/************/
-
-int main(int argc, char *argv[])
-        {
-        int i,n,err=0;
-        RC2_KEY key; 
-        unsigned char buf[8],buf2[8];
-
-        for (n=0; n<4; n++)
-                {
-                RC2_set_key(&key,16,&(RC2key[n][0]),0 /* or 1024 */);
-
-                RC2_ecb_encrypt(&(RC2plain[n][0]),buf,&key,RC2_ENCRYPT);
-                if (memcmp(&(RC2cipher[n][0]),buf,8) != 0)
-                        {
-                        printf("ecb rc2 error encrypting\n");
-                        printf("got     :");
-                        for (i=0; i<8; i++)
-                                printf("%02X ",buf[i]);
-                        printf("\n");
-                        printf("expected:");
-                        for (i=0; i<8; i++)
-                                printf("%02X ",RC2cipher[n][i]);
-                        err=20;
-                        printf("\n");
-                        }
-
-                RC2_ecb_encrypt(buf,buf2,&key,RC2_DECRYPT);
-                if (memcmp(&(RC2plain[n][0]),buf2,8) != 0)
-                        {
-                        printf("ecb RC2 error decrypting\n");
-                        printf("got     :");
-                        for (i=0; i<8; i++)
-                                printf("%02X ",buf[i]);
-                        printf("\n");
-                        printf("expected:");
-                        for (i=0; i<8; i++)
-                                printf("%02X ",RC2plain[n][i]);
-                        printf("\n");
-                        err=3;
-                        }
-                }
-
-        if (err == 0) printf("ecb RC2 ok\n");
-
-        exit(err);
-        }
diff --git a/src/regress/lib/libcrypto/rc4/Makefile b/src/regress/lib/libcrypto/rc4/Makefile
deleted file mode 100644
index bbb62d328b..0000000000
--- a/src/regress/lib/libcrypto/rc4/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   rc4test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/rc4/rc4test.c b/src/regress/lib/libcrypto/rc4/rc4test.c
deleted file mode 100644
index c1d98eb8c1..0000000000
--- a/src/regress/lib/libcrypto/rc4/rc4test.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*      $OpenBSD: rc4test.c,v 1.4 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/evp.h>
-#include <openssl/rc4.h>
-#include <openssl/sha.h>
-
-static unsigned char keys[7][30]={
-        {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
-        {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
-        {8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-        {4,0xef,0x01,0x23,0x45},
-        {8,0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef},
-        {4,0xef,0x01,0x23,0x45},
-        };
-
-static unsigned char data_len[7]={8,8,8,20,28,10};
-static unsigned char data[7][30]={
-        {0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,0xff},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-           0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-           0x00,0x00,0x00,0x00,0xff},
-        {0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
-           0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
-           0x12,0x34,0x56,0x78,0x9A,0xBC,0xDE,0xF0,
-           0x12,0x34,0x56,0x78,0xff},
-        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff},
-        {0},
-        };
-
-static unsigned char output[7][30]={
-        {0x75,0xb7,0x87,0x80,0x99,0xe0,0xc5,0x96,0x00},
-        {0x74,0x94,0xc2,0xe7,0x10,0x4b,0x08,0x79,0x00},
-        {0xde,0x18,0x89,0x41,0xa3,0x37,0x5d,0x3a,0x00},
-        {0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf,
-         0xbd,0x61,0x5a,0x11,0x62,0xe1,0xc7,0xba,
-         0x36,0xb6,0x78,0x58,0x00},
-        {0x66,0xa0,0x94,0x9f,0x8a,0xf7,0xd6,0x89,
-         0x1f,0x7f,0x83,0x2b,0xa8,0x33,0xc0,0x0c,
-         0x89,0x2e,0xbe,0x30,0x14,0x3c,0xe2,0x87,
-         0x40,0x01,0x1e,0xcf,0x00},
-        {0xd6,0xa1,0x41,0xa7,0xec,0x3c,0x38,0xdf,0xbd,0x61,0x00},
-        {0},
-        };
-
-int main(int argc, char *argv[])
-        {
-        int i,err=0;
-        int j;
-        unsigned char *p;
-        RC4_KEY key;
-        unsigned char obuf[512];
-
-        OPENSSL_add_all_algorithms_noconf();
-
-        for (i=0; i<6; i++)
-                {
-                RC4_set_key(&key,keys[i][0],&(keys[i][1]));
-                memset(obuf,0x00,sizeof(obuf));
-                RC4(&key,data_len[i],&(data[i][0]),obuf);
-                if (memcmp(obuf,output[i],data_len[i]+1) != 0)
-                        {
-                        printf("error calculating RC4\n");
-                        printf("output:");
-                        for (j=0; j<data_len[i]+1; j++)
-                                printf(" %02x",obuf[j]);
-                        printf("\n");
-                        printf("expect:");
-                        p= &(output[i][0]);
-                        for (j=0; j<data_len[i]+1; j++)
-                                printf(" %02x",*(p++));
-                        printf("\n");
-                        err++;
-                        }
-                else
-                        printf("test %d ok\n",i);
-                }
-        printf("test end processing ");
-        for (i=0; i<data_len[3]; i++)
-                {
-                RC4_set_key(&key,keys[3][0],&(keys[3][1]));
-                memset(obuf,0x00,sizeof(obuf));
-                RC4(&key,i,&(data[3][0]),obuf);
-                if ((memcmp(obuf,output[3],i) != 0) || (obuf[i] != 0))
-                        {
-                        printf("error in RC4 length processing\n");
-                        printf("output:");
-                        for (j=0; j<i+1; j++)
-                                printf(" %02x",obuf[j]);
-                        printf("\n");
-                        printf("expect:");
-                        p= &(output[3][0]);
-                        for (j=0; j<i; j++)
-                                printf(" %02x",*(p++));
-                        printf(" 00\n");
-                        err++;
-                        }
-                else
-                        {
-                        printf(".");
-                        fflush(stdout);
-                        }
-                }
-        printf("done\n");
-        printf("test multi-call ");
-        for (i=0; i<data_len[3]; i++)
-                {
-                RC4_set_key(&key,keys[3][0],&(keys[3][1]));
-                memset(obuf,0x00,sizeof(obuf));
-                RC4(&key,i,&(data[3][0]),obuf);
-                RC4(&key,data_len[3]-i,&(data[3][i]),&(obuf[i]));
-                if (memcmp(obuf,output[3],data_len[3]+1) != 0)
-                        {
-                        printf("error in RC4 multi-call processing\n");
-                        printf("output:");
-                        for (j=0; j<data_len[3]+1; j++)
-                                printf(" %02x",obuf[j]);
-                        printf("\n");
-                        printf("expect:");
-                        p= &(output[3][0]);
-                        for (j=0; j<data_len[3]+1; j++)
-                                printf(" %02x",*(p++));
-                        err++;
-                        }
-                else
-                        {
-                        printf(".");
-                        fflush(stdout);
-                        }
-                }
-        printf("done\n");
-        printf("bulk test ");
-        {   unsigned char buf[513];
-            SHA_CTX c;
-            unsigned char md[SHA_DIGEST_LENGTH];
-            static unsigned char expected[]={
-                0xa4,0x7b,0xcc,0x00,0x3d,0xd0,0xbd,0xe1,0xac,0x5f,
-                0x12,0x1e,0x45,0xbc,0xfb,0x1a,0xa1,0xf2,0x7f,0xc5 };
-
-                RC4_set_key(&key,keys[0][0],&(keys[3][1]));
-                memset(buf,'\0',sizeof(buf));
-                SHA1_Init(&c);
-                for (i=0;i<2571;i++) {
-                        RC4(&key,sizeof(buf),buf,buf);
-                        SHA1_Update(&c,buf,sizeof(buf));
-                }
-                SHA1_Final(md,&c);
-
-                if (memcmp(md,expected,sizeof(md))) {
-                        printf("error in RC4 bulk test\n");
-                        printf("output:");
-                        for (j=0; j<(int)sizeof(md); j++)
-                                printf(" %02x",md[j]);
-                        printf("\n");
-                        printf("expect:");
-                        for (j=0; j<(int)sizeof(md); j++)
-                                printf(" %02x",expected[j]);
-                        printf("\n");
-                        err++;
-                }
-                else    printf("ok\n");
-        }
-        exit(err);
-        }
diff --git a/src/regress/lib/libcrypto/rmd/Makefile b/src/regress/lib/libcrypto/rmd/Makefile
deleted file mode 100644
index 843b6b54c9..0000000000
--- a/src/regress/lib/libcrypto/rmd/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   rmdtest
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/rmd/rmdtest.c b/src/regress/lib/libcrypto/rmd/rmdtest.c
deleted file mode 100644
index aa6cb0174e..0000000000
--- a/src/regress/lib/libcrypto/rmd/rmdtest.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*      $OpenBSD: rmdtest.c,v 1.2 2018/07/17 17:06:49 tb Exp $  */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/ripemd.h>
-#include <openssl/evp.h>
-
-static char *test[]={
-        "",
-        "a",
-        "abc",
-        "message digest",
-        "abcdefghijklmnopqrstuvwxyz",
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-        NULL,
-        };
-
-static char *ret[]={
-        "9c1185a5c5e9fc54612808977ee8f548b2258d31",
-        "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe",
-        "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",
-        "5d0689ef49d2fae572b881b123a85ffa21595f36",
-        "f71c27109c692c1b56bbdceb5b9d2865b3708dbc",
-        "12a053384a9c0c88e405a06c27dcf49ada62eb2b",
-        "b0e20b6e3116640286ed3a87a5713079b21f5189",
-        "9b752e45573d4b39f4dbd3323cab82bf63326bfb",
-        };
-
-static char *pt(unsigned char *md);
-int main(int argc, char *argv[])
-        {
-        int i,err=0;
-        char **P,**R;
-        char *p;
-        unsigned char md[RIPEMD160_DIGEST_LENGTH];
-
-        P=test;
-        R=ret;
-        i=1;
-        while (*P != NULL)
-                {
-                EVP_Digest(&(P[0][0]),strlen((char *)*P),md,NULL,EVP_ripemd160(), NULL);
-                p=pt(md);
-                if (strcmp(p,(char *)*R) != 0)
-                        {
-                        printf("error calculating RIPEMD160 on '%s'\n",*P);
-                        printf("got %s instead of %s\n",p,*R);
-                        err++;
-                        }
-                else
-                        printf("test %d ok\n",i);
-                i++;
-                R++;
-                P++;
-                }
-        exit(err);
-        return(0);
-        }
-
-static char *pt(unsigned char *md)
-        {
-        int i;
-        static char buf[80];
-
-        for (i=0; i<RIPEMD160_DIGEST_LENGTH; i++)
-                snprintf(buf + i*2, sizeof(buf) - i*2, "%02x",md[i]);
-        return(buf);
-        }
diff --git a/src/regress/lib/libcrypto/rsa/Makefile b/src/regress/lib/libcrypto/rsa/Makefile
deleted file mode 100644
index ac87800492..0000000000
--- a/src/regress/lib/libcrypto/rsa/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2017/01/25 06:44:04 beck Exp $
-
-PROG=   rsa_test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-REGRESS_TARGETS=regress-dsatest
-
-regress-dsatest:        ${PROG}
-        ./${PROG}
-        ./${PROG} -app2_1
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/rsa/rsa_test.c b/src/regress/lib/libcrypto/rsa/rsa_test.c
deleted file mode 100644
index 9e7cd6f472..0000000000
--- a/src/regress/lib/libcrypto/rsa/rsa_test.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*      $OpenBSD: rsa_test.c,v 1.3 2018/07/17 17:06:49 tb Exp $ */
-/*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/* test vectors from p1ovect1.txt */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/bn.h>
-#ifdef OPENSSL_NO_RSA
-int main(int argc, char *argv[])
-{
-    printf("No RSA support\n");
-    return (0);
-}
-#else
-# include <openssl/rsa.h>
-
-# define SetKey \
-  key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \
-  key->e = BN_bin2bn(e, sizeof(e)-1, key->e); \
-  key->d = BN_bin2bn(d, sizeof(d)-1, key->d); \
-  key->p = BN_bin2bn(p, sizeof(p)-1, key->p); \
-  key->q = BN_bin2bn(q, sizeof(q)-1, key->q); \
-  key->dmp1 = BN_bin2bn(dmp1, sizeof(dmp1)-1, key->dmp1); \
-  key->dmq1 = BN_bin2bn(dmq1, sizeof(dmq1)-1, key->dmq1); \
-  key->iqmp = BN_bin2bn(iqmp, sizeof(iqmp)-1, key->iqmp); \
-  memcpy(c, ctext_ex, sizeof(ctext_ex) - 1); \
-  return (sizeof(ctext_ex) - 1);
-
-static int key1(RSA *key, unsigned char *c)
-{
-    static unsigned char n[] =
-        "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
-        "\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
-        "\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
-        "\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
-        "\xF5";
-
-    static unsigned char e[] = "\x11";
-
-    static unsigned char d[] =
-        "\x0A\x03\x37\x48\x62\x64\x87\x69\x5F\x5F\x30\xBC\x38\xB9\x8B\x44"
-        "\xC2\xCD\x2D\xFF\x43\x40\x98\xCD\x20\xD8\xA1\x38\xD0\x90\xBF\x64"
-        "\x79\x7C\x3F\xA7\xA2\xCD\xCB\x3C\xD1\xE0\xBD\xBA\x26\x54\xB4\xF9"
-        "\xDF\x8E\x8A\xE5\x9D\x73\x3D\x9F\x33\xB3\x01\x62\x4A\xFD\x1D\x51";
-
-    static unsigned char p[] =
-        "\x00\xD8\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-        "\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x12"
-        "\x0D";
-
-    static unsigned char q[] =
-        "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-        "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-        "\x89";
-
-    static unsigned char dmp1[] =
-        "\x59\x0B\x95\x72\xA2\xC2\xA9\xC4\x06\x05\x9D\xC2\xAB\x2F\x1D\xAF"
-        "\xEB\x7E\x8B\x4F\x10\xA7\x54\x9E\x8E\xED\xF5\xB4\xFC\xE0\x9E\x05";
-
-    static unsigned char dmq1[] =
-        "\x00\x8E\x3C\x05\x21\xFE\x15\xE0\xEA\x06\xA3\x6F\xF0\xF1\x0C\x99"
-        "\x52\xC3\x5B\x7A\x75\x14\xFD\x32\x38\xB8\x0A\xAD\x52\x98\x62\x8D"
-        "\x51";
-
-    static unsigned char iqmp[] =
-        "\x36\x3F\xF7\x18\x9D\xA8\xE9\x0B\x1D\x34\x1F\x71\xD0\x9B\x76\xA8"
-        "\xA9\x43\xE1\x1D\x10\xB2\x4D\x24\x9F\x2D\xEA\xFE\xF8\x0C\x18\x26";
-
-    static unsigned char ctext_ex[] =
-        "\x1b\x8f\x05\xf9\xca\x1a\x79\x52\x6e\x53\xf3\xcc\x51\x4f\xdb\x89"
-        "\x2b\xfb\x91\x93\x23\x1e\x78\xb9\x92\xe6\x8d\x50\xa4\x80\xcb\x52"
-        "\x33\x89\x5c\x74\x95\x8d\x5d\x02\xab\x8c\x0f\xd0\x40\xeb\x58\x44"
-        "\xb0\x05\xc3\x9e\xd8\x27\x4a\x9d\xbf\xa8\x06\x71\x40\x94\x39\xd2";
-
-    SetKey;
-}
-
-static int key2(RSA *key, unsigned char *c)
-{
-    static unsigned char n[] =
-        "\x00\xA3\x07\x9A\x90\xDF\x0D\xFD\x72\xAC\x09\x0C\xCC\x2A\x78\xB8"
-        "\x74\x13\x13\x3E\x40\x75\x9C\x98\xFA\xF8\x20\x4F\x35\x8A\x0B\x26"
-        "\x3C\x67\x70\xE7\x83\xA9\x3B\x69\x71\xB7\x37\x79\xD2\x71\x7B\xE8"
-        "\x34\x77\xCF";
-
-    static unsigned char e[] = "\x3";
-
-    static unsigned char d[] =
-        "\x6C\xAF\xBC\x60\x94\xB3\xFE\x4C\x72\xB0\xB3\x32\xC6\xFB\x25\xA2"
-        "\xB7\x62\x29\x80\x4E\x68\x65\xFC\xA4\x5A\x74\xDF\x0F\x8F\xB8\x41"
-        "\x3B\x52\xC0\xD0\xE5\x3D\x9B\x59\x0F\xF1\x9B\xE7\x9F\x49\xDD\x21"
-        "\xE5\xEB";
-
-    static unsigned char p[] =
-        "\x00\xCF\x20\x35\x02\x8B\x9D\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92"
-        "\xEA\x0D\xA3\xB4\x32\x04\xB5\xCF\xCE\x91";
-
-    static unsigned char q[] =
-        "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-        "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5F";
-
-    static unsigned char dmp1[] =
-        "\x00\x8A\x15\x78\xAC\x5D\x13\xAF\x10\x2B\x22\xB9\x99\xCD\x74\x61"
-        "\xF1\x5E\x6D\x22\xCC\x03\x23\xDF\xDF\x0B";
-
-    static unsigned char dmq1[] =
-        "\x00\x86\x55\x21\x4A\xC5\x4D\x8D\x4E\xCD\x61\x77\xF1\xC7\x36\x90"
-        "\xCE\x2A\x48\x2C\x8B\x05\x99\xCB\xE0\x3F";
-
-    static unsigned char iqmp[] =
-        "\x00\x83\xEF\xEF\xB8\xA9\xA4\x0D\x1D\xB6\xED\x98\xAD\x84\xED\x13"
-        "\x35\xDC\xC1\x08\xF3\x22\xD0\x57\xCF\x8D";
-
-    static unsigned char ctext_ex[] =
-        "\x14\xbd\xdd\x28\xc9\x83\x35\x19\x23\x80\xe8\xe5\x49\xb1\x58\x2a"
-        "\x8b\x40\xb4\x48\x6d\x03\xa6\xa5\x31\x1f\x1f\xd5\xf0\xa1\x80\xe4"
-        "\x17\x53\x03\x29\xa9\x34\x90\x74\xb1\x52\x13\x54\x29\x08\x24\x52"
-        "\x62\x51";
-
-    SetKey;
-}
-
-static int key3(RSA *key, unsigned char *c)
-{
-    static unsigned char n[] =
-        "\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
-        "\xF7\x36\x8D\x07\xEE\xD4\x10\x43\xA4\x40\xD6\xB6\xF0\x74\x54\xF5"
-        "\x1F\xB8\xDF\xBA\xAF\x03\x5C\x02\xAB\x61\xEA\x48\xCE\xEB\x6F\xCD"
-        "\x48\x76\xED\x52\x0D\x60\xE1\xEC\x46\x19\x71\x9D\x8A\x5B\x8B\x80"
-        "\x7F\xAF\xB8\xE0\xA3\xDF\xC7\x37\x72\x3E\xE6\xB4\xB7\xD9\x3A\x25"
-        "\x84\xEE\x6A\x64\x9D\x06\x09\x53\x74\x88\x34\xB2\x45\x45\x98\x39"
-        "\x4E\xE0\xAA\xB1\x2D\x7B\x61\xA5\x1F\x52\x7A\x9A\x41\xF6\xC1\x68"
-        "\x7F\xE2\x53\x72\x98\xCA\x2A\x8F\x59\x46\xF8\xE5\xFD\x09\x1D\xBD"
-        "\xCB";
-
-    static unsigned char e[] = "\x11";
-
-    static unsigned char d[] =
-        "\x00\xA5\xDA\xFC\x53\x41\xFA\xF2\x89\xC4\xB9\x88\xDB\x30\xC1\xCD"
-        "\xF8\x3F\x31\x25\x1E\x06\x68\xB4\x27\x84\x81\x38\x01\x57\x96\x41"
-        "\xB2\x94\x10\xB3\xC7\x99\x8D\x6B\xC4\x65\x74\x5E\x5C\x39\x26\x69"
-        "\xD6\x87\x0D\xA2\xC0\x82\xA9\x39\xE3\x7F\xDC\xB8\x2E\xC9\x3E\xDA"
-        "\xC9\x7F\xF3\xAD\x59\x50\xAC\xCF\xBC\x11\x1C\x76\xF1\xA9\x52\x94"
-        "\x44\xE5\x6A\xAF\x68\xC5\x6C\x09\x2C\xD3\x8D\xC3\xBE\xF5\xD2\x0A"
-        "\x93\x99\x26\xED\x4F\x74\xA1\x3E\xDD\xFB\xE1\xA1\xCE\xCC\x48\x94"
-        "\xAF\x94\x28\xC2\xB7\xB8\x88\x3F\xE4\x46\x3A\x4B\xC8\x5B\x1C\xB3"
-        "\xC1";
-
-    static unsigned char p[] =
-        "\x00\xEE\xCF\xAE\x81\xB1\xB9\xB3\xC9\x08\x81\x0B\x10\xA1\xB5\x60"
-        "\x01\x99\xEB\x9F\x44\xAE\xF4\xFD\xA4\x93\xB8\x1A\x9E\x3D\x84\xF6"
-        "\x32\x12\x4E\xF0\x23\x6E\x5D\x1E\x3B\x7E\x28\xFA\xE7\xAA\x04\x0A"
-        "\x2D\x5B\x25\x21\x76\x45\x9D\x1F\x39\x75\x41\xBA\x2A\x58\xFB\x65"
-        "\x99";
-
-    static unsigned char q[] =
-        "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-        "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-        "\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-        "\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x15"
-        "\x03";
-
-    static unsigned char dmp1[] =
-        "\x54\x49\x4C\xA6\x3E\xBA\x03\x37\xE4\xE2\x40\x23\xFC\xD6\x9A\x5A"
-        "\xEB\x07\xDD\xDC\x01\x83\xA4\xD0\xAC\x9B\x54\xB0\x51\xF2\xB1\x3E"
-        "\xD9\x49\x09\x75\xEA\xB7\x74\x14\xFF\x59\xC1\xF7\x69\x2E\x9A\x2E"
-        "\x20\x2B\x38\xFC\x91\x0A\x47\x41\x74\xAD\xC9\x3C\x1F\x67\xC9\x81";
-
-    static unsigned char dmq1[] =
-        "\x47\x1E\x02\x90\xFF\x0A\xF0\x75\x03\x51\xB7\xF8\x78\x86\x4C\xA9"
-        "\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7"
-        "\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D"
-        "\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D";
-
-    static unsigned char iqmp[] =
-        "\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23"
-        "\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11"
-        "\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E"
-        "\x9E\x2E\x0F\x96\x56\xE6\x98\xEA\x36\x66\xED\xFB\x25\x79\x80\x39"
-        "\xF7";
-
-    static unsigned char ctext_ex[] =
-        "\xb8\x24\x6b\x56\xa6\xed\x58\x81\xae\xb5\x85\xd9\xa2\x5b\x2a\xd7"
-        "\x90\xc4\x17\xe0\x80\x68\x1b\xf1\xac\x2b\xc3\xde\xb6\x9d\x8b\xce"
-        "\xf0\xc4\x36\x6f\xec\x40\x0a\xf0\x52\xa7\x2e\x9b\x0e\xff\xb5\xb3"
-        "\xf2\xf1\x92\xdb\xea\xca\x03\xc1\x27\x40\x05\x71\x13\xbf\x1f\x06"
-        "\x69\xac\x22\xe9\xf3\xa7\x85\x2e\x3c\x15\xd9\x13\xca\xb0\xb8\x86"
-        "\x3a\x95\xc9\x92\x94\xce\x86\x74\x21\x49\x54\x61\x03\x46\xf4\xd4"
-        "\x74\xb2\x6f\x7c\x48\xb4\x2e\xe6\x8e\x1f\x57\x2a\x1f\xc4\x02\x6a"
-        "\xc4\x56\xb4\xf5\x9f\x7b\x62\x1e\xa1\xb9\xd8\x8f\x64\x20\x2f\xb1";
-
-    SetKey;
-}
-
-static int pad_unknown(void)
-{
-    unsigned long l;
-    while ((l = ERR_get_error()) != 0)
-        if (ERR_GET_REASON(l) == RSA_R_UNKNOWN_PADDING_TYPE)
-            return (1);
-    return (0);
-}
-
-int main(int argc, char *argv[])
-{
-    int err = 0;
-    int v;
-    RSA *key;
-    unsigned char ptext[256];
-    unsigned char ctext[256];
-    static unsigned char ptext_ex[] = "\x54\x85\x9b\x34\x2c\x49\xea\x2a";
-    unsigned char ctext_ex[256];
-    int plen;
-    int clen = 0;
-    int num;
-    int n;
-
-    plen = sizeof(ptext_ex) - 1;
-
-    for (v = 0; v < 3; v++) {
-        key = RSA_new();
-        switch (v) {
-        case 0:
-            clen = key1(key, ctext_ex);
-            break;
-        case 1:
-            clen = key2(key, ctext_ex);
-            break;
-        case 2:
-            clen = key3(key, ctext_ex);
-            break;
-        }
-
-        num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
-                                 RSA_PKCS1_PADDING);
-        if (num != clen) {
-            printf("PKCS#1 v1.5 encryption failed!\n");
-            err = 1;
-            goto oaep;
-        }
-
-        num = RSA_private_decrypt(num, ctext, ptext, key, RSA_PKCS1_PADDING);
-        if (num != plen || memcmp(ptext, ptext_ex, num) != 0) {
-            printf("PKCS#1 v1.5 decryption failed!\n");
-            err = 1;
-        } else
-            printf("PKCS #1 v1.5 encryption/decryption ok\n");
-
- oaep:
-        ERR_clear_error();
-        num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
-                                 RSA_PKCS1_OAEP_PADDING);
-        if (num == -1 && pad_unknown()) {
-            printf("No OAEP support\n");
-            goto next;
-        }
-        if (num != clen) {
-            printf("OAEP encryption failed!\n");
-            err = 1;
-            goto next;
-        }
-
-        num = RSA_private_decrypt(num, ctext, ptext, key,
-                                  RSA_PKCS1_OAEP_PADDING);
-        if (num != plen || memcmp(ptext, ptext_ex, num) != 0) {
-            printf("OAEP decryption (encrypted data) failed!\n");
-            err = 1;
-        } else if (memcmp(ctext, ctext_ex, num) == 0)
-            printf("OAEP test vector %d passed!\n", v);
-
-        /*
-         * Different ciphertexts (rsa_oaep.c without -DPKCS_TESTVECT). Try
-         * decrypting ctext_ex
-         */
-
-        num = RSA_private_decrypt(clen, ctext_ex, ptext, key,
-                                  RSA_PKCS1_OAEP_PADDING);
-
-        if (num != plen || memcmp(ptext, ptext_ex, num) != 0) {
-            printf("OAEP decryption (test vector data) failed!\n");
-            err = 1;
-        } else
-            printf("OAEP encryption/decryption ok\n");
-
-        /* Try decrypting corrupted ciphertexts. */
-        for (n = 0; n < clen; ++n) {
-            ctext[n] ^= 1;
-            num = RSA_private_decrypt(clen, ctext, ptext, key,
-                                          RSA_PKCS1_OAEP_PADDING);
-            if (num > 0) {
-                printf("Corrupt data decrypted!\n");
-                err = 1;
-                break;
-            }
-            ctext[n] ^= 1;
-        }
-
-        /* Test truncated ciphertexts, as well as negative length. */
-        for (n = -1; n < clen; ++n) {
-            num = RSA_private_decrypt(n, ctext, ptext, key,
-                                      RSA_PKCS1_OAEP_PADDING);
-            if (num > 0) {
-                printf("Truncated data decrypted!\n");
-                err = 1;
-                break;
-            }
-        }
-
- next:
-        RSA_free(key);
-    }
-
-    return err;
-}
-#endif
diff --git a/src/regress/lib/libcrypto/sha1/Makefile b/src/regress/lib/libcrypto/sha1/Makefile
deleted file mode 100644
index 2bb0b45ec9..0000000000
--- a/src/regress/lib/libcrypto/sha1/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   sha1test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/sha1/sha1test.c b/src/regress/lib/libcrypto/sha1/sha1test.c
deleted file mode 100644
index 7f28ba676f..0000000000
--- a/src/regress/lib/libcrypto/sha1/sha1test.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*      $OpenBSD: sha1test.c,v 1.3 2018/07/17 17:06:50 tb Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/evp.h>
-#include <openssl/sha.h>
-
-static char *test[]={
-        "abc",
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-        NULL,
-        };
-
-static char *ret[]={
-        "a9993e364706816aba3e25717850c26c9cd0d89d",
-        "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
-        };
-static char *bigret=
-        "34aa973cd4c4daa4f61eeb2bdbad27316534016f";
-
-static char *pt(unsigned char *md);
-int main(int argc, char *argv[])
-        {
-        int i,err=0;
-        char **P,**R;
-        static unsigned char buf[1000];
-        char *p,*r;
-        EVP_MD_CTX c;
-        unsigned char md[SHA_DIGEST_LENGTH];
-
-        EVP_MD_CTX_init(&c);
-        P=test;
-        R=ret;
-        i=1;
-        while (*P != NULL)
-                {
-                EVP_Digest(*P,strlen((char *)*P),md,NULL,EVP_sha1(), NULL);
-                p=pt(md);
-                if (strcmp(p,(char *)*R) != 0)
-                        {
-                        printf("error calculating SHA1 on '%s'\n",*P);
-                        printf("got %s instead of %s\n",p,*R);
-                        err++;
-                        }
-                else
-                        printf("test %d ok\n",i);
-                i++;
-                R++;
-                P++;
-                }
-
-        memset(buf,'a',1000);
-        EVP_DigestInit_ex(&c,EVP_sha1(), NULL);
-        for (i=0; i<1000; i++)
-                EVP_DigestUpdate(&c,buf,1000);
-        EVP_DigestFinal_ex(&c,md,NULL);
-        p=pt(md);
-
-        r=bigret;
-        if (strcmp(p,r) != 0)
-                {
-                printf("error calculating SHA1 on 'a' * 1000\n");
-                printf("got %s instead of %s\n",p,r);
-                err++;
-                }
-        else
-                printf("test 3 ok\n");
-
-        EVP_MD_CTX_cleanup(&c);
-        exit(err);
-        }
-
-static char *pt(unsigned char *md)
-        {
-        int i;
-        static char buf[80];
-
-        for (i=0; i<SHA_DIGEST_LENGTH; i++)
-                snprintf(buf + i*2, sizeof(buf) - i*2, "%02x",md[i]);
-        return(buf);
-        }
diff --git a/src/regress/lib/libcrypto/sha2/Makefile b/src/regress/lib/libcrypto/sha2/Makefile
deleted file mode 100644
index e7bccf5f24..0000000000
--- a/src/regress/lib/libcrypto/sha2/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2015/09/29 01:07:56 doug Exp $
-
-REGRESS_TARGETS=regress-sha2
-OPENSSL=/usr/bin/openssl
-
-HASHES= \
-        sha224 \
-                abc \
-                23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7 \
-        sha224 \
-                abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq \
-                75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525 \
-        sha256 \
-                abc \
-                ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad \
-        sha256 \
-                abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq \
-                248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1 \
-        sha384 \
-                abc \
-                cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7 \
-        sha384 \
-                abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu \
-                09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039 \
-        sha512 \
-                abc \
-                ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f \
-        sha512 \
-                abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu \
-                8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909
-
-regress-sha2:
-.for hash input output in ${HASHES}
-        @(echo -n ${input} | ${OPENSSL} ${hash} | (read a b; \
-          test $$b == ${output} || \
-          (echo wrong ${hash} hash of \"${input}\"; \
-           echo expected: ${output}; \
-           echo computed: $$b; \
-           false)))
-.endfor
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/sha256/Makefile b/src/regress/lib/libcrypto/sha256/Makefile
deleted file mode 100644
index 6e5f9d714b..0000000000
--- a/src/regress/lib/libcrypto/sha256/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   sha256test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/sha256/sha256test.c b/src/regress/lib/libcrypto/sha256/sha256test.c
deleted file mode 100644
index 9c22bc7664..0000000000
--- a/src/regress/lib/libcrypto/sha256/sha256test.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*      $OpenBSD: sha256test.c,v 1.3 2018/07/17 17:06:50 tb Exp $       */
-/* ====================================================================
- * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
- * ====================================================================
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/sha.h>
-#include <openssl/evp.h>
-
-#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA256)
-int
-main(int argc, char *argv[])
-{
-        printf("No SHA256 support\n");
-        return (0);
-}
-#else
-
-unsigned char app_b1[SHA256_DIGEST_LENGTH] = {
-        0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea,
-        0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23,
-        0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c,
-        0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad,
-};
-
-unsigned char app_b2[SHA256_DIGEST_LENGTH] = {
-        0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8,
-        0xe5, 0xc0, 0x26, 0x93, 0x0c, 0x3e, 0x60, 0x39,
-        0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67,
-        0xf6, 0xec, 0xed, 0xd4, 0x19, 0xdb, 0x06, 0xc1,
-};
-
-unsigned char app_b3[SHA256_DIGEST_LENGTH] = {
-        0xcd, 0xc7, 0x6e, 0x5c, 0x99, 0x14, 0xfb, 0x92,
-        0x81, 0xa1, 0xc7, 0xe2, 0x84, 0xd7, 0x3e, 0x67,
-        0xf1, 0x80, 0x9a, 0x48, 0xa4, 0x97, 0x20, 0x0e,
-        0x04, 0x6d, 0x39, 0xcc, 0xc7, 0x11, 0x2c, 0xd0,
-};
-
-unsigned char addenum_1[SHA224_DIGEST_LENGTH] = {
-        0x23, 0x09, 0x7d, 0x22, 0x34, 0x05, 0xd8, 0x22,
-        0x86, 0x42, 0xa4, 0x77, 0xbd, 0xa2, 0x55, 0xb3,
-        0x2a, 0xad, 0xbc, 0xe4, 0xbd, 0xa0, 0xb3, 0xf7,
-        0xe3, 0x6c, 0x9d, 0xa7,
-};
-
-unsigned char addenum_2[SHA224_DIGEST_LENGTH] = {
-        0x75, 0x38, 0x8b, 0x16, 0x51, 0x27, 0x76, 0xcc,
-        0x5d, 0xba, 0x5d, 0xa1, 0xfd, 0x89, 0x01, 0x50,
-        0xb0, 0xc6, 0x45, 0x5c, 0xb4, 0xf5, 0x8b, 0x19,
-        0x52, 0x52, 0x25, 0x25,
-};
-
-unsigned char addenum_3[SHA224_DIGEST_LENGTH] = {
-        0x20, 0x79, 0x46, 0x55, 0x98, 0x0c, 0x91, 0xd8,
-        0xbb, 0xb4, 0xc1, 0xea, 0x97, 0x61, 0x8a, 0x4b,
-        0xf0, 0x3f, 0x42, 0x58, 0x19, 0x48, 0xb2, 0xee,
-        0x4e, 0xe7, 0xad, 0x67,
-};
-
-int
-main(int argc, char **argv) {
-        unsigned char md[SHA256_DIGEST_LENGTH];
-        int             i;
-        EVP_MD_CTX      evp;
-
-        fprintf(stdout, "Testing SHA-256 ");
-
-        EVP_Digest("abc",3,md,NULL,EVP_sha256(),NULL);
-        if (memcmp(md, app_b1, sizeof(app_b1))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 1 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        EVP_Digest(
-            "abcdbcde""cdefdefg""efghfghi""ghijhijk"
-            "ijkljklm""klmnlmno""mnopnopq",
-            56, md, NULL, EVP_sha256(), NULL);
-        if (memcmp(md, app_b2, sizeof(app_b2))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 2 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        EVP_MD_CTX_init(&evp);
-        EVP_DigestInit_ex(&evp, EVP_sha256(), NULL);
-        for (i = 0; i < 1000000; i += 160)
-                EVP_DigestUpdate(&evp,
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
-                    (1000000 - i) < 160 ? 1000000 - i : 160);
-        EVP_DigestFinal_ex(&evp, md, NULL);
-        EVP_MD_CTX_cleanup(&evp);
-
-        if (memcmp(md, app_b3, sizeof(app_b3))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 3 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        fprintf(stdout, " passed.\n"); fflush(stdout);
-
-        fprintf(stdout, "Testing SHA-224 ");
-
-        EVP_Digest ("abc",3,md,NULL,EVP_sha224(),NULL);
-        if (memcmp(md, addenum_1, sizeof(addenum_1))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 1 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        EVP_Digest(
-            "abcdbcde""cdefdefg""efghfghi""ghijhijk"
-            "ijkljklm""klmnlmno""mnopnopq",
-            56, md, NULL, EVP_sha224(), NULL);
-        if (memcmp(md, addenum_2, sizeof(addenum_2))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 2 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        EVP_MD_CTX_init(&evp);
-        EVP_DigestInit_ex (&evp, EVP_sha224(), NULL);
-        for (i = 0; i < 1000000; i += 64)
-                EVP_DigestUpdate(&evp,
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
-                    (1000000 - i) < 64 ? 1000000 - i : 64);
-        EVP_DigestFinal_ex(&evp, md, NULL);
-        EVP_MD_CTX_cleanup(&evp);
-
-        if (memcmp(md, addenum_3, sizeof(addenum_3))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 3 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        fprintf(stdout, " passed.\n");
-        fflush(stdout);
-
-        return 0;
-}
-#endif
diff --git a/src/regress/lib/libcrypto/sha512/Makefile b/src/regress/lib/libcrypto/sha512/Makefile
deleted file mode 100644
index 354860eae1..0000000000
--- a/src/regress/lib/libcrypto/sha512/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   sha512test
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/sha512/sha512test.c b/src/regress/lib/libcrypto/sha512/sha512test.c
deleted file mode 100644
index bbcec93a2b..0000000000
--- a/src/regress/lib/libcrypto/sha512/sha512test.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*      $OpenBSD: sha512test.c,v 1.4 2018/07/17 17:06:50 tb Exp $       */
-/* ====================================================================
- * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
- * ====================================================================
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/sha.h>
-#include <openssl/evp.h>
-#include <openssl/crypto.h>
-
-#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA512)
-int
-main(int argc, char *argv[])
-{
-        printf("No SHA512 support\n");
-        return (0);
-}
-#else
-
-unsigned char app_c1[SHA512_DIGEST_LENGTH] = {
-        0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba,
-        0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31,
-        0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2,
-        0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a,
-        0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8,
-        0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd,
-        0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e,
-        0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f,
-};
-
-unsigned char app_c2[SHA512_DIGEST_LENGTH] = {
-        0x8e, 0x95, 0x9b, 0x75, 0xda, 0xe3, 0x13, 0xda,
-        0x8c, 0xf4, 0xf7, 0x28, 0x14, 0xfc, 0x14, 0x3f,
-        0x8f, 0x77, 0x79, 0xc6, 0xeb, 0x9f, 0x7f, 0xa1,
-        0x72, 0x99, 0xae, 0xad, 0xb6, 0x88, 0x90, 0x18,
-        0x50, 0x1d, 0x28, 0x9e, 0x49, 0x00, 0xf7, 0xe4,
-        0x33, 0x1b, 0x99, 0xde, 0xc4, 0xb5, 0x43, 0x3a,
-        0xc7, 0xd3, 0x29, 0xee, 0xb6, 0xdd, 0x26, 0x54,
-        0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9, 0x09,
-};
-
-unsigned char app_c3[SHA512_DIGEST_LENGTH] = {
-        0xe7, 0x18, 0x48, 0x3d, 0x0c, 0xe7, 0x69, 0x64,
-        0x4e, 0x2e, 0x42, 0xc7, 0xbc, 0x15, 0xb4, 0x63,
-        0x8e, 0x1f, 0x98, 0xb1, 0x3b, 0x20, 0x44, 0x28,
-        0x56, 0x32, 0xa8, 0x03, 0xaf, 0xa9, 0x73, 0xeb,
-        0xde, 0x0f, 0xf2, 0x44, 0x87, 0x7e, 0xa6, 0x0a,
-        0x4c, 0xb0, 0x43, 0x2c, 0xe5, 0x77, 0xc3, 0x1b,
-        0xeb, 0x00, 0x9c, 0x5c, 0x2c, 0x49, 0xaa, 0x2e,
-        0x4e, 0xad, 0xb2, 0x17, 0xad, 0x8c, 0xc0, 0x9b,
-};
-
-unsigned char app_d1[SHA384_DIGEST_LENGTH] = {
-        0xcb, 0x00, 0x75, 0x3f, 0x45, 0xa3, 0x5e, 0x8b,
-        0xb5, 0xa0, 0x3d, 0x69, 0x9a, 0xc6, 0x50, 0x07,
-        0x27, 0x2c, 0x32, 0xab, 0x0e, 0xde, 0xd1, 0x63,
-        0x1a, 0x8b, 0x60, 0x5a, 0x43, 0xff, 0x5b, 0xed,
-        0x80, 0x86, 0x07, 0x2b, 0xa1, 0xe7, 0xcc, 0x23,
-        0x58, 0xba, 0xec, 0xa1, 0x34, 0xc8, 0x25, 0xa7,
-};
-
-unsigned char app_d2[SHA384_DIGEST_LENGTH] = {
-        0x09, 0x33, 0x0c, 0x33, 0xf7, 0x11, 0x47, 0xe8,
-        0x3d, 0x19, 0x2f, 0xc7, 0x82, 0xcd, 0x1b, 0x47,
-        0x53, 0x11, 0x1b, 0x17, 0x3b, 0x3b, 0x05, 0xd2,
-        0x2f, 0xa0, 0x80, 0x86, 0xe3, 0xb0, 0xf7, 0x12,
-        0xfc, 0xc7, 0xc7, 0x1a, 0x55, 0x7e, 0x2d, 0xb9,
-        0x66, 0xc3, 0xe9, 0xfa, 0x91, 0x74, 0x60, 0x39,
-};
-
-unsigned char app_d3[SHA384_DIGEST_LENGTH] = {
-        0x9d, 0x0e, 0x18, 0x09, 0x71, 0x64, 0x74, 0xcb,
-        0x08, 0x6e, 0x83, 0x4e, 0x31, 0x0a, 0x4a, 0x1c,
-        0xed, 0x14, 0x9e, 0x9c, 0x00, 0xf2, 0x48, 0x52,
-        0x79, 0x72, 0xce, 0xc5, 0x70, 0x4c, 0x2a, 0x5b,
-        0x07, 0xb8, 0xb3, 0xdc, 0x38, 0xec, 0xc4, 0xeb,
-        0xae, 0x97, 0xdd, 0xd8, 0x7f, 0x3d, 0x89, 0x85,
-};
-
-int
-main(int argc, char **argv) {
-        unsigned char md[SHA512_DIGEST_LENGTH];
-        int             i;
-        EVP_MD_CTX      evp;
-
-#ifdef OPENSSL_IA32_SSE2
-        /* Alternative to this is to call OpenSSL_add_all_algorithms...
-         * The below code is retained exclusively for debugging purposes. */
-        {
-                char      *env;
-
-                if ((env=getenv("OPENSSL_ia32cap")))
-                        OPENSSL_ia32cap = strtoul (env, NULL, 0);
-        }
-#endif
-
-        fprintf(stdout, "Testing SHA-512 ");
-
-        EVP_Digest("abc", 3, md, NULL, EVP_sha512(), NULL);
-        if (memcmp(md, app_c1, sizeof(app_c1))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 1 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        EVP_Digest(
-            "abcdefgh""bcdefghi""cdefghij""defghijk"
-            "efghijkl""fghijklm""ghijklmn""hijklmno"
-            "ijklmnop""jklmnopq""klmnopqr""lmnopqrs"
-            "mnopqrst""nopqrstu",
-            112, md, NULL, EVP_sha512(), NULL);
-        if (memcmp(md, app_c2, sizeof(app_c2))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 2 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        EVP_MD_CTX_init(&evp);
-        EVP_DigestInit_ex(&evp, EVP_sha512(), NULL);
-        for (i = 0; i < 1000000; i += 288)
-                EVP_DigestUpdate(&evp,
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
-                    (1000000 - i) < 288 ? 1000000 - i : 288);
-        EVP_DigestFinal_ex(&evp, md, NULL);
-        EVP_MD_CTX_cleanup(&evp);
-
-        if (memcmp(md, app_c3, sizeof(app_c3))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 3 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        fprintf(stdout, " passed.\n");
-        fflush(stdout);
-
-        fprintf(stdout, "Testing SHA-384 ");
-
-        EVP_Digest("abc", 3, md, NULL, EVP_sha384(), NULL);
-        if (memcmp(md, app_d1, sizeof(app_d1))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 1 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        EVP_Digest(
-            "abcdefgh""bcdefghi""cdefghij""defghijk"
-            "efghijkl""fghijklm""ghijklmn""hijklmno"
-            "ijklmnop""jklmnopq""klmnopqr""lmnopqrs"
-            "mnopqrst""nopqrstu",
-            112, md, NULL, EVP_sha384(), NULL);
-        if (memcmp(md, app_d2, sizeof(app_d2))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 2 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        EVP_MD_CTX_init(&evp);
-        EVP_DigestInit_ex(&evp, EVP_sha384(), NULL);
-        for (i = 0; i < 1000000; i += 64)
-                EVP_DigestUpdate(&evp,
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
-                    "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
-                    (1000000 - i) < 64 ? 1000000 - i : 64);
-        EVP_DigestFinal_ex(&evp, md, NULL);
-        EVP_MD_CTX_cleanup(&evp);
-
-        if (memcmp(md, app_d3, sizeof(app_d3))) {
-                fflush(stdout);
-                fprintf(stderr, "\nTEST 3 of 3 failed.\n");
-                return 1;
-        }
-        fprintf(stdout, ".");
-        fflush(stdout);
-
-        fprintf(stdout, " passed.\n");
-        fflush(stdout);
-
-        return 0;
-}
-#endif
diff --git a/src/regress/lib/libcrypto/utf8/Makefile b/src/regress/lib/libcrypto/utf8/Makefile
deleted file mode 100644
index 5f06560ea5..0000000000
--- a/src/regress/lib/libcrypto/utf8/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.6 2016/12/21 15:51:05 jsing Exp $
-
-PROG=   utf8test
-CPPFLAGS+=-I${.CURDIR}/../../../../lib/libcrypto/asn1
-LDADD=  ${CRYPTO_INT}
-DPADD=  ${LIBCRYPTO}
-WARNINGS=Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/utf8/utf8test.c b/src/regress/lib/libcrypto/utf8/utf8test.c
deleted file mode 100644
index e3a47d5adf..0000000000
--- a/src/regress/lib/libcrypto/utf8/utf8test.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*      $OpenBSD: utf8test.c,v 1.4 2018/07/17 17:06:50 tb Exp $ */
-/*
- * Copyright (c) 2014 Philip Guenther <guenther@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * A mostly exhaustive test of UTF-8 decoder and encoder
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <err.h>
-
-#include <openssl/asn1.h>
-#include "asn1_locl.h"          /* peek into the internals */
-
-#define UNCHANGED       0xfedcba98
-
-#define ASSERT(x)                                               \
-        do {                                                    \
-                if (!(x))                                       \
-                        errx(1, "test failed at line %d: %s",   \
-                            __LINE__, #x);                      \
-        } while (0)
-
-int
-main(void)
-{
-        unsigned char testbuf[] = "012345";
-        const unsigned char zerobuf[sizeof testbuf] = { 0 };
-        unsigned long value;
-        unsigned int i, j, k, l;
-        int ret;
-
-        /*
-         * First, verify UTF8_getc()
-         */
-        value = UNCHANGED;
-        ret = UTF8_getc(testbuf, 0, &value);
-        ASSERT(ret == 0);
-        ASSERT(value == UNCHANGED);
-
-        /* check all valid single-byte chars */
-        for (i = 0; i < 0x80; i++) {
-                testbuf[0] = i;
-                ret = UTF8_getc(testbuf, 1, &value);
-                ASSERT(ret == 1);
-                ASSERT(value == i);
-
-                ret = UTF8_getc(testbuf, 2, &value);
-                ASSERT(ret == 1);
-                ASSERT(value == i);
-        }
-
-        /*
-         * Verify failure on all invalid initial bytes:
-         *      0x80 - 0xBF     following bytes only
-         *      0xC0 - 0xC1     used to be in non-shortest forms
-         *      0xF5 - 0xFD     used to be initial for 5 and 6 byte sequences
-         *      0xFE - 0xFF     have never been valid in utf-8
-         */
-        for (i = 0x80; i < 0xC2; i++) {
-                value = UNCHANGED;
-                testbuf[0] = i;
-                ret = UTF8_getc(testbuf, 1, &value);
-                ASSERT(ret == -2);
-                ASSERT(value == UNCHANGED);
-        }
-        for (i = 0xF5; i < 0x100; i++) {
-                value = UNCHANGED;
-                testbuf[0] = i;
-                ret = UTF8_getc(testbuf, 1, &value);
-                ASSERT(ret == -2);
-                ASSERT(value == UNCHANGED);
-        }
-
-        /*
-         * Verify handling of all two-byte sequences
-         */
-        for (i = 0xC2; i < 0xE0; i++) {
-                testbuf[0] = i;
-
-                for (j = 0; j < 0x100; j++) {
-                        testbuf[1] = j;
-
-                        value = UNCHANGED;
-                        ret = UTF8_getc(testbuf, 1, &value);
-                        ASSERT(ret == -1);
-                        ASSERT(value == UNCHANGED);
-
-                        ret = UTF8_getc(testbuf, 2, &value);
-
-                        /* outside range of trailing bytes */
-                        if (j < 0x80 || j > 0xBF) {
-                                ASSERT(ret == -3);
-                                ASSERT(value == UNCHANGED);
-                                continue;
-                        }
-
-                        /* valid */
-                        ASSERT(ret == 2);
-                        ASSERT((value & 0x3F) == (j & 0x3F));
-                        ASSERT(value >> 6 == (i & 0x1F));
-                }
-        }
-
-        /*
-         * Verify handling of all three-byte sequences
-         */
-        for (i = 0xE0; i < 0xF0; i++) {
-                testbuf[0] = i;
-
-                for (j = 0; j < 0x100; j++) {
-                        testbuf[1] = j;
-
-                        for (k = 0; k < 0x100; k++) {
-                                testbuf[2] = k;
-
-                                value = UNCHANGED;
-                                ret = UTF8_getc(testbuf, 2, &value);
-                                ASSERT(ret == -1);
-                                ASSERT(value == UNCHANGED);
-
-                                ret = UTF8_getc(testbuf, 3, &value);
-
-                                /* outside range of trailing bytes */
-                                if (j < 0x80 || j > 0xBF ||
-                                    k < 0x80 || k > 0xBF) {
-                                        ASSERT(ret == -3);
-                                        ASSERT(value == UNCHANGED);
-                                        continue;
-                                }
-
-                                /* non-shortest form */
-                                if (i == 0xE0 && j < 0xA0) {
-                                        ASSERT(ret == -4);
-                                        ASSERT(value == UNCHANGED);
-                                        continue;
-                                }
-
-                                /* surrogate pair code point */
-                                if (i == 0xED && j > 0x9F) {
-                                        ASSERT(ret == -2);
-                                        ASSERT(value == UNCHANGED);
-                                        continue;
-                                }
-
-                                ASSERT(ret == 3);
-                                ASSERT((value & 0x3F) == (k & 0x3F));
-                                ASSERT(((value >> 6) & 0x3F) == (j & 0x3F));
-                                ASSERT(value >> 12 == (i & 0x0F));
-                        }
-                }
-        }
-
-        /*
-         * Verify handling of all four-byte sequences
-         */
-        for (i = 0xF0; i < 0xF5; i++) {
-                testbuf[0] = i;
-
-                for (j = 0; j < 0x100; j++) {
-                        testbuf[1] = j;
-
-                        for (k = 0; k < 0x100; k++) {
-                                testbuf[2] = k;
-
-                                for (l = 0; l < 0x100; l++) {
-                                        testbuf[3] = l;
-
-                                        value = UNCHANGED;
-                                        ret = UTF8_getc(testbuf, 3, &value);
-                                        ASSERT(ret == -1);
-                                        ASSERT(value == UNCHANGED);
-
-                                        ret = UTF8_getc(testbuf, 4, &value);
-
-                                        /* outside range of trailing bytes */
-                                        if (j < 0x80 || j > 0xBF ||
-                                            k < 0x80 || k > 0xBF ||
-                                            l < 0x80 || l > 0xBF) {
-                                                ASSERT(ret == -3);
-                                                ASSERT(value == UNCHANGED);
-                                                continue;
-                                        }
-
-                                        /* non-shortest form */
-                                        if (i == 0xF0 && j < 0x90) {
-                                                ASSERT(ret == -4);
-                                                ASSERT(value == UNCHANGED);
-                                                continue;
-                                        }
-
-                                        /* beyond end of UCS range */
-                                        if (i == 0xF4 && j > 0x8F) {
-                                                ASSERT(ret == -2);
-                                                ASSERT(value == UNCHANGED);
-                                                continue;
-                                        }
-
-                                        ASSERT(ret == 4);
-                                        ASSERT((value & 0x3F) == (l & 0x3F));
-                                        ASSERT(((value >> 6) & 0x3F) ==
-                                                          (k & 0x3F));
-                                        ASSERT(((value >> 12) & 0x3F) ==
-                                                           (j & 0x3F));
-                                        ASSERT(value >> 18 == (i & 0x07));
-                                }
-                        }
-                }
-        }
-
-
-        /*
-         * Next, verify UTF8_putc()
-         */
-        memset(testbuf, 0, sizeof testbuf);
-
-        /* single-byte sequences */
-        for (i = 0; i < 0x80; i++) {
-                ret = UTF8_putc(NULL, 0, i);
-                ASSERT(ret == 1);
-
-                testbuf[0] = 0;
-                ret = UTF8_putc(testbuf, 0, i);
-                ASSERT(ret == -1);
-                ASSERT(memcmp(testbuf, zerobuf, sizeof testbuf) == 0);
-
-                ret = UTF8_putc(testbuf, 1, i);
-                ASSERT(ret == 1);
-                ASSERT(testbuf[0] == i);
-                ASSERT(memcmp(testbuf+1, zerobuf, sizeof(testbuf)-1) == 0);
-        }
-
-        /* two-byte sequences */
-        for (i = 0x80; i < 0x800; i++) {
-                ret = UTF8_putc(NULL, 0, i);
-                ASSERT(ret == 2);
-
-                testbuf[0] = testbuf[1] = 0;
-                ret = UTF8_putc(testbuf, 1, i);
-                ASSERT(ret == -1);
-                ASSERT(memcmp(testbuf, zerobuf, sizeof testbuf) == 0);
-
-                ret = UTF8_putc(testbuf, 2, i);
-                ASSERT(ret == 2);
-                ASSERT(memcmp(testbuf+2, zerobuf, sizeof(testbuf)-2) == 0);
-                ret = UTF8_getc(testbuf, 2, &value);
-                ASSERT(ret == 2);
-                ASSERT(value == i);
-        }
-
-        /* three-byte sequences */
-        for (i = 0x800; i < 0x10000; i++) {
-                if (i >= 0xD800 && i < 0xE000) {
-                        /* surrogates aren't valid */
-                        ret = UTF8_putc(NULL, 0, i);
-                        ASSERT(ret == -2);
-                        continue;
-                }
-
-                ret = UTF8_putc(NULL, 0, i);
-                ASSERT(ret == 3);
-
-                testbuf[0] = testbuf[1] = testbuf[2] = 0;
-                ret = UTF8_putc(testbuf, 2, i);
-                ASSERT(ret == -1);
-                ASSERT(memcmp(testbuf, zerobuf, sizeof testbuf) == 0);
-
-                ret = UTF8_putc(testbuf, 3, i);
-                ASSERT(ret == 3);
-                ASSERT(memcmp(testbuf+3, zerobuf, sizeof(testbuf)-3) == 0);
-                ret = UTF8_getc(testbuf, 3, &value);
-                ASSERT(ret == 3);
-                ASSERT(value == i);
-        }
-
-        /* four-byte sequences */
-        for (i = 0x10000; i < 0x110000; i++) {
-                ret = UTF8_putc(NULL, 0, i);
-                ASSERT(ret == 4);
-
-                testbuf[0] = testbuf[1] = testbuf[2] = testbuf[3] = 0;
-                ret = UTF8_putc(testbuf, 3, i);
-                ASSERT(ret == -1);
-                ASSERT(memcmp(testbuf, zerobuf, sizeof testbuf) == 0);
-
-                ret = UTF8_putc(testbuf, 4, i);
-                ASSERT(ret == 4);
-                ASSERT(memcmp(testbuf+4, zerobuf, sizeof(testbuf)-4) == 0);
-                ret = UTF8_getc(testbuf, 4, &value);
-                ASSERT(ret == 4);
-                ASSERT(value == i);
-        }
-
-        /* spot check some larger values to confirm error return */
-        for (i = 0x110000; i < 0x110100; i++) {
-                ret = UTF8_putc(NULL, 0, i);
-                ASSERT(ret == -2);
-        }
-        for (value = (unsigned long)-1; value > (unsigned long)-256; value--) {
-                ret = UTF8_putc(NULL, 0, value);
-                ASSERT(ret == -2);
-        }
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/wycheproof/Makefile b/src/regress/lib/libcrypto/wycheproof/Makefile
deleted file mode 100644
index 4359db438c..0000000000
--- a/src/regress/lib/libcrypto/wycheproof/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2018/09/22 00:10:18 tb Exp $
-
-GO_VERSION != sh -c "(go version) 2>/dev/null || true"
-
-.if empty(GO_VERSION)
-regress:
-        @echo package go is required for this regress
-        @echo SKIPPED
-.endif
-
-CLEANFILES+=wycheproof
-REGRESS_TARGETS=regress-wycheproof
-
-audit: wycheproof
-        ./wycheproof -v
-
-wycheproof: wycheproof.go
-        go build -o wycheproof ${.CURDIR}/wycheproof.go
-
-regress-wycheproof: wycheproof
-        ./wycheproof
-
-.PHONY: audit
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/wycheproof/wycheproof.go b/src/regress/lib/libcrypto/wycheproof/wycheproof.go
deleted file mode 100644
index 9bc4e5fd8b..0000000000
--- a/src/regress/lib/libcrypto/wycheproof/wycheproof.go
+++ /dev/null
@@ -1,2211 +0,0 @@
-/* $OpenBSD: wycheproof.go,v 1.86 2018/10/20 16:02:05 tb Exp $ */
-/*
- * Copyright (c) 2018 Joel Sing <jsing@openbsd.org>
- * Copyright (c) 2018 Theo Buehler <tb@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-// Wycheproof runs test vectors from Project Wycheproof against libcrypto.
-package main
-
-/*
-#cgo LDFLAGS: -lcrypto
-
-#include <string.h>
-
-#include <openssl/aes.h>
-#include <openssl/bio.h>
-#include <openssl/bn.h>
-#include <openssl/cmac.h>
-#include <openssl/curve25519.h>
-#include <openssl/dsa.h>
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
-#include <openssl/rsa.h>
-*/
-import "C"
-
-import (
-        "bytes"
-        "crypto/sha1"
-        "crypto/sha256"
-        "crypto/sha512"
-        "encoding/base64"
-        "encoding/hex"
-        "encoding/json"
-        "flag"
-        "fmt"
-        "hash"
-        "io/ioutil"
-        "log"
-        "os"
-        "path/filepath"
-        "sort"
-        "unsafe"
-)
-
-const testVectorPath = "/usr/local/share/wycheproof/testvectors"
-
-var acceptableAudit = false
-var acceptableComments map[string]int
-var acceptableFlags map[string]int
-
-type wycheproofJWKPublic struct {
-        Crv string `json:"crv"`
-        KID string `json:"kid"`
-        KTY string `json:"kty"`
-        X   string `json:"x"`
-        Y   string `json:"y"`
-}
-
-type wycheproofJWKPrivate struct {
-        Crv string `json:"crv"`
-        D   string `json:"d"`
-        KID string `json:"kid"`
-        KTY string `json:"kty"`
-        X   string `json:"x"`
-        Y   string `json:"y"`
-}
-
-type wycheproofTestGroupAesCbcPkcs5 struct {
-        IVSize  int                          `json:"ivSize"`
-        KeySize int                          `json:"keySize"`
-        Type    string                       `json:"type"`
-        Tests   []*wycheproofTestAesCbcPkcs5 `json:"tests"`
-}
-
-type wycheproofTestAesCbcPkcs5 struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Key     string   `json:"key"`
-        IV      string   `json:"iv"`
-        Msg     string   `json:"msg"`
-        CT      string   `json:"ct"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupAead struct {
-        IVSize  int                   `json:"ivSize"`
-        KeySize int                   `json:"keySize"`
-        TagSize int                   `json:"tagSize"`
-        Type    string                `json:"type"`
-        Tests   []*wycheproofTestAead `json:"tests"`
-}
-
-type wycheproofTestAead struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Key     string   `json:"key"`
-        IV      string   `json:"iv"`
-        AAD     string   `json:"aad"`
-        Msg     string   `json:"msg"`
-        CT      string   `json:"ct"`
-        Tag     string   `json:"tag"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupAesCmac struct {
-        KeySize int                      `json:"keySize"`
-        TagSize int                      `json:"tagSize"`
-        Type    string                   `json:"type"`
-        Tests   []*wycheproofTestAesCmac `json:"tests"`
-}
-
-type wycheproofTestAesCmac struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Key     string   `json:"key"`
-        Msg     string   `json:"msg"`
-        Tag     string   `json:"tag"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofDSAKey struct {
-        G       string `json:"g"`
-        KeySize int    `json:"keySize"`
-        P       string `json:"p"`
-        Q       string `json:"q"`
-        Type    string `json:"type"`
-        Y       string `json:"y"`
-}
-
-type wycheproofTestDSA struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Msg     string   `json:"msg"`
-        Sig     string   `json:"sig"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupDSA struct {
-        Key    *wycheproofDSAKey    `json:"key"`
-        KeyDER string               `json:"keyDer"`
-        KeyPEM string               `json:"keyPem"`
-        SHA    string               `json:"sha"`
-        Type   string               `json:"type"`
-        Tests  []*wycheproofTestDSA `json:"tests"`
-}
-
-type wycheproofTestECDH struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Public  string   `json:"public"`
-        Private string   `json:"private"`
-        Shared  string   `json:"shared"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupECDH struct {
-        Curve    string                `json:"curve"`
-        Encoding string                `json:"encoding"`
-        Type     string                `json:"type"`
-        Tests    []*wycheproofTestECDH `json:"tests"`
-}
-
-type wycheproofTestECDHWebCrypto struct {
-        TCID    int                   `json:"tcId"`
-        Comment string                `json:"comment"`
-        Public  *wycheproofJWKPublic  `json:"public"`
-        Private *wycheproofJWKPrivate `json:"private"`
-        Shared  string                `json:"shared"`
-        Result  string                `json:"result"`
-        Flags   []string              `json:"flags"`
-}
-
-type wycheproofTestGroupECDHWebCrypto struct {
-        Curve    string                         `json:"curve"`
-        Encoding string                         `json:"encoding"`
-        Type     string                         `json:"type"`
-        Tests    []*wycheproofTestECDHWebCrypto `json:"tests"`
-}
-
-type wycheproofECDSAKey struct {
-        Curve        string `json:"curve"`
-        KeySize      int    `json:"keySize"`
-        Type         string `json:"type"`
-        Uncompressed string `json:"uncompressed"`
-        WX           string `json:"wx"`
-        WY           string `json:"wy"`
-}
-
-type wycheproofTestECDSA struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Msg     string   `json:"msg"`
-        Sig     string   `json:"sig"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupECDSA struct {
-        Key    *wycheproofECDSAKey    `json:"key"`
-        KeyDER string                 `json:"keyDer"`
-        KeyPEM string                 `json:"keyPem"`
-        SHA    string                 `json:"sha"`
-        Type   string                 `json:"type"`
-        Tests  []*wycheproofTestECDSA `json:"tests"`
-}
-
-type wycheproofTestGroupECDSAWebCrypto struct {
-        JWK    *wycheproofJWKPublic   `json:"jwk"`
-        Key    *wycheproofECDSAKey    `json:"key"`
-        KeyDER string                 `json:"keyDer"`
-        KeyPEM string                 `json:"keyPem"`
-        SHA    string                 `json:"sha"`
-        Type   string                 `json:"type"`
-        Tests  []*wycheproofTestECDSA `json:"tests"`
-}
-
-type wycheproofTestKW struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Key     string   `json:"key"`
-        Msg     string   `json:"msg"`
-        CT      string   `json:"ct"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupKW struct {
-        KeySize int                 `json:"keySize"`
-        Type    string              `json:"type"`
-        Tests   []*wycheproofTestKW `json:"tests"`
-}
-
-type wycheproofTestRSA struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Msg     string   `json:"msg"`
-        Sig     string   `json:"sig"`
-        Padding string   `json:"padding"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupRSA struct {
-        E       string               `json:"e"`
-        KeyASN  string               `json:"keyAsn"`
-        KeyDER  string               `json:"keyDer"`
-        KeyPEM  string               `json:"keyPem"`
-        KeySize int                  `json:"keysize"`
-        N       string               `json:"n"`
-        SHA     string               `json:"sha"`
-        Type    string               `json:"type"`
-        Tests   []*wycheproofTestRSA `json:"tests"`
-}
-
-type wycheproofTestRSASSA struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Msg     string   `json:"msg"`
-        Sig     string   `json:"sig"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupRSASSA struct {
-        E       string                  `json:"e"`
-        KeyASN  string                  `json:"keyAsn"`
-        KeyDER  string                  `json:"keyDer"`
-        KeyPEM  string                  `json:"keyPem"`
-        KeySize int                     `json:"keysize"`
-        MGF     string                  `json:"mgf"`
-        MGFSHA  string                  `json:"mgfSha"`
-        N       string                  `json:"n"`
-        SLen    int                     `json:"sLen"`
-        SHA     string                  `json:"sha"`
-        Type    string                  `json:"type"`
-        Tests   []*wycheproofTestRSASSA `json:"tests"`
-}
-
-type wycheproofTestX25519 struct {
-        TCID    int      `json:"tcId"`
-        Comment string   `json:"comment"`
-        Curve   string   `json:"curve"`
-        Public  string   `json:"public"`
-        Private string   `json:"private"`
-        Shared  string   `json:"shared"`
-        Result  string   `json:"result"`
-        Flags   []string `json:"flags"`
-}
-
-type wycheproofTestGroupX25519 struct {
-        Curve string                  `json:"curve"`
-        Tests []*wycheproofTestX25519 `json:"tests"`
-}
-
-type wycheproofTestVectors struct {
-        Algorithm        string            `json:"algorithm"`
-        GeneratorVersion string            `json:"generatorVersion"`
-        Notes            map[string]string `json:"notes"`
-        NumberOfTests    int               `json:"numberOfTests"`
-        // Header
-        TestGroups []json.RawMessage `json:"testGroups"`
-}
-
-var nids = map[string]int{
-        "brainpoolP224r1": C.NID_brainpoolP224r1,
-        "brainpoolP256r1": C.NID_brainpoolP256r1,
-        "brainpoolP320r1": C.NID_brainpoolP320r1,
-        "brainpoolP384r1": C.NID_brainpoolP384r1,
-        "brainpoolP512r1": C.NID_brainpoolP512r1,
-        "brainpoolP224t1": C.NID_brainpoolP224t1,
-        "brainpoolP256t1": C.NID_brainpoolP256t1,
-        "brainpoolP320t1": C.NID_brainpoolP320t1,
-        "brainpoolP384t1": C.NID_brainpoolP384t1,
-        "brainpoolP512t1": C.NID_brainpoolP512t1,
-        "secp224r1":       C.NID_secp224r1,
-        "secp256k1":       C.NID_secp256k1,
-        "P-256K":          C.NID_secp256k1,
-        "secp256r1":       C.NID_X9_62_prime256v1, // RFC 8422, Table 4, p.32
-        "P-256":           C.NID_X9_62_prime256v1,
-        "secp384r1":       C.NID_secp384r1,
-        "P-384":           C.NID_secp384r1,
-        "secp521r1":       C.NID_secp521r1,
-        "P-521":           C.NID_secp521r1,
-        "SHA-1":           C.NID_sha1,
-        "SHA-224":         C.NID_sha224,
-        "SHA-256":         C.NID_sha256,
-        "SHA-384":         C.NID_sha384,
-        "SHA-512":         C.NID_sha512,
-}
-
-func gatherAcceptableStatistics(testcase int, comment string, flags []string) {
-        fmt.Printf("AUDIT: Test case %d (%q) %v\n", testcase, comment, flags)
-
-        if comment == "" {
-                acceptableComments["No comment"]++
-        } else {
-                acceptableComments[comment]++
-        }
-
-        if len(flags) == 0 {
-                acceptableFlags["NoFlag"]++
-        } else {
-                for _, flag := range flags {
-                        acceptableFlags[flag]++
-                }
-        }
-}
-
-func printAcceptableStatistics() {
-        fmt.Printf("\nComment statistics:\n")
-
-        var comments []string
-        for comment := range acceptableComments {
-                comments = append(comments, comment)
-        }
-        sort.Strings(comments)
-        for _, comment := range comments {
-                prcomment := comment
-                if len(comment) > 45 {
-                        prcomment = comment[0:42] + "..."
-                }
-                fmt.Printf("%-45v %5d\n", prcomment, acceptableComments[comment])
-        }
-
-        fmt.Printf("\nFlag statistics:\n")
-        var flags []string
-        for flag := range acceptableFlags {
-                flags = append(flags, flag)
-        }
-        sort.Strings(flags)
-        for _, flag := range flags {
-                fmt.Printf("%-45v %5d\n", flag, acceptableFlags[flag])
-        }
-}
-
-func nidFromString(ns string) (int, error) {
-        nid, ok := nids[ns]
-        if ok {
-                return nid, nil
-        }
-        return -1, fmt.Errorf("unknown NID %q", ns)
-}
-
-func hashFromString(hs string) (hash.Hash, error) {
-        switch hs {
-        case "SHA-1":
-                return sha1.New(), nil
-        case "SHA-224":
-                return sha256.New224(), nil
-        case "SHA-256":
-                return sha256.New(), nil
-        case "SHA-384":
-                return sha512.New384(), nil
-        case "SHA-512":
-                return sha512.New(), nil
-        default:
-                return nil, fmt.Errorf("unknown hash %q", hs)
-        }
-}
-
-func hashEvpMdFromString(hs string) (*C.EVP_MD, error) {
-        switch hs {
-        case "SHA-1":
-                return C.EVP_sha1(), nil
-        case "SHA-224":
-                return C.EVP_sha224(), nil
-        case "SHA-256":
-                return C.EVP_sha256(), nil
-        case "SHA-384":
-                return C.EVP_sha384(), nil
-        case "SHA-512":
-                return C.EVP_sha512(), nil
-        default:
-                return nil, fmt.Errorf("unknown hash %q", hs)
-        }
-}
-
-func checkAesCbcPkcs5(ctx *C.EVP_CIPHER_CTX, doEncrypt int, key []byte, keyLen int,
-        iv []byte, ivLen int, in []byte, inLen int, out []byte, outLen int,
-        wt *wycheproofTestAesCbcPkcs5) bool {
-        var action string
-        if doEncrypt == 1 {
-                action = "encrypting"
-        } else {
-                action = "decrypting"
-        }
-
-        ret := C.EVP_CipherInit_ex(ctx, nil, nil, (*C.uchar)(unsafe.Pointer(&key[0])),
-                (*C.uchar)(unsafe.Pointer(&iv[0])), C.int(doEncrypt))
-        if ret != 1 {
-                log.Fatalf("EVP_CipherInit_ex failed: %d", ret)
-        }
-
-        cipherOut := make([]byte, inLen + C.EVP_MAX_BLOCK_LENGTH)
-        var cipherOutLen C.int
-
-        ret = C.EVP_CipherUpdate(ctx, (*C.uchar)(unsafe.Pointer(&cipherOut[0])), &cipherOutLen,
-                (*C.uchar)(unsafe.Pointer(&in[0])), C.int(inLen))
-        if ret != 1 {
-                if wt.Result == "invalid" {
-                        fmt.Printf("INFO: Test case %d (%q) [%v] %v - EVP_CipherUpdate() = %d, want %v\n",
-                                wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - EVP_CipherUpdate() = %d, want %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        var finallen C.int
-        ret = C.EVP_CipherFinal_ex(ctx, (*C.uchar)(unsafe.Pointer(&cipherOut[cipherOutLen])), &finallen)
-        if ret != 1 {
-                if wt.Result == "invalid" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - EVP_CipherFinal_ex() = %d, want %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        cipherOutLen += finallen
-        if cipherOutLen != C.int(outLen) && wt.Result != "invalid" {
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - open length mismatch: got %d, want %d\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, cipherOutLen, outLen)
-                return false
-        }
-
-        openedMsg := out[0:cipherOutLen]
-        if outLen == 0 {
-                out = nil
-        }
-
-        success := false
-        if bytes.Equal(openedMsg, out) || wt.Result == "invalid" {
-                success = true
-                if acceptableAudit && wt.Result == "acceptable" {
-                        gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-                }
-        } else {
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - msg match: %t; want %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, bytes.Equal(openedMsg, out), wt.Result)
-        }
-        return success
-}
-
-func runAesCbcPkcs5Test(ctx *C.EVP_CIPHER_CTX, wt *wycheproofTestAesCbcPkcs5) bool {
-        key, err := hex.DecodeString(wt.Key)
-        if err != nil {
-                log.Fatalf("Failed to decode key %q: %v", wt.Key, err)
-        }
-        iv, err := hex.DecodeString(wt.IV)
-        if err != nil {
-                log.Fatalf("Failed to decode IV %q: %v", wt.IV, err)
-        }
-        ct, err := hex.DecodeString(wt.CT)
-        if err != nil {
-                log.Fatalf("Failed to decode CT %q: %v", wt.CT, err)
-        }
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode message %q: %v", wt.Msg, err)
-        }
-
-        keyLen, ivLen, ctLen, msgLen := len(key), len(iv), len(ct), len(msg)
-
-        if keyLen == 0 {
-                key = append(key, 0)
-        }
-        if ivLen == 0 {
-                iv = append(iv, 0)
-        }
-        if ctLen == 0 {
-                ct = append(ct, 0)
-        }
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-
-        openSuccess := checkAesCbcPkcs5(ctx, 0, key, keyLen, iv, ivLen, ct, ctLen, msg, msgLen, wt)
-        sealSuccess := checkAesCbcPkcs5(ctx, 1, key, keyLen, iv, ivLen, msg, msgLen, ct, ctLen, wt)
-
-        return openSuccess && sealSuccess
-}
-
-func runAesCbcPkcs5TestGroup(algorithm string, wtg *wycheproofTestGroupAesCbcPkcs5) bool {
-        fmt.Printf("Running %v test group %v with IV size %d and key size %d...\n",
-                algorithm, wtg.Type, wtg.IVSize, wtg.KeySize)
-
-        var cipher *C.EVP_CIPHER
-        switch wtg.KeySize {
-        case 128:
-                cipher = C.EVP_aes_128_cbc()
-        case 192:
-                cipher = C.EVP_aes_192_cbc()
-        case 256:
-                cipher = C.EVP_aes_256_cbc()
-        default:
-                log.Fatalf("Unsupported key size: %d", wtg.KeySize)
-        }
-
-        ctx := C.EVP_CIPHER_CTX_new()
-        if ctx == nil {
-                log.Fatal("EVP_CIPHER_CTX_new() failed")
-        }
-        defer C.EVP_CIPHER_CTX_free(ctx)
-
-        ret := C.EVP_CipherInit_ex(ctx, cipher, nil, nil, nil, 0)
-        if ret != 1 {
-                log.Fatalf("EVP_CipherInit_ex failed: %d", ret)
-        }
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runAesCbcPkcs5Test(ctx, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func checkAesAead(algorithm string, ctx *C.EVP_CIPHER_CTX, doEncrypt int,
-        key []byte, keyLen int, iv []byte, ivLen int, aad []byte, aadLen int,
-        in []byte, inLen int, out []byte, outLen int, tag []byte, tagLen int,
-        wt *wycheproofTestAead) bool {
-        var ctrlSetIVLen C.int
-        var ctrlSetTag C.int
-        var ctrlGetTag C.int
-
-        doCCM := false
-        switch algorithm {
-        case "AES-CCM":
-                doCCM = true
-                ctrlSetIVLen = C.EVP_CTRL_CCM_SET_IVLEN
-                ctrlSetTag = C.EVP_CTRL_CCM_SET_TAG
-                ctrlGetTag = C.EVP_CTRL_CCM_GET_TAG
-        case "AES-GCM":
-                ctrlSetIVLen = C.EVP_CTRL_GCM_SET_IVLEN
-                ctrlSetTag = C.EVP_CTRL_GCM_SET_TAG
-                ctrlGetTag = C.EVP_CTRL_GCM_GET_TAG
-        }
-
-        setTag := unsafe.Pointer(nil)
-        var action string
-
-        if doEncrypt == 1 {
-                action = "encrypting"
-        } else {
-                action = "decrypting"
-                setTag = unsafe.Pointer(&tag[0])
-        }
-
-        ret := C.EVP_CipherInit_ex(ctx, nil, nil, nil, nil, C.int(doEncrypt))
-        if ret != 1 {
-                log.Fatalf("[%v] cipher init failed", action)
-        }
-
-        ret = C.EVP_CIPHER_CTX_ctrl(ctx, ctrlSetIVLen, C.int(ivLen), nil)
-        if ret != 1 {
-                if wt.Comment == "Nonce is too long" || wt.Comment == "Invalid nonce size" ||
-                        wt.Comment == "0 size IV is not valid" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - setting IV len to %d failed. got %d, want %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, ivLen, ret, wt.Result)
-                return false
-        }
-
-        if doEncrypt == 0 || doCCM {
-                ret = C.EVP_CIPHER_CTX_ctrl(ctx, ctrlSetTag, C.int(tagLen), setTag)
-                if ret != 1 {
-                        if wt.Comment == "Invalid tag size" {
-                                return true
-                        }
-                        fmt.Printf("FAIL: Test case %d (%q) [%v] %v - setting tag length to %d failed. got %d, want %v\n",
-                                wt.TCID, wt.Comment, action, wt.Flags, tagLen, ret, wt.Result)
-                        return false
-                }
-        }
-
-        ret = C.EVP_CipherInit_ex(ctx, nil, nil, (*C.uchar)(unsafe.Pointer(&key[0])),
-                (*C.uchar)(unsafe.Pointer(&iv[0])), C.int(doEncrypt))
-        if ret != 1 {
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - setting key and IV failed. got %d, want %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        var cipherOutLen C.int
-        if doCCM {
-                ret = C.EVP_CipherUpdate(ctx, nil, &cipherOutLen, nil, C.int(inLen))
-                if ret != 1 {
-                        fmt.Printf("FAIL: Test case %d (%q) [%v] %v - setting input length to %d failed. got %d, want %v\n",
-                                wt.TCID, wt.Comment, action, wt.Flags, inLen, ret, wt.Result)
-                        return false
-                }
-        }
-
-        ret = C.EVP_CipherUpdate(ctx, nil, &cipherOutLen, (*C.uchar)(unsafe.Pointer(&aad[0])), C.int(aadLen))
-        if ret != 1 {
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - processing AAD failed. got %d, want %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        cipherOutLen = 0
-        cipherOut := make([]byte, inLen)
-        if inLen == 0 {
-                cipherOut = append(cipherOut, 0)
-        }
-
-        ret = C.EVP_CipherUpdate(ctx, (*C.uchar)(unsafe.Pointer(&cipherOut[0])), &cipherOutLen,
-                (*C.uchar)(unsafe.Pointer(&in[0])), C.int(inLen))
-        if ret != 1 {
-                if wt.Result == "invalid" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - EVP_CipherUpdate() = %d, want %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        if doEncrypt == 1 {
-                var tmpLen C.int
-                dummyOut := make([]byte, 16)
-
-                ret = C.EVP_CipherFinal_ex(ctx, (*C.uchar)(unsafe.Pointer(&dummyOut[0])), &tmpLen)
-                if ret != 1 {
-                        fmt.Printf("FAIL: Test case %d (%q) [%v] %v - EVP_CipherFinal_ex() = %d, want %v\n",
-                                wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                        return false
-                }
-                cipherOutLen += tmpLen
-        }
-
-        if cipherOutLen != C.int(outLen) {
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - cipherOutLen %d != outLen %d. Result %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, cipherOutLen, outLen, wt.Result)
-                return false
-        }
-
-        success := true
-        if !bytes.Equal(cipherOut, out) {
-                fmt.Printf("FAIL: Test case %d (%q) [%v] %v - expected and computed output do not match. Result: %v\n",
-                        wt.TCID, wt.Comment, action, wt.Flags, wt.Result)
-                success = false
-        }
-        if doEncrypt == 1 {
-                tagOut := make([]byte, tagLen)
-                ret = C.EVP_CIPHER_CTX_ctrl(ctx, ctrlGetTag, C.int(tagLen), unsafe.Pointer(&tagOut[0]))
-                if ret != 1 {
-                        fmt.Printf("FAIL: Test case %d (%q) [%v] %v - EVP_CIPHER_CTX_ctrl() = %d, want %v\n",
-                                wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                        return false
-                }
-
-                // There are no acceptable CCM cases. All acceptable GCM tests
-                // pass. They have len(IV) <= 48. NIST SP 800-38D, 5.2.1.1, p.8,
-                // allows 1 <= len(IV) <= 2^64-1, but notes:
-                //   "For IVs it is recommended that implementations restrict
-                //    support to the length of 96 bits, to promote
-                //    interoperability, efficiency and simplicity of design."
-                if bytes.Equal(tagOut, tag) != (wt.Result == "valid" || wt.Result == "acceptable") {
-                        fmt.Printf("FAIL: Test case %d (%q) [%v] %v - expected and computed tag do not match - ret: %d, Result: %v\n",
-                                wt.TCID, wt.Comment, action, wt.Flags, ret, wt.Result)
-                        success = false
-                }
-                if acceptableAudit && bytes.Equal(tagOut, tag) && wt.Result == "acceptable" {
-                        gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-                }
-        }
-        return success
-}
-
-func runAesAeadTest(algorithm string, ctx *C.EVP_CIPHER_CTX, aead *C.EVP_AEAD, wt *wycheproofTestAead) bool {
-        key, err := hex.DecodeString(wt.Key)
-        if err != nil {
-                log.Fatalf("Failed to decode key %q: %v", wt.Key, err)
-        }
-
-        iv, err := hex.DecodeString(wt.IV)
-        if err != nil {
-                log.Fatalf("Failed to decode IV %q: %v", wt.IV, err)
-        }
-
-        aad, err := hex.DecodeString(wt.AAD)
-        if err != nil {
-                log.Fatalf("Failed to decode AAD %q: %v", wt.AAD, err)
-        }
-
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode msg %q: %v", wt.Msg, err)
-        }
-
-        ct, err := hex.DecodeString(wt.CT)
-        if err != nil {
-                log.Fatalf("Failed to decode CT %q: %v", wt.CT, err)
-        }
-
-        tag, err := hex.DecodeString(wt.Tag)
-        if err != nil {
-                log.Fatalf("Failed to decode tag %q: %v", wt.Tag, err)
-        }
-
-        keyLen, ivLen, aadLen, msgLen, ctLen, tagLen := len(key), len(iv), len(aad), len(msg), len(ct), len(tag)
-
-        if keyLen == 0 {
-                key = append(key, 0)
-        }
-        if ivLen == 0 {
-                iv = append(iv, 0)
-        }
-        if aadLen == 0 {
-                aad = append(aad, 0)
-        }
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-        if ctLen == 0 {
-                ct = append(ct, 0)
-        }
-        if tagLen == 0 {
-                tag = append(tag, 0)
-        }
-
-        openEvp := checkAesAead(algorithm, ctx, 0, key, keyLen, iv, ivLen, aad, aadLen, ct, ctLen, msg, msgLen, tag, tagLen, wt)
-        sealEvp := checkAesAead(algorithm, ctx, 1, key, keyLen, iv, ivLen, aad, aadLen, msg, msgLen, ct, ctLen, tag, tagLen, wt)
-
-        openAead, sealAead := true, true
-        if aead != nil {
-                var ctx C.EVP_AEAD_CTX
-                if C.EVP_AEAD_CTX_init(&ctx, aead, (*C.uchar)(unsafe.Pointer(&key[0])), C.size_t(keyLen), C.size_t(tagLen), nil) != 1 {
-                        log.Fatal("Failed to initialize AEAD context")
-                }
-                defer C.EVP_AEAD_CTX_cleanup(&ctx)
-
-                // Make sure we don't accidentally prepend or compare against a 0.
-                if ctLen == 0 {
-                        ct = nil
-                }
-
-                openAead = checkAeadOpen(&ctx, iv, ivLen, aad, aadLen, msg, msgLen, ct, ctLen, tag, tagLen, wt)
-                sealAead = checkAeadSeal(&ctx, iv, ivLen, aad, aadLen, msg, msgLen, ct, ctLen, tag, tagLen, wt)
-        }
-
-        return openEvp && sealEvp && openAead && sealAead
-}
-
-func runAesAeadTestGroup(algorithm string, wtg *wycheproofTestGroupAead) bool {
-        fmt.Printf("Running %v test group %v with IV size %d, key size %d and tag size %d...\n",
-                algorithm, wtg.Type, wtg.IVSize, wtg.KeySize, wtg.TagSize)
-
-        var cipher *C.EVP_CIPHER
-        var aead *C.EVP_AEAD
-        switch algorithm {
-        case "AES-CCM":
-                switch wtg.KeySize {
-                case 128:
-                        cipher = C.EVP_aes_128_ccm()
-                case 192:
-                        cipher = C.EVP_aes_192_ccm()
-                case 256:
-                        cipher = C.EVP_aes_256_ccm()
-                default:
-                        fmt.Printf("INFO: Skipping tests with invalid key size %d\n", wtg.KeySize)
-                        return true
-                }
-        case "AES-GCM":
-                switch wtg.KeySize {
-                case 128:
-                        cipher = C.EVP_aes_128_gcm()
-                        aead = C.EVP_aead_aes_128_gcm()
-                case 192:
-                        cipher = C.EVP_aes_192_gcm()
-                case 256:
-                        cipher = C.EVP_aes_256_gcm()
-                        aead = C.EVP_aead_aes_256_gcm()
-                default:
-                        fmt.Printf("INFO: Skipping tests with invalid key size %d\n", wtg.KeySize)
-                        return true
-                }
-        default:
-                log.Fatalf("runAesAeadTestGroup() - unhandled algorithm: %v", algorithm)
-        }
-
-        ctx := C.EVP_CIPHER_CTX_new()
-        if ctx == nil {
-                log.Fatal("EVP_CIPHER_CTX_new() failed")
-        }
-        defer C.EVP_CIPHER_CTX_free(ctx)
-
-        C.EVP_CipherInit_ex(ctx, cipher, nil, nil, nil, 1)
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runAesAeadTest(algorithm, ctx, aead, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runAesCmacTest(cipher *C.EVP_CIPHER, wt *wycheproofTestAesCmac) bool {
-        key, err := hex.DecodeString(wt.Key)
-        if err != nil {
-                log.Fatalf("Failed to decode key %q: %v", wt.Key, err)
-        }
-
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode msg %q: %v", wt.Msg, err)
-        }
-
-        tag, err := hex.DecodeString(wt.Tag)
-        if err != nil {
-                log.Fatalf("Failed to decode tag %q: %v", wt.Tag, err)
-        }
-
-        keyLen, msgLen, tagLen := len(key), len(msg), len(tag)
-
-        if keyLen == 0 {
-                key = append(key, 0)
-        }
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-        if tagLen == 0 {
-                tag = append(tag, 0)
-        }
-
-        ctx := C.CMAC_CTX_new()
-        if ctx == nil {
-                log.Fatal("CMAC_CTX_new failed")
-        }
-        defer C.CMAC_CTX_free(ctx)
-
-        ret := C.CMAC_Init(ctx, unsafe.Pointer(&key[0]), C.size_t(keyLen), cipher, nil)
-        if ret != 1 {
-                fmt.Printf("FAIL: Test case %d (%q) %v - CMAC_Init() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        ret = C.CMAC_Update(ctx, unsafe.Pointer(&msg[0]), C.size_t(msgLen))
-        if ret != 1 {
-                fmt.Printf("FAIL: Test case %d (%q) %v - CMAC_Update() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        var outLen C.size_t
-        outTag := make([]byte, 16)
-
-        ret = C.CMAC_Final(ctx, (*C.uchar)(unsafe.Pointer(&outTag[0])), &outLen)
-        if ret != 1 {
-                fmt.Printf("FAIL: Test case %d (%q) %v - CMAC_Final() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        outTag = outTag[0:tagLen]
-
-        success := true
-        if bytes.Equal(tag, outTag) != (wt.Result == "valid") {
-                fmt.Printf("FAIL: Test case %d (%q) %v - want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, wt.Result)
-                success = false
-        }
-        return success
-}
-
-func runAesCmacTestGroup(algorithm string, wtg *wycheproofTestGroupAesCmac) bool {
-        fmt.Printf("Running %v test group %v with key size %d and tag size %d...\n",
-                algorithm, wtg.Type, wtg.KeySize, wtg.TagSize)
-        var cipher *C.EVP_CIPHER
-
-        switch wtg.KeySize {
-        case 128:
-                cipher = C.EVP_aes_128_cbc()
-        case 192:
-                cipher = C.EVP_aes_192_cbc()
-        case 256:
-                cipher = C.EVP_aes_256_cbc()
-        default:
-                fmt.Printf("INFO: Skipping tests with invalid key size %d\n", wtg.KeySize)
-                return true
-        }
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runAesCmacTest(cipher, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func checkAeadOpen(ctx *C.EVP_AEAD_CTX, iv []byte, ivLen int, aad []byte, aadLen int, msg []byte, msgLen int,
-        ct []byte, ctLen int, tag []byte, tagLen int, wt *wycheproofTestAead) bool {
-        maxOutLen := ctLen + tagLen
-
-        opened := make([]byte, maxOutLen)
-        var openedMsgLen C.size_t
-
-        catCtTag := append(ct, tag...)
-        openRet := C.EVP_AEAD_CTX_open(ctx, (*C.uint8_t)(unsafe.Pointer(&opened[0])),
-                (*C.size_t)(unsafe.Pointer(&openedMsgLen)), C.size_t(maxOutLen),
-                (*C.uint8_t)(unsafe.Pointer(&iv[0])), C.size_t(ivLen),
-                (*C.uint8_t)(unsafe.Pointer(&catCtTag[0])), C.size_t(len(catCtTag)),
-                (*C.uint8_t)(unsafe.Pointer(&aad[0])), C.size_t(aadLen))
-
-        if openRet != 1 {
-                if wt.Result == "invalid" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) %v - EVP_AEAD_CTX_open() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(openRet), wt.Result)
-                return false
-        }
-
-        if openedMsgLen != C.size_t(msgLen) {
-                fmt.Printf("FAIL: Test case %d (%q) %v - open length mismatch: got %d, want %d\n",
-                        wt.TCID, wt.Comment, wt.Flags, openedMsgLen, msgLen)
-                return false
-        }
-
-        openedMsg := opened[0:openedMsgLen]
-        if msgLen == 0 {
-                msg = nil
-        }
-
-        success := false
-        if bytes.Equal(openedMsg, msg) || wt.Result == "invalid" {
-                if acceptableAudit && wt.Result == "acceptable" {
-                        gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-                }
-                success = true
-        } else {
-                fmt.Printf("FAIL: Test case %d (%q) %v - msg match: %t; want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, bytes.Equal(openedMsg, msg), wt.Result)
-        }
-        return success
-}
-
-func checkAeadSeal(ctx *C.EVP_AEAD_CTX, iv []byte, ivLen int, aad []byte, aadLen int, msg []byte,
-        msgLen int, ct []byte, ctLen int, tag []byte, tagLen int, wt *wycheproofTestAead) bool {
-        maxOutLen := msgLen + tagLen
-
-        sealed := make([]byte, maxOutLen)
-        var sealedLen C.size_t
-
-        sealRet := C.EVP_AEAD_CTX_seal(ctx, (*C.uint8_t)(unsafe.Pointer(&sealed[0])),
-                (*C.size_t)(unsafe.Pointer(&sealedLen)), C.size_t(maxOutLen),
-                (*C.uint8_t)(unsafe.Pointer(&iv[0])), C.size_t(ivLen),
-                (*C.uint8_t)(unsafe.Pointer(&msg[0])), C.size_t(msgLen),
-                (*C.uint8_t)(unsafe.Pointer(&aad[0])), C.size_t(aadLen))
-
-        if sealRet != 1 {
-                fmt.Printf("FAIL: Test case %d (%q) %v - EVP_AEAD_CTX_seal() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(sealRet), wt.Result)
-                return false
-        }
-
-        if sealedLen != C.size_t(maxOutLen) {
-                fmt.Printf("FAIL: Test case %d (%q) %v - seal length mismatch: got %d, want %d\n",
-                        wt.TCID, wt.Comment, wt.Flags, sealedLen, maxOutLen)
-                return false
-        }
-
-        sealedCt := sealed[0:msgLen]
-        sealedTag := sealed[msgLen:maxOutLen]
-
-        success := false
-        if bytes.Equal(sealedCt, ct) && bytes.Equal(sealedTag, tag) || wt.Result == "invalid" {
-                if acceptableAudit && wt.Result == "acceptable" {
-                        gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-                }
-                success = true
-        } else {
-                fmt.Printf("FAIL: Test case %d (%q) %v - EVP_AEAD_CTX_seal() = %d, ct match: %t, tag match: %t; want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(sealRet),
-                        bytes.Equal(sealedCt, ct), bytes.Equal(sealedTag, tag), wt.Result)
-        }
-        return success
-}
-
-func runChaCha20Poly1305Test(wt *wycheproofTestAead) bool {
-        aead := C.EVP_aead_chacha20_poly1305()
-
-        key, err := hex.DecodeString(wt.Key)
-        if err != nil {
-                log.Fatalf("Failed to decode key %q: %v", wt.Key, err)
-        }
-        iv, err := hex.DecodeString(wt.IV)
-        if err != nil {
-                log.Fatalf("Failed to decode key %q: %v", wt.IV, err)
-        }
-        aad, err := hex.DecodeString(wt.AAD)
-        if err != nil {
-                log.Fatalf("Failed to decode AAD %q: %v", wt.AAD, err)
-        }
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode msg %q: %v", wt.Msg, err)
-        }
-        ct, err := hex.DecodeString(wt.CT)
-        if err != nil {
-                log.Fatalf("Failed to decode ct %q: %v", wt.CT, err)
-        }
-        tag, err := hex.DecodeString(wt.Tag)
-        if err != nil {
-                log.Fatalf("Failed to decode tag %q: %v", wt.Tag, err)
-        }
-
-        keyLen, ivLen, aadLen, msgLen, ctLen, tagLen := len(key), len(iv), len(aad), len(msg), len(ct), len(tag)
-
-        if ivLen == 0 {
-                iv = append(iv, 0)
-        }
-        if aadLen == 0 {
-                aad = append(aad, 0)
-        }
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-
-        var ctx C.EVP_AEAD_CTX
-        if C.EVP_AEAD_CTX_init(&ctx, aead, (*C.uchar)(unsafe.Pointer(&key[0])), C.size_t(keyLen), C.size_t(tagLen), nil) != 1 {
-                log.Fatal("Failed to initialize AEAD context")
-        }
-        defer C.EVP_AEAD_CTX_cleanup(&ctx)
-
-        openSuccess := checkAeadOpen(&ctx, iv, ivLen, aad, aadLen, msg, msgLen, ct, ctLen, tag, tagLen, wt)
-        sealSuccess := checkAeadSeal(&ctx, iv, ivLen, aad, aadLen, msg, msgLen, ct, ctLen, tag, tagLen, wt)
-
-        return openSuccess && sealSuccess
-}
-
-func runChaCha20Poly1305TestGroup(algorithm string, wtg *wycheproofTestGroupAead) bool {
-        // We currently only support nonces of length 12 (96 bits)
-        if wtg.IVSize != 96 {
-                return true
-        }
-
-        fmt.Printf("Running %v test group %v with IV size %d, key size %d, tag size %d...\n",
-                algorithm, wtg.Type, wtg.IVSize, wtg.KeySize, wtg.TagSize)
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runChaCha20Poly1305Test(wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runDSATest(dsa *C.DSA, h hash.Hash, wt *wycheproofTestDSA) bool {
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode message %q: %v", wt.Msg, err)
-        }
-
-        h.Reset()
-        h.Write(msg)
-        msg = h.Sum(nil)
-
-        sig, err := hex.DecodeString(wt.Sig)
-        if err != nil {
-                log.Fatalf("Failed to decode signature %q: %v", wt.Sig, err)
-        }
-
-        msgLen, sigLen := len(msg), len(sig)
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-        if sigLen == 0 {
-                sig = append(msg, 0)
-        }
-
-        ret := C.DSA_verify(0, (*C.uchar)(unsafe.Pointer(&msg[0])), C.int(msgLen),
-                (*C.uchar)(unsafe.Pointer(&sig[0])), C.int(sigLen), dsa)
-
-        success := true
-        if ret == 1 != (wt.Result == "valid") {
-                fmt.Printf("FAIL: Test case %d (%q) %v - DSA_verify() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, wt.Result)
-                success = false
-        }
-        return success
-}
-
-func runDSATestGroup(algorithm string, wtg *wycheproofTestGroupDSA) bool {
-        fmt.Printf("Running %v test group %v, key size %d and %v...\n",
-                algorithm, wtg.Type, wtg.Key.KeySize, wtg.SHA)
-
-        dsa := C.DSA_new()
-        if dsa == nil {
-                log.Fatal("DSA_new failed")
-        }
-        defer C.DSA_free(dsa)
-
-        var bnG *C.BIGNUM
-        wg := C.CString(wtg.Key.G)
-        if C.BN_hex2bn(&bnG, wg) == 0 {
-                log.Fatal("Failed to decode g")
-        }
-        C.free(unsafe.Pointer(wg))
-
-        var bnP *C.BIGNUM
-        wp := C.CString(wtg.Key.P)
-        if C.BN_hex2bn(&bnP, wp) == 0 {
-                log.Fatal("Failed to decode p")
-        }
-        C.free(unsafe.Pointer(wp))
-
-        var bnQ *C.BIGNUM
-        wq := C.CString(wtg.Key.Q)
-        if C.BN_hex2bn(&bnQ, wq) == 0 {
-                log.Fatal("Failed to decode q")
-        }
-        C.free(unsafe.Pointer(wq))
-
-        ret := C.DSA_set0_pqg(dsa, bnP, bnQ, bnG)
-        if ret != 1 {
-                log.Fatalf("DSA_set0_pqg returned %d", ret)
-        }
-
-        var bnY *C.BIGNUM
-        wy := C.CString(wtg.Key.Y)
-        if C.BN_hex2bn(&bnY, wy) == 0 {
-                log.Fatal("Failed to decode y")
-        }
-        C.free(unsafe.Pointer(wy))
-
-        ret = C.DSA_set0_key(dsa, bnY, nil)
-        if ret != 1 {
-                log.Fatalf("DSA_set0_key returned %d", ret)
-        }
-
-        h, err := hashFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get hash: %v", err)
-        }
-
-        der, err := hex.DecodeString(wtg.KeyDER)
-        if err != nil {
-                log.Fatalf("Failed to decode DER encoded key: %v", err)
-        }
-
-        derLen := len(der)
-        if derLen == 0 {
-                der = append(der, 0)
-        }
-
-        Cder := (*C.uchar)(C.malloc(C.ulong(derLen)))
-        if Cder == nil {
-                log.Fatal("malloc failed")
-        }
-        C.memcpy(unsafe.Pointer(Cder), unsafe.Pointer(&der[0]), C.ulong(derLen))
-
-        p := (*C.uchar)(Cder)
-        dsaDER := C.d2i_DSA_PUBKEY(nil, (**C.uchar)(&p), C.long(derLen))
-        defer C.DSA_free(dsaDER)
-        C.free(unsafe.Pointer(Cder))
-
-        keyPEM := C.CString(wtg.KeyPEM)
-        bio := C.BIO_new_mem_buf(unsafe.Pointer(keyPEM), C.int(len(wtg.KeyPEM)))
-        if bio == nil {
-                log.Fatal("BIO_new_mem_buf failed")
-        }
-        defer C.free(unsafe.Pointer(keyPEM))
-        defer C.BIO_free(bio)
-
-        dsaPEM := C.PEM_read_bio_DSA_PUBKEY(bio, nil, nil, nil)
-        if dsaPEM == nil {
-                log.Fatal("PEM_read_bio_DSA_PUBKEY failed")
-        }
-        defer C.DSA_free(dsaPEM)
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runDSATest(dsa, h, wt) {
-                        success = false
-                }
-                if !runDSATest(dsaDER, h, wt) {
-                        success = false
-                }
-                if !runDSATest(dsaPEM, h, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runECDHTest(nid int, doECpoint bool, wt *wycheproofTestECDH) bool {
-        privKey := C.EC_KEY_new_by_curve_name(C.int(nid))
-        if privKey == nil {
-                log.Fatalf("EC_KEY_new_by_curve_name failed")
-        }
-        defer C.EC_KEY_free(privKey)
-
-        var bnPriv *C.BIGNUM
-        wPriv := C.CString(wt.Private)
-        if C.BN_hex2bn(&bnPriv, wPriv) == 0 {
-                log.Fatal("Failed to decode wPriv")
-        }
-        C.free(unsafe.Pointer(wPriv))
-        defer C.BN_free(bnPriv)
-
-        ret := C.EC_KEY_set_private_key(privKey, bnPriv)
-        if ret != 1 {
-                fmt.Printf("FAIL: Test case %d (%q) %v - EC_KEY_set_private_key() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        pub, err := hex.DecodeString(wt.Public)
-        if err != nil {
-                log.Fatalf("Failed to decode public key: %v", err)
-        }
-
-        pubLen := len(pub)
-        if pubLen == 0 {
-                pub = append(pub, 0)
-        }
-
-        Cpub := (*C.uchar)(C.malloc(C.ulong(pubLen)))
-        if Cpub == nil {
-                log.Fatal("malloc failed")
-        }
-        C.memcpy(unsafe.Pointer(Cpub), unsafe.Pointer(&pub[0]), C.ulong(pubLen))
-
-        p := (*C.uchar)(Cpub)
-        var pubKey *C.EC_KEY
-        if doECpoint {
-                pubKey = C.EC_KEY_new_by_curve_name(C.int(nid))
-                if pubKey == nil {
-                        log.Fatal("EC_KEY_new_by_curve_name failed")
-                }
-                pubKey = C.o2i_ECPublicKey(&pubKey, (**C.uchar)(&p), C.long(pubLen))
-        } else {
-                pubKey = C.d2i_EC_PUBKEY(nil, (**C.uchar)(&p), C.long(pubLen))
-        }
-        defer C.EC_KEY_free(pubKey)
-        C.free(unsafe.Pointer(Cpub))
-
-        if pubKey == nil {
-                if wt.Result == "invalid" || wt.Result == "acceptable" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) %v - ASN decoding failed: want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, wt.Result)
-                return false
-        }
-
-        privGroup := C.EC_KEY_get0_group(privKey)
-
-        secLen := (C.EC_GROUP_get_degree(privGroup) + 7) / 8
-
-        secret := make([]byte, secLen)
-        if secLen == 0 {
-                secret = append(secret, 0)
-        }
-
-        pubPoint := C.EC_KEY_get0_public_key(pubKey)
-
-        ret = C.ECDH_compute_key(unsafe.Pointer(&secret[0]), C.ulong(secLen), pubPoint, privKey, nil)
-        if ret != C.int(secLen) {
-                if wt.Result == "invalid" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) %v - ECDH_compute_key() = %d, want %d, result: %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, int(secLen), wt.Result)
-                return false
-        }
-
-        shared, err := hex.DecodeString(wt.Shared)
-        if err != nil {
-                log.Fatalf("Failed to decode shared secret: %v", err)
-        }
-
-        success := true
-        if !bytes.Equal(shared, secret) {
-                fmt.Printf("FAIL: Test case %d (%q) %v - expected and computed shared secret do not match, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, wt.Result)
-                success = false
-        }
-        if acceptableAudit && success && wt.Result == "acceptable" {
-                gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-        }
-        return success
-}
-
-func runECDHTestGroup(algorithm string, wtg *wycheproofTestGroupECDH) bool {
-        doECpoint := false
-        if wtg.Encoding == "ecpoint" {
-                doECpoint = true
-        }
-
-        fmt.Printf("Running %v test group %v with curve %v and %v encoding...\n",
-                algorithm, wtg.Type, wtg.Curve, wtg.Encoding)
-
-        nid, err := nidFromString(wtg.Curve)
-        if err != nil {
-                log.Fatalf("Failed to get nid for curve: %v", err)
-        }
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runECDHTest(nid, doECpoint, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runECDHWebCryptoTest(nid int, wt *wycheproofTestECDHWebCrypto) bool {
-        privKey := C.EC_KEY_new_by_curve_name(C.int(nid))
-        if privKey == nil {
-                log.Fatalf("EC_KEY_new_by_curve_name failed")
-        }
-        defer C.EC_KEY_free(privKey)
-
-        d, err := base64.RawURLEncoding.DecodeString(wt.Private.D)
-        if err != nil {
-                log.Fatalf("Failed to base64 decode d: %v", err)
-        }
-        bnD := C.BN_bin2bn((*C.uchar)(unsafe.Pointer(&d[0])), C.int(len(d)), nil)
-        if bnD == nil {
-                log.Fatal("Failed to decode D")
-        }
-        defer C.BN_free(bnD)
-
-        ret := C.EC_KEY_set_private_key(privKey, bnD)
-        if ret != 1 {
-                fmt.Printf("FAIL: Test case %d (%q) %v - EC_KEY_set_private_key() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, wt.Result)
-                return false
-        }
-
-        x, err := base64.RawURLEncoding.DecodeString(wt.Public.X)
-        if err != nil {
-                log.Fatalf("Failed to base64 decode x: %v", err)
-        }
-        bnX := C.BN_bin2bn((*C.uchar)(unsafe.Pointer(&x[0])), C.int(len(x)), nil)
-        if bnX == nil {
-                log.Fatal("Failed to decode X")
-        }
-        defer C.BN_free(bnX)
-
-        y, err := base64.RawURLEncoding.DecodeString(wt.Public.Y)
-        if err != nil {
-                log.Fatalf("Failed to base64 decode y: %v", err)
-        }
-        bnY := C.BN_bin2bn((*C.uchar)(unsafe.Pointer(&y[0])), C.int(len(y)), nil)
-        if bnY == nil {
-                log.Fatal("Failed to decode Y")
-        }
-        defer C.BN_free(bnY)
-
-        pubKey := C.EC_KEY_new_by_curve_name(C.int(nid))
-        if pubKey == nil {
-                log.Fatal("Failed to create EC_KEY")
-        }
-        defer C.EC_KEY_free(pubKey)
-
-        ret = C.EC_KEY_set_public_key_affine_coordinates(pubKey, bnX, bnY)
-        if ret != 1 {
-                if wt.Result == "invalid" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) %v - EC_KEY_set_public_key_affine_coordinates() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, wt.Result)
-                return false
-        }
-        pubPoint := C.EC_KEY_get0_public_key(pubKey)
-
-        privGroup := C.EC_KEY_get0_group(privKey)
-
-        secLen := (C.EC_GROUP_get_degree(privGroup) + 7) / 8
-
-        secret := make([]byte, secLen)
-        if secLen == 0 {
-                secret = append(secret, 0)
-        }
-
-        ret = C.ECDH_compute_key(unsafe.Pointer(&secret[0]), C.ulong(secLen), pubPoint, privKey, nil)
-        if ret != C.int(secLen) {
-                if wt.Result == "invalid" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) %v - ECDH_compute_key() = %d, want %d, result: %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, ret, int(secLen), wt.Result)
-                return false
-        }
-
-        shared, err := hex.DecodeString(wt.Shared)
-        if err != nil {
-                log.Fatalf("Failed to decode shared secret: %v", err)
-        }
-
-        success := true
-        if !bytes.Equal(shared, secret) {
-                fmt.Printf("FAIL: Test case %d (%q) %v - expected and computed shared secret do not match, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, wt.Result)
-                success = false
-        }
-        if acceptableAudit && success && wt.Result == "acceptable" {
-                gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-        }
-        return success
-}
-
-func runECDHWebCryptoTestGroup(algorithm string, wtg *wycheproofTestGroupECDHWebCrypto) bool {
-        fmt.Printf("Running %v test group %v with curve %v and %v encoding...\n",
-                algorithm, wtg.Type, wtg.Curve, wtg.Encoding)
-
-        nid, err := nidFromString(wtg.Curve)
-        if err != nil {
-                log.Fatalf("Failed to get nid for curve: %v", err)
-        }
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runECDHWebCryptoTest(nid, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runECDSATest(ecKey *C.EC_KEY, nid int, h hash.Hash, webcrypto bool, wt *wycheproofTestECDSA) bool {
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode message %q: %v", wt.Msg, err)
-        }
-
-        h.Reset()
-        h.Write(msg)
-        msg = h.Sum(nil)
-
-        msgLen := len(msg)
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-
-        var ret C.int
-        if webcrypto {
-                cDer, derLen := encodeECDSAWebCryptoSig(wt.Sig)
-                if cDer == nil {
-                        fmt.Print("FAIL: unable to decode signature")
-                        return false
-                }
-                defer C.free(unsafe.Pointer(cDer))
-
-                ret = C.ECDSA_verify(0, (*C.uchar)(unsafe.Pointer(&msg[0])), C.int(msgLen),
-                        (*C.uchar)(unsafe.Pointer(cDer)), C.int(derLen), ecKey)
-        } else {
-                sig, err := hex.DecodeString(wt.Sig)
-                if err != nil {
-                        log.Fatalf("Failed to decode signature %q: %v", wt.Sig, err)
-                }
-
-                sigLen := len(sig)
-                if sigLen == 0 {
-                        sig = append(sig, 0)
-                }
-                ret = C.ECDSA_verify(0, (*C.uchar)(unsafe.Pointer(&msg[0])), C.int(msgLen),
-                        (*C.uchar)(unsafe.Pointer(&sig[0])), C.int(sigLen), ecKey)
-        }
-
-        // XXX audit acceptable cases...
-        success := true
-        if ret == 1 != (wt.Result == "valid") && wt.Result != "acceptable" {
-                fmt.Printf("FAIL: Test case %d (%q) %v - ECDSA_verify() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(ret), wt.Result)
-                success = false
-        }
-        if acceptableAudit && ret == 1 && wt.Result == "acceptable" {
-                gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-        }
-        return success
-}
-
-func runECDSATestGroup(algorithm string, wtg *wycheproofTestGroupECDSA) bool {
-        fmt.Printf("Running %v test group %v with curve %v, key size %d and %v...\n",
-                algorithm, wtg.Type, wtg.Key.Curve, wtg.Key.KeySize, wtg.SHA)
-
-        nid, err := nidFromString(wtg.Key.Curve)
-        if err != nil {
-                log.Fatalf("Failed to get nid for curve: %v", err)
-        }
-        ecKey := C.EC_KEY_new_by_curve_name(C.int(nid))
-        if ecKey == nil {
-                log.Fatal("EC_KEY_new_by_curve_name failed")
-        }
-        defer C.EC_KEY_free(ecKey)
-
-        var bnX *C.BIGNUM
-        wx := C.CString(wtg.Key.WX)
-        if C.BN_hex2bn(&bnX, wx) == 0 {
-                log.Fatal("Failed to decode WX")
-        }
-        C.free(unsafe.Pointer(wx))
-        defer C.BN_free(bnX)
-
-        var bnY *C.BIGNUM
-        wy := C.CString(wtg.Key.WY)
-        if C.BN_hex2bn(&bnY, wy) == 0 {
-                log.Fatal("Failed to decode WY")
-        }
-        C.free(unsafe.Pointer(wy))
-        defer C.BN_free(bnY)
-
-        if C.EC_KEY_set_public_key_affine_coordinates(ecKey, bnX, bnY) != 1 {
-                log.Fatal("Failed to set EC public key")
-        }
-
-        nid, err = nidFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get MD NID: %v", err)
-        }
-        h, err := hashFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get hash: %v", err)
-        }
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runECDSATest(ecKey, nid, h, false, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-// DER encode the signature (so that ECDSA_verify() can decode and encode it again...)
-func encodeECDSAWebCryptoSig(wtSig string) (*C.uchar, C.int) {
-        cSig := C.ECDSA_SIG_new()
-        if cSig == nil {
-                log.Fatal("ECDSA_SIG_new() failed")
-        }
-        defer C.ECDSA_SIG_free(cSig)
-
-        sigLen := len(wtSig)
-        r := C.CString(wtSig[:sigLen/2])
-        s := C.CString(wtSig[sigLen/2:])
-        defer C.free(unsafe.Pointer(r))
-        defer C.free(unsafe.Pointer(s))
-        if C.BN_hex2bn(&cSig.r, r) == 0 {
-                return nil, 0
-        }
-        if C.BN_hex2bn(&cSig.s, s) == 0 {
-                return nil, 0
-        }
-
-        derLen := C.i2d_ECDSA_SIG(cSig, nil)
-        if derLen == 0 {
-                return nil, 0
-        }
-        cDer := (*C.uchar)(C.malloc(C.ulong(derLen)))
-        if cDer == nil {
-                log.Fatal("malloc failed")
-        }
-
-        p := cDer
-        ret := C.i2d_ECDSA_SIG(cSig, (**C.uchar)(&p))
-        if ret == 0 || ret != derLen {
-                C.free(unsafe.Pointer(cDer))
-                return nil, 0
-        }
-
-        return cDer, derLen
-}
-
-func runECDSAWebCryptoTestGroup(algorithm string, wtg *wycheproofTestGroupECDSAWebCrypto) bool {
-        fmt.Printf("Running %v test group %v with curve %v, key size %d and %v...\n",
-                algorithm, wtg.Type, wtg.Key.Curve, wtg.Key.KeySize, wtg.SHA)
-
-        nid, err := nidFromString(wtg.JWK.Crv)
-        if err != nil {
-                log.Fatalf("Failed to get nid for curve: %v", err)
-        }
-        ecKey := C.EC_KEY_new_by_curve_name(C.int(nid))
-        if ecKey == nil {
-                log.Fatal("EC_KEY_new_by_curve_name failed")
-        }
-        defer C.EC_KEY_free(ecKey)
-
-        x, err := base64.RawURLEncoding.DecodeString(wtg.JWK.X)
-        if err != nil {
-                log.Fatalf("Failed to base64 decode X: %v", err)
-        }
-        bnX := C.BN_bin2bn((*C.uchar)(unsafe.Pointer(&x[0])), C.int(len(x)), nil)
-        if bnX == nil {
-                log.Fatal("Failed to decode X")
-        }
-        defer C.BN_free(bnX)
-
-        y, err := base64.RawURLEncoding.DecodeString(wtg.JWK.Y)
-        if err != nil {
-                log.Fatalf("Failed to base64 decode Y: %v", err)
-        }
-        bnY := C.BN_bin2bn((*C.uchar)(unsafe.Pointer(&y[0])), C.int(len(y)), nil)
-        if bnY == nil {
-                log.Fatal("Failed to decode Y")
-        }
-        defer C.BN_free(bnY)
-
-        if C.EC_KEY_set_public_key_affine_coordinates(ecKey, bnX, bnY) != 1 {
-                log.Fatal("Failed to set EC public key")
-        }
-
-        nid, err = nidFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get MD NID: %v", err)
-        }
-        h, err := hashFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get hash: %v", err)
-        }
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runECDSATest(ecKey, nid, h, true, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runKWTestWrap(keySize int, key []byte, keyLen int, msg []byte, msgLen int, ct []byte, ctLen int, wt *wycheproofTestKW) bool {
-        var aesKey C.AES_KEY
-
-        ret := C.AES_set_encrypt_key((*C.uchar)(unsafe.Pointer(&key[0])), (C.int)(keySize), (*C.AES_KEY)(unsafe.Pointer(&aesKey)))
-        if ret != 0 {
-                fmt.Printf("FAIL: Test case %d (%q) %v - AES_set_encrypt_key() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(ret), wt.Result)
-                return false
-        }
-
-        outLen := msgLen + 8
-        out := make([]byte, outLen)
-        ret = C.AES_wrap_key((*C.AES_KEY)(unsafe.Pointer(&aesKey)), nil, (*C.uchar)(unsafe.Pointer(&out[0])), (*C.uchar)(unsafe.Pointer(&msg[0])), (C.uint)(msgLen))
-        success := false
-        if ret == C.int(outLen) && bytes.Equal(out, ct) {
-                if acceptableAudit && wt.Result == "acceptable" {
-                        gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-                }
-                if wt.Result != "invalid" {
-                        success = true
-                }
-        } else if wt.Result != "valid" {
-                success = true
-        }
-        if !success {
-                fmt.Printf("FAIL: Test case %d (%q) %v - msgLen = %d, AES_wrap_key() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, msgLen, int(ret), wt.Result)
-        }
-        return success
-}
-
-func runKWTestUnWrap(keySize int, key []byte, keyLen int, msg []byte, msgLen int, ct []byte, ctLen int, wt *wycheproofTestKW) bool {
-        var aesKey C.AES_KEY
-
-        ret := C.AES_set_decrypt_key((*C.uchar)(unsafe.Pointer(&key[0])), (C.int)(keySize), (*C.AES_KEY)(unsafe.Pointer(&aesKey)))
-        if ret != 0 {
-                fmt.Printf("FAIL: Test case %d (%q) %v - AES_set_encrypt_key() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(ret), wt.Result)
-                return false
-        }
-
-        out := make([]byte, ctLen)
-        if ctLen == 0 {
-                out = append(out, 0)
-        }
-        ret = C.AES_unwrap_key((*C.AES_KEY)(unsafe.Pointer(&aesKey)), nil, (*C.uchar)(unsafe.Pointer(&out[0])), (*C.uchar)(unsafe.Pointer(&ct[0])), (C.uint)(ctLen))
-        success := false
-        if ret == C.int(ctLen - 8) && bytes.Equal(out[0:ret], msg[0:ret]) {
-                if acceptableAudit && wt.Result == "acceptable" {
-                        gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-                }
-                if wt.Result != "invalid" {
-                        success = true
-                }
-        } else if wt.Result != "valid" {
-                success = true
-        }
-        if !success {
-                fmt.Printf("FAIL: Test case %d (%q) %v - keyLen = %d, AES_unwrap_key() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, keyLen, int(ret), wt.Result)
-        }
-        return success
-}
-
-func runKWTest(keySize int, wt *wycheproofTestKW) bool {
-        key, err := hex.DecodeString(wt.Key)
-        if err != nil {
-                log.Fatalf("Failed to decode key %q: %v", wt.Key, err)
-        }
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode msg %q: %v", wt.Msg, err)
-        }
-        ct, err := hex.DecodeString(wt.CT)
-        if err != nil {
-                log.Fatalf("Failed to decode ct %q: %v", wt.CT, err)
-        }
-
-        keyLen, msgLen, ctLen := len(key), len(msg), len(ct)
-
-        if keyLen == 0 {
-                key = append(key, 0)
-        }
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-        if ctLen == 0 {
-                ct = append(ct, 0)
-        }
-
-        wrapSuccess := runKWTestWrap(keySize, key, keyLen, msg, msgLen, ct, ctLen, wt)
-        unwrapSuccess := runKWTestUnWrap(keySize, key, keyLen, msg, msgLen, ct, ctLen, wt)
-
-        return wrapSuccess && unwrapSuccess
-}
-
-func runKWTestGroup(algorithm string, wtg *wycheproofTestGroupKW) bool {
-        fmt.Printf("Running %v test group %v with key size %d...\n",
-                algorithm, wtg.Type, wtg.KeySize)
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runKWTest(wtg.KeySize, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runRSASSATest(rsa *C.RSA, h hash.Hash, sha *C.EVP_MD, mgfSha *C.EVP_MD, sLen int, wt *wycheproofTestRSASSA) bool {
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode message %q: %v", wt.Msg, err)
-        }
-
-        h.Reset()
-        h.Write(msg)
-        msg = h.Sum(nil)
-
-        sig, err := hex.DecodeString(wt.Sig)
-        if err != nil {
-                log.Fatalf("Failed to decode signature %q: %v", wt.Sig, err)
-        }
-
-        msgLen, sigLen := len(msg), len(sig)
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-        if sigLen == 0 {
-                sig = append(sig, 0)
-        }
-
-        sigOut := make([]byte, C.RSA_size(rsa) - 11)
-        if sigLen == 0 {
-                sigOut = append(sigOut, 0)
-        }
-
-        ret := C.RSA_public_decrypt(C.int(sigLen), (*C.uchar)(unsafe.Pointer(&sig[0])),
-                (*C.uchar)(unsafe.Pointer(&sigOut[0])), rsa, C.RSA_NO_PADDING)
-        if ret == -1 {
-                if wt.Result == "invalid" {
-                        return true
-                }
-                fmt.Printf("FAIL: Test case %d (%q) %v - RSA_public_decrypt() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(ret), wt.Result)
-                return false
-        }
-
-        ret = C.RSA_verify_PKCS1_PSS_mgf1(rsa, (*C.uchar)(unsafe.Pointer(&msg[0])), sha, mgfSha,
-                (*C.uchar)(unsafe.Pointer(&sigOut[0])), C.int(sLen))
-
-        success := false
-        if ret == 1 && (wt.Result == "valid" || wt.Result == "acceptable") {
-                // All acceptable cases that pass use SHA-1 and are flagged:
-                // "WeakHash" : "The key for this test vector uses a weak hash function."
-                if acceptableAudit && wt.Result == "acceptable" {
-                        gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-                }
-                success = true
-        } else if ret == 0 && (wt.Result == "invalid" || wt.Result == "acceptable") {
-                success = true
-        } else {
-                fmt.Printf("FAIL: Test case %d (%q) %v - RSA_verify_PKCS1_PSS_mgf1() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(ret), wt.Result)
-        }
-        return success
-}
-
-func runRSASSATestGroup(algorithm string, wtg *wycheproofTestGroupRSASSA) bool {
-        fmt.Printf("Running %v test group %v with key size %d and %v...\n",
-                algorithm, wtg.Type, wtg.KeySize, wtg.SHA)
-        rsa := C.RSA_new()
-        if rsa == nil {
-                log.Fatal("RSA_new failed")
-        }
-        defer C.RSA_free(rsa)
-
-        e := C.CString(wtg.E)
-        if C.BN_hex2bn(&rsa.e, e) == 0 {
-                log.Fatal("Failed to set RSA e")
-        }
-        C.free(unsafe.Pointer(e))
-
-        n := C.CString(wtg.N)
-        if C.BN_hex2bn(&rsa.n, n) == 0 {
-                log.Fatal("Failed to set RSA n")
-        }
-        C.free(unsafe.Pointer(n))
-
-        h, err := hashFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get hash: %v", err)
-        }
-
-        sha, err := hashEvpMdFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get hash: %v", err)
-        }
-
-        mgfSha, err := hashEvpMdFromString(wtg.MGFSHA)
-        if err != nil {
-                log.Fatalf("Failed to get MGF hash: %v", err)
-        }
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runRSASSATest(rsa, h, sha, mgfSha, wtg.SLen, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runRSATest(rsa *C.RSA, nid int, h hash.Hash, wt *wycheproofTestRSA) bool {
-        msg, err := hex.DecodeString(wt.Msg)
-        if err != nil {
-                log.Fatalf("Failed to decode message %q: %v", wt.Msg, err)
-        }
-
-        h.Reset()
-        h.Write(msg)
-        msg = h.Sum(nil)
-
-        sig, err := hex.DecodeString(wt.Sig)
-        if err != nil {
-                log.Fatalf("Failed to decode signature %q: %v", wt.Sig, err)
-        }
-
-        msgLen, sigLen := len(msg), len(sig)
-        if msgLen == 0 {
-                msg = append(msg, 0)
-        }
-        if sigLen == 0 {
-                sig = append(sig, 0)
-        }
-
-        ret := C.RSA_verify(C.int(nid), (*C.uchar)(unsafe.Pointer(&msg[0])), C.uint(msgLen),
-                (*C.uchar)(unsafe.Pointer(&sig[0])), C.uint(sigLen), rsa)
-
-        // XXX audit acceptable cases...
-        success := true
-        if ret == 1 != (wt.Result == "valid") && wt.Result != "acceptable" {
-                fmt.Printf("FAIL: Test case %d (%q) %v - RSA_verify() = %d, want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, int(ret), wt.Result)
-                success = false
-        }
-        if acceptableAudit && ret == 1 && wt.Result == "acceptable" {
-                gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-        }
-        return success
-}
-
-func runRSATestGroup(algorithm string, wtg *wycheproofTestGroupRSA) bool {
-        fmt.Printf("Running %v test group %v with key size %d and %v...\n",
-                algorithm, wtg.Type, wtg.KeySize, wtg.SHA)
-
-        rsa := C.RSA_new()
-        if rsa == nil {
-                log.Fatal("RSA_new failed")
-        }
-        defer C.RSA_free(rsa)
-
-        e := C.CString(wtg.E)
-        if C.BN_hex2bn(&rsa.e, e) == 0 {
-                log.Fatal("Failed to set RSA e")
-        }
-        C.free(unsafe.Pointer(e))
-
-        n := C.CString(wtg.N)
-        if C.BN_hex2bn(&rsa.n, n) == 0 {
-                log.Fatal("Failed to set RSA n")
-        }
-        C.free(unsafe.Pointer(n))
-
-        nid, err := nidFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get MD NID: %v", err)
-        }
-        h, err := hashFromString(wtg.SHA)
-        if err != nil {
-                log.Fatalf("Failed to get hash: %v", err)
-        }
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runRSATest(rsa, nid, h, wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runX25519Test(wt *wycheproofTestX25519) bool {
-        public, err := hex.DecodeString(wt.Public)
-        if err != nil {
-                log.Fatalf("Failed to decode public %q: %v", wt.Public, err)
-        }
-        private, err := hex.DecodeString(wt.Private)
-        if err != nil {
-                log.Fatalf("Failed to decode private %q: %v", wt.Private, err)
-        }
-        shared, err := hex.DecodeString(wt.Shared)
-        if err != nil {
-                log.Fatalf("Failed to decode shared %q: %v", wt.Shared, err)
-        }
-
-        got := make([]byte, C.X25519_KEY_LENGTH)
-        result := true
-
-        if C.X25519((*C.uint8_t)(unsafe.Pointer(&got[0])), (*C.uint8_t)(unsafe.Pointer(&private[0])), (*C.uint8_t)(unsafe.Pointer(&public[0]))) != 1 {
-                result = false
-        } else {
-                result = bytes.Equal(got, shared)
-        }
-
-        // XXX audit acceptable cases...
-        success := true
-        if result != (wt.Result == "valid") && wt.Result != "acceptable" {
-                fmt.Printf("FAIL: Test case %d (%q) %v - X25519(), want %v\n",
-                        wt.TCID, wt.Comment, wt.Flags, wt.Result)
-                success = false
-        }
-        if acceptableAudit && result && wt.Result == "acceptable" {
-                gatherAcceptableStatistics(wt.TCID, wt.Comment, wt.Flags)
-        }
-        return success
-}
-
-func runX25519TestGroup(algorithm string, wtg *wycheproofTestGroupX25519) bool {
-        fmt.Printf("Running %v test group with curve %v...\n", algorithm, wtg.Curve)
-
-        success := true
-        for _, wt := range wtg.Tests {
-                if !runX25519Test(wt) {
-                        success = false
-                }
-        }
-        return success
-}
-
-func runTestVectors(path string, webcrypto bool) bool {
-        b, err := ioutil.ReadFile(path)
-        if err != nil {
-                log.Fatalf("Failed to read test vectors: %v", err)
-        }
-        wtv := &wycheproofTestVectors{}
-        if err := json.Unmarshal(b, wtv); err != nil {
-                log.Fatalf("Failed to unmarshal JSON: %v", err)
-        }
-        fmt.Printf("Loaded Wycheproof test vectors for %v with %d tests from %q\n",
-                wtv.Algorithm, wtv.NumberOfTests, filepath.Base(path))
-
-        var wtg interface{}
-        switch wtv.Algorithm {
-        case "AES-CBC-PKCS5":
-                wtg = &wycheproofTestGroupAesCbcPkcs5{}
-        case "AES-CCM":
-                wtg = &wycheproofTestGroupAead{}
-        case "AES-CMAC":
-                wtg = &wycheproofTestGroupAesCmac{}
-        case "AES-GCM":
-                wtg = &wycheproofTestGroupAead{}
-        case "CHACHA20-POLY1305":
-                wtg = &wycheproofTestGroupAead{}
-        case "DSA":
-                wtg = &wycheproofTestGroupDSA{}
-        case "ECDH":
-                if webcrypto {
-                        wtg = &wycheproofTestGroupECDHWebCrypto{}
-                } else {
-                        wtg = &wycheproofTestGroupECDH{}
-                }
-        case "ECDSA":
-                if webcrypto {
-                        wtg = &wycheproofTestGroupECDSAWebCrypto{}
-                } else {
-                        wtg = &wycheproofTestGroupECDSA{}
-                }
-        case "KW":
-                wtg = &wycheproofTestGroupKW{}
-        case "RSASSA-PSS":
-                wtg = &wycheproofTestGroupRSASSA{}
-        case "RSASig":
-                wtg = &wycheproofTestGroupRSA{}
-        case "X25519":
-                wtg = &wycheproofTestGroupX25519{}
-        default:
-                log.Fatalf("Unknown test vector algorithm %q", wtv.Algorithm)
-        }
-
-        success := true
-        for _, tg := range wtv.TestGroups {
-                if err := json.Unmarshal(tg, wtg); err != nil {
-                        log.Fatalf("Failed to unmarshal test groups JSON: %v", err)
-                }
-                switch wtv.Algorithm {
-                case "AES-CBC-PKCS5":
-                        if !runAesCbcPkcs5TestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupAesCbcPkcs5)) {
-                                success = false
-                        }
-                case "AES-CCM":
-                        if !runAesAeadTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupAead)) {
-                                success = false
-                        }
-                case "AES-CMAC":
-                        if !runAesCmacTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupAesCmac)) {
-                                success = false
-                        }
-                case "AES-GCM":
-                        if !runAesAeadTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupAead)) {
-                                success = false
-                        }
-                case "CHACHA20-POLY1305":
-                        if !runChaCha20Poly1305TestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupAead)) {
-                                success = false
-                        }
-                case "DSA":
-                        if !runDSATestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupDSA)) {
-                                success = false
-                        }
-                case "ECDH":
-                        if webcrypto {
-                                if !runECDHWebCryptoTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupECDHWebCrypto)) {
-                                        success = false
-                                }
-                        } else {
-                                if !runECDHTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupECDH)) {
-                                        success = false
-                                }
-                        }
-                case "ECDSA":
-                        if webcrypto {
-                                if !runECDSAWebCryptoTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupECDSAWebCrypto)) {
-                                        success = false
-                                }
-                        } else {
-                                if !runECDSATestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupECDSA)) {
-                                        success = false
-                                }
-                        }
-                case "KW":
-                        if !runKWTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupKW)) {
-                                success = false
-                        }
-                case "RSASSA-PSS":
-                        if !runRSASSATestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupRSASSA)) {
-                                success = false
-                        }
-                case "RSASig":
-                        if !runRSATestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupRSA)) {
-                                success = false
-                        }
-                case "X25519":
-                        if !runX25519TestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupX25519)) {
-                                success = false
-                        }
-                default:
-                        log.Fatalf("Unknown test vector algorithm %q", wtv.Algorithm)
-                }
-        }
-        return success
-}
-
-func main() {
-        if _, err := os.Stat(testVectorPath); os.IsNotExist(err) {
-                fmt.Printf("package wycheproof-testvectors is required for this regress\n")
-                fmt.Printf("SKIPPED\n")
-                os.Exit(0)
-        }
-
-        flag.BoolVar(&acceptableAudit, "v", false, "audit acceptable cases")
-        flag.Parse()
-
-        acceptableComments = make(map[string]int)
-        acceptableFlags = make(map[string]int)
-
-        tests := []struct {
-                name    string
-                pattern string
-        }{
-                {"AES", "aes_[cg]*[^xv]_test.json"}, // Skip AES-EAX, AES-GCM-SIV and AES-SIV-CMAC.
-                {"ChaCha20-Poly1305", "chacha20_poly1305_test.json"},
-                {"DSA", "dsa_test.json"},
-                {"ECDH", "ecdh_[^w]*test.json"},
-                {"ECDHWebCrypto", "ecdh_w*_test.json"},
-                {"ECDSA", "ecdsa_[^w]*test.json"},
-                {"ECDSAWebCrypto", "ecdsa_w*_test.json"},
-                {"KW", "kw_test.json"},
-                {"RSA", "rsa_*test.json"},
-                {"X25519", "x25519_*test.json"},
-        }
-
-        success := true
-
-        for _, test := range tests {
-                webcrypto := test.name == "ECDSAWebCrypto" || test.name == "ECDHWebCrypto"
-                tvs, err := filepath.Glob(filepath.Join(testVectorPath, test.pattern))
-                if err != nil {
-                        log.Fatalf("Failed to glob %v test vectors: %v", test.name, err)
-                }
-                if len(tvs) == 0 {
-                        log.Fatalf("Failed to find %v test vectors at %q\n", test.name, testVectorPath)
-                }
-                for _, tv := range tvs {
-                        if !runTestVectors(tv, webcrypto) {
-                                success = false
-                        }
-                }
-        }
-
-        if acceptableAudit {
-                printAcceptableStatistics()
-        }
-
-        if !success {
-                os.Exit(1)
-        }
-}
diff --git a/src/regress/lib/libcrypto/x509/Makefile b/src/regress/lib/libcrypto/x509/Makefile
deleted file mode 100644
index 106a9f2bf2..0000000000
--- a/src/regress/lib/libcrypto/x509/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2018/04/07 13:54:46 schwarze Exp $
-
-PROG=   x509name
-LDADD=  -lcrypto
-DPADD=  ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -Wall -Werror
-
-REGRESS_TARGETS=regress-x509name
-CLEANFILES+=    x509name.result
-
-regress-x509name: ${PROG}
-        ./${PROG} > x509name.result
-        diff -u ${.CURDIR}/x509name.expected x509name.result
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libcrypto/x509/x509name.c b/src/regress/lib/libcrypto/x509/x509name.c
deleted file mode 100644
index 4ff8ac6908..0000000000
--- a/src/regress/lib/libcrypto/x509/x509name.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $OpenBSD: x509name.c,v 1.1 2018/04/07 13:54:46 schwarze Exp $ */
-/*
- * Copyright (c) 2018 Ingo Schwarze <schwarze@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-
-#include <openssl/x509.h>
-
-static void      debug_print(X509_NAME *);
-
-static void
-debug_print(X509_NAME *name)
-{
-        int loc;
-
-        for (loc = 0; loc < X509_NAME_entry_count(name); loc++)
-                printf("%d:", X509_NAME_get_entry(name, loc)->set);
-        putchar(' ');
-        X509_NAME_print_ex_fp(stdout, name, 0, XN_FLAG_SEP_CPLUS_SPC);
-        putchar('\n');
-}
-
-int
-main(void)
-{
-        X509_NAME *name;
-
-        if ((name = X509_NAME_new()) == NULL)
-                err(1, NULL);
-        X509_NAME_add_entry_by_txt(name, "ST", MBSTRING_ASC,
-            "BaWue", -1, -1, 0);
-        X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC,
-            "KIT", -1, -1, 0);
-        debug_print(name);
-
-        X509_NAME_add_entry_by_txt(name, "L", MBSTRING_ASC,
-            "Karlsruhe", -1, 1, 0);
-        debug_print(name);
-
-        X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC,
-            "DE", -1, 0, 1);
-        debug_print(name);
-
-        return 0;
-}
diff --git a/src/regress/lib/libcrypto/x509/x509name.expected b/src/regress/lib/libcrypto/x509/x509name.expected
deleted file mode 100644
index 6cee7cc435..0000000000
--- a/src/regress/lib/libcrypto/x509/x509name.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-0:1: ST=BaWue, O=KIT
-0:1:2: ST=BaWue, L=Karlsruhe, O=KIT
-0:0:1:2: C=DE + ST=BaWue, L=Karlsruhe, O=KIT
diff --git a/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
deleted file mode 100644
index 0cc3e156a3..0000000000
--- a/src/regress/lib/libssl/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#       $OpenBSD: Makefile,v 1.26 2017/07/16 18:18:10 jsing Exp $
-
-SUBDIR= \
-        asn1 \
-        bytestring \
-        ciphers \
-        client \
-        pqueue \
-        server \
-        ssl \
-        tlsext \
-        unit
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libssl/Makefile.inc b/src/regress/lib/libssl/Makefile.inc
deleted file mode 100644
index a8880845e9..0000000000
--- a/src/regress/lib/libssl/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Use this variable when the test needs internal symbols from libssl
-SSL_INT=  -Wl,-Bstatic -lssl -Wl,-Bdynamic
diff --git a/src/regress/lib/libssl/asn1/Makefile b/src/regress/lib/libssl/asn1/Makefile
deleted file mode 100644
index f4a57933e2..0000000000
--- a/src/regress/lib/libssl/asn1/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2014/07/13 16:03:54 jsing Exp $
-
-PROG=   asn1test
-LDADD=  -lcrypto -lssl
-DPADD=  ${LIBCRYPTO} ${LIBSSL}
-
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/asn1/asn1test.c b/src/regress/lib/libssl/asn1/asn1test.c
deleted file mode 100644
index 69be086724..0000000000
--- a/src/regress/lib/libssl/asn1/asn1test.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/*      $OpenBSD: asn1test.c,v 1.6 2016/12/26 15:31:38 jsing Exp $      */
-/*
- * Copyright (c) 2014, 2016 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdlib.h>
-
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-#include <openssl/tls1.h>
-
-int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
-SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
-    long length);
-
-X509 *peer_cert;
-
-unsigned char *peer_cert_pem =
-    "-----BEGIN CERTIFICATE-----\n"
-    "MIIBcTCCARugAwIBAgIJAPYhaZJAvUuUMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV\n"
-    "BAoMCVRlc3QgUGVlcjAeFw0xNjEyMjYxNDQ3NDdaFw0yNjEyMjQxNDQ3NDdaMBQx\n"
-    "EjAQBgNVBAoMCVRlc3QgUGVlcjBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCyhAdJ\n"
-    "wojHv/uKONh8MbmR2U2+VF1HQusnLfSfHPqkJfvDzLWJ41TG7QcXkx2rIJVtAFrO\n"
-    "U9yNdFYJLA/hsrbjAgMBAAGjUDBOMB0GA1UdDgQWBBS3bZOw7fvaortdsdE2TPMq\n"
-    "IRXFRzAfBgNVHSMEGDAWgBS3bZOw7fvaortdsdE2TPMqIRXFRzAMBgNVHRMEBTAD\n"
-    "AQH/MA0GCSqGSIb3DQEBBQUAA0EAHsxNS+rNUZbopeDMhVIviOfUmelDjJrT56Rc\n"
-    "VJoFN3Gc1cV8nQAHm9aJs71uksC+MN04Pzh0WqmYX9XXrnYPcg==\n"
-    "-----END CERTIFICATE-----\n";
-
-struct ssl_asn1_test {
-        SSL_SESSION session;
-        int peer_cert;
-        const unsigned char asn1[1024];
-        int asn1_len;
-};
-
-unsigned char tlsext_tick[] = {
-        0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34,
-        0x2d, 0x30, 0x31, 0x36, 0x30, 0x3a, 0x20, 0x37,
-        0x74, 0x68, 0x20, 0x41, 0x70, 0x72, 0x69, 0x6c,
-        0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56,
-        0x45, 0x2d, 0x32, 0x30, 0x31, 0x30, 0x2d, 0x35,
-        0x32, 0x39, 0x38, 0x3a, 0x20, 0x38, 0x74, 0x68,
-        0x20, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32,
-        0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d,
-        0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, 0x31, 0x39,
-        0x38, 0x3a, 0x20, 0x32, 0x31, 0x73, 0x74, 0x20,
-        0x41, 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30,
-        0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32,
-        0x30, 0x31, 0x34, 0x2d, 0x33, 0x34, 0x37, 0x30,
-        0x3a, 0x20, 0x33, 0x30, 0x74, 0x68, 0x20, 0x4d,
-        0x61, 0x79, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a,
-        0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34,
-        0x2d, 0x30, 0x31, 0x39, 0x35, 0x3a, 0x20, 0x35,
-        0x74, 0x68, 0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20,
-        0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45,
-        0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, 0x32,
-        0x32, 0x31, 0x3a, 0x20, 0x35, 0x74, 0x68, 0x20,
-        0x4a, 0x75, 0x6e, 0x65, 0x20, 0x32, 0x30, 0x31,
-        0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30,
-        0x31, 0x34, 0x2d, 0x30, 0x32, 0x32, 0x34, 0x3a,
-        0x20, 0x35, 0x74, 0x68, 0x20, 0x4a, 0x75, 0x6e,
-        0x65, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a,
-};
-
-struct ssl_asn1_test ssl_asn1_tests[] = {
-        {
-                .session = {
-                        .cipher_id = 0x03000000L | 1,
-                        .ssl_version = TLS1_2_VERSION,
-                },
-                .asn1 = {
-                        0x30, 0x13, 0x02, 0x01, 0x01, 0x02, 0x02, 0x03,
-                        0x03, 0x04, 0x02, 0x00, 0x01, 0x04, 0x00, 0x04,
-                        0x00, 0xa4, 0x02, 0x04, 0x00,
-                },
-                .asn1_len = 21,
-        },
-        {
-                .session = {
-                        .cipher_id = 0x03000000L | 1,
-                        .ssl_version = TLS1_2_VERSION,
-                        .master_key_length = 26,
-                        .session_id = "0123456789",
-                        .session_id_length = 10,
-                        .sid_ctx = "abcdefghijklmnopqrstuvwxyz",
-                        .sid_ctx_length = 26,
-                },
-                .asn1 = {
-                        0x30, 0x51, 0x02, 0x01, 0x01, 0x02, 0x02, 0x03,
-                        0x03, 0x04, 0x02, 0x00, 0x01, 0x04, 0x0a, 0x30,
-                        0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
-                        0x39, 0x04, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x1c, 0x04,
-                        0x1a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-                        0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-                        0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-                        0x78, 0x79, 0x7a,
-                },
-                .asn1_len = 83,
-        },
-        {
-                .session = {
-                        .cipher_id = 0x03000000L | 1,
-                        .ssl_version = TLS1_2_VERSION,
-                        .master_key_length = 26,
-                        .session_id = "0123456789",
-                        .session_id_length = 10,
-                        .sid_ctx = "abcdefghijklmnopqrstuvwxyz",
-                        .sid_ctx_length = 26,
-                        .time = 1405266069,
-                        .timeout = 5,
-                        .verify_result = 42,
-                        .tlsext_hostname = "libressl.openbsd.org",
-                        .tlsext_tick_lifetime_hint = 0x7abbccdd,
-                        .tlsext_tick = tlsext_tick,
-                        .tlsext_ticklen = sizeof(tlsext_tick),
-                },
-                .peer_cert = 1,
-                .asn1 = {
-                        0x30, 0x82, 0x02, 0xd1, 0x02, 0x01, 0x01, 0x02,
-                        0x02, 0x03, 0x03, 0x04, 0x02, 0x00, 0x01, 0x04,
-                        0x0a, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
-                        0x37, 0x38, 0x39, 0x04, 0x1a, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1,
-                        0x06, 0x02, 0x04, 0x53, 0xc2, 0xa8, 0x95, 0xa2,
-                        0x03, 0x02, 0x01, 0x05, 0xa3, 0x82, 0x01, 0x75,
-                        0x30, 0x82, 0x01, 0x71, 0x30, 0x82, 0x01, 0x1b,
-                        0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00,
-                        0xf6, 0x21, 0x69, 0x92, 0x40, 0xbd, 0x4b, 0x94,
-                        0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
-                        0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30,
-                        0x14, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55,
-                        0x04, 0x0a, 0x0c, 0x09, 0x54, 0x65, 0x73, 0x74,
-                        0x20, 0x50, 0x65, 0x65, 0x72, 0x30, 0x1e, 0x17,
-                        0x0d, 0x31, 0x36, 0x31, 0x32, 0x32, 0x36, 0x31,
-                        0x34, 0x34, 0x37, 0x34, 0x37, 0x5a, 0x17, 0x0d,
-                        0x32, 0x36, 0x31, 0x32, 0x32, 0x34, 0x31, 0x34,
-                        0x34, 0x37, 0x34, 0x37, 0x5a, 0x30, 0x14, 0x31,
-                        0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a,
-                        0x0c, 0x09, 0x54, 0x65, 0x73, 0x74, 0x20, 0x50,
-                        0x65, 0x65, 0x72, 0x30, 0x5c, 0x30, 0x0d, 0x06,
-                        0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
-                        0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30,
-                        0x48, 0x02, 0x41, 0x00, 0xb2, 0x84, 0x07, 0x49,
-                        0xc2, 0x88, 0xc7, 0xbf, 0xfb, 0x8a, 0x38, 0xd8,
-                        0x7c, 0x31, 0xb9, 0x91, 0xd9, 0x4d, 0xbe, 0x54,
-                        0x5d, 0x47, 0x42, 0xeb, 0x27, 0x2d, 0xf4, 0x9f,
-                        0x1c, 0xfa, 0xa4, 0x25, 0xfb, 0xc3, 0xcc, 0xb5,
-                        0x89, 0xe3, 0x54, 0xc6, 0xed, 0x07, 0x17, 0x93,
-                        0x1d, 0xab, 0x20, 0x95, 0x6d, 0x00, 0x5a, 0xce,
-                        0x53, 0xdc, 0x8d, 0x74, 0x56, 0x09, 0x2c, 0x0f,
-                        0xe1, 0xb2, 0xb6, 0xe3, 0x02, 0x03, 0x01, 0x00,
-                        0x01, 0xa3, 0x50, 0x30, 0x4e, 0x30, 0x1d, 0x06,
-                        0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14,
-                        0xb7, 0x6d, 0x93, 0xb0, 0xed, 0xfb, 0xda, 0xa2,
-                        0xbb, 0x5d, 0xb1, 0xd1, 0x36, 0x4c, 0xf3, 0x2a,
-                        0x21, 0x15, 0xc5, 0x47, 0x30, 0x1f, 0x06, 0x03,
-                        0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80,
-                        0x14, 0xb7, 0x6d, 0x93, 0xb0, 0xed, 0xfb, 0xda,
-                        0xa2, 0xbb, 0x5d, 0xb1, 0xd1, 0x36, 0x4c, 0xf3,
-                        0x2a, 0x21, 0x15, 0xc5, 0x47, 0x30, 0x0c, 0x06,
-                        0x03, 0x55, 0x1d, 0x13, 0x04, 0x05, 0x30, 0x03,
-                        0x01, 0x01, 0xff, 0x30, 0x0d, 0x06, 0x09, 0x2a,
-                        0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05,
-                        0x05, 0x00, 0x03, 0x41, 0x00, 0x1e, 0xcc, 0x4d,
-                        0x4b, 0xea, 0xcd, 0x51, 0x96, 0xe8, 0xa5, 0xe0,
-                        0xcc, 0x85, 0x52, 0x2f, 0x88, 0xe7, 0xd4, 0x99,
-                        0xe9, 0x43, 0x8c, 0x9a, 0xd3, 0xe7, 0xa4, 0x5c,
-                        0x54, 0x9a, 0x05, 0x37, 0x71, 0x9c, 0xd5, 0xc5,
-                        0x7c, 0x9d, 0x00, 0x07, 0x9b, 0xd6, 0x89, 0xb3,
-                        0xbd, 0x6e, 0x92, 0xc0, 0xbe, 0x30, 0xdd, 0x38,
-                        0x3f, 0x38, 0x74, 0x5a, 0xa9, 0x98, 0x5f, 0xd5,
-                        0xd7, 0xae, 0x76, 0x0f, 0x72, 0xa4, 0x1c, 0x04,
-                        0x1a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-                        0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-                        0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-                        0x78, 0x79, 0x7a, 0xa5, 0x03, 0x02, 0x01, 0x2a,
-                        0xa6, 0x16, 0x04, 0x14, 0x6c, 0x69, 0x62, 0x72,
-                        0x65, 0x73, 0x73, 0x6c, 0x2e, 0x6f, 0x70, 0x65,
-                        0x6e, 0x62, 0x73, 0x64, 0x2e, 0x6f, 0x72, 0x67,
-                        0xa9, 0x06, 0x02, 0x04, 0x7a, 0xbb, 0xcc, 0xdd,
-                        0xaa, 0x81, 0xd2, 0x04, 0x81, 0xcf, 0x43, 0x56,
-                        0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30,
-                        0x31, 0x36, 0x30, 0x3a, 0x20, 0x37, 0x74, 0x68,
-                        0x20, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32,
-                        0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d,
-                        0x32, 0x30, 0x31, 0x30, 0x2d, 0x35, 0x32, 0x39,
-                        0x38, 0x3a, 0x20, 0x38, 0x74, 0x68, 0x20, 0x41,
-                        0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31,
-                        0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30,
-                        0x31, 0x34, 0x2d, 0x30, 0x31, 0x39, 0x38, 0x3a,
-                        0x20, 0x32, 0x31, 0x73, 0x74, 0x20, 0x41, 0x70,
-                        0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31, 0x34,
-                        0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31,
-                        0x34, 0x2d, 0x33, 0x34, 0x37, 0x30, 0x3a, 0x20,
-                        0x33, 0x30, 0x74, 0x68, 0x20, 0x4d, 0x61, 0x79,
-                        0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56,
-                        0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30,
-                        0x31, 0x39, 0x35, 0x3a, 0x20, 0x35, 0x74, 0x68,
-                        0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20, 0x32, 0x30,
-                        0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32,
-                        0x30, 0x31, 0x34, 0x2d, 0x30, 0x32, 0x32, 0x31,
-                        0x3a, 0x20, 0x35, 0x74, 0x68, 0x20, 0x4a, 0x75,
-                        0x6e, 0x65, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a,
-                        0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34,
-                        0x2d, 0x30, 0x32, 0x32, 0x34, 0x3a, 0x20, 0x35,
-                        0x74, 0x68, 0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20,
-                        0x32, 0x30, 0x31, 0x34, 0x0a,
-                },
-                .asn1_len = 725,
-        },
-        {
-                .session = {
-                        .cipher_id = 0x03000000L | 1,
-                        .ssl_version = TLS1_2_VERSION,
-                        .timeout = -1,
-                },
-                .asn1 = {
-                        0x0,
-                },
-                .asn1_len = -1,
-        },
-        {
-                .session = {
-                        .cipher_id = 0x03000000L | 1,
-                        .ssl_version = TLS1_2_VERSION,
-                        .time = -1,
-                },
-                .asn1 = {
-                        0x0,
-                },
-                .asn1_len = -1,
-        },
-};
-
-#define N_SSL_ASN1_TESTS \
-    (sizeof(ssl_asn1_tests) / sizeof(*ssl_asn1_tests))
-
-static int
-session_strcmp(const unsigned char *o1, const unsigned char *o2, size_t len)
-{
-        if (o1 == NULL && o2 == NULL)
-                return (0);
-        if (o1 == NULL || o2 == NULL)
-                return (1);
-        return memcmp(o1, o2, len);
-}
-
-static int
-session_cmp(SSL_SESSION *s1, SSL_SESSION *s2)
-{
-        /* Compare the ASN.1 encoded values from two sessions. */
-        if (s1->ssl_version != s2->ssl_version) {
-                fprintf(stderr, "ssl_version differs: %i != %i\n",
-                    s1->ssl_version, s2->ssl_version);
-                return (1);
-        }
-        if (s1->cipher_id != s2->cipher_id) {
-                fprintf(stderr, "cipher_id differs: %li != %li\n",
-                    s1->cipher_id, s2->cipher_id);
-                return (1);
-        }
-
-        if (s1->master_key_length != s2->master_key_length) {
-                fprintf(stderr, "master_key_length differs: %i != %i\n",
-                    s1->master_key_length, s2->master_key_length);
-                return (1);
-        }
-        if (session_strcmp(s1->master_key, s2->master_key,
-            s1->master_key_length) != 0) {
-                fprintf(stderr, "master_key differs\n");
-                return (1);
-        }
-
-        if (s1->session_id_length != s2->session_id_length) {
-                fprintf(stderr, "session_id_length differs: %i != %i\n",
-                    s1->session_id_length, s2->session_id_length);
-                return (1);
-        }
-        if (session_strcmp(s1->session_id, s2->session_id,
-            s1->session_id_length) != 0) {
-                fprintf(stderr, "session_id differs\n");
-                return (1);
-        }
-
-        if (s1->sid_ctx_length != s2->sid_ctx_length) {
-                fprintf(stderr, "sid_ctx_length differs: %i != %i\n",
-                    s1->sid_ctx_length, s2->sid_ctx_length);
-                return (1);
-        }
-        if (session_strcmp(s1->sid_ctx, s2->sid_ctx,
-            s1->sid_ctx_length) != 0) {
-                fprintf(stderr, "sid_ctx differs\n");
-                return (1);
-        }
-
-        /* d2i_SSL_SESSION uses the current time if decoding a zero value. */
-        if ((s1->time != s2->time) && s1->time != 0 && s2->time != 0) {
-                fprintf(stderr, "time differs: %lli != %lli\n",
-                    (long long)s1->time, (long long)s2->time);
-                return (1);
-        }
-        /* d2i_SSL_SESSION uses a timeout of 3 if decoding a zero value. */
-        if ((s1->timeout != s2->timeout) &&
-            s1->timeout != 3 && s2->timeout != 3) {
-                fprintf(stderr, "timeout differs: %li != %li\n",
-                    s1->timeout, s2->timeout);
-                return (1);
-        }
-
-        /* Ensure that a certificate is or is not present in both. */
-        if ((s1->peer != NULL || s2->peer != NULL) &&
-            (s1->peer == NULL || s2->peer == NULL ||
-             X509_cmp(s1->peer, s2->peer) != 0)) {
-                fprintf(stderr, "peer differs\n");
-                return (1);
-        }
-        
-        if (s1->verify_result != s2->verify_result) {
-                fprintf(stderr, "verify_result differs: %li != %li\n",
-                    s1->verify_result, s2->verify_result);
-                return (1);
-        }
-
-        if (session_strcmp(s1->tlsext_hostname, s2->tlsext_hostname,
-            (s1->tlsext_hostname ? strlen(s1->tlsext_hostname) : 0)) != 0) {
-                fprintf(stderr, "sid_ctx differs\n");
-                return (1);
-        }
-        if (s1->tlsext_tick_lifetime_hint != s2->tlsext_tick_lifetime_hint) {
-                fprintf(stderr, "tlsext_tick_lifetime_hint differs: "
-                    "%li != %li\n", s1->tlsext_tick_lifetime_hint,
-                    s2->tlsext_tick_lifetime_hint);
-                return (1);
-        }
-        if (s1->tlsext_ticklen != s2->tlsext_ticklen) {
-                fprintf(stderr, "tlsext_ticklen differs: %zu != %zu\n",
-                    s1->tlsext_ticklen, s2->tlsext_ticklen);
-                return (1);
-        }
-        if (session_strcmp(s1->tlsext_tick, s2->tlsext_tick,
-            s1->tlsext_ticklen) != 0) {
-                fprintf(stderr, "tlsext_tick differs\n");
-                return (1);
-        }
-
-        return (0);
-}
-
-static int
-do_ssl_asn1_test(int test_no, struct ssl_asn1_test *sat)
-{
-        SSL_SESSION session, *sp = NULL;
-        unsigned char *ap, *asn1 = NULL;
-        const unsigned char *pp;
-        int i, len, rv = 1;
-
-        if (sat->peer_cert)
-                sat->session.peer = peer_cert;
-
-        len = i2d_SSL_SESSION(&sat->session, NULL);
-        if (len != sat->asn1_len) {
-                fprintf(stderr, "FAIL: test %i returned ASN1 length %i, "
-                    "want %i\n", test_no, len, sat->asn1_len);
-                goto failed;
-        }
-
-        /* See if the test is expected to fail... */
-        if (sat->asn1_len == -1)
-                return (0);
-
-        if ((asn1 = malloc(len)) == NULL)
-                errx(1, "failed to allocate memory");
-
-        ap = asn1;
-        len = i2d_SSL_SESSION(&sat->session, &ap);
-
-        /* Check the length again since the code path is different. */
-        if (len != sat->asn1_len) {
-                fprintf(stderr, "FAIL: test %i returned ASN1 length %i, "
-                    "want %i\n", test_no, len, sat->asn1_len);
-                goto failed;
-        }
-        /* ap should now point at the end of the buffer. */
-        if (ap - asn1 != len) {
-                fprintf(stderr, "FAIL: test %i pointer increment does not "
-                    "match length (%i != %i)\n", test_no, (int)(ap - asn1), len);
-                goto failed;
-        }
-
-        if (memcmp(asn1, &sat->asn1, len) != 0) {
-                fprintf(stderr, "FAIL: test %i - encoding differs:\n", test_no);
-                fprintf(stderr, "encoding:\n");
-                for (i = 1; i <= len; i++) {
-                        fprintf(stderr, " 0x%02hhx,", asn1[i - 1]);
-                        if (i % 8 == 0)
-                                fprintf(stderr, "\n");
-                }
-                fprintf(stderr, "\n");
-                fprintf(stderr, "test data:\n");
-                for (i = 1; i <= sat->asn1_len; i++) {
-                        fprintf(stderr, " 0x%02hhx,", sat->asn1[i - 1]);
-                        if (i % 8 == 0)
-                                fprintf(stderr, "\n");
-                }
-                fprintf(stderr, "\n");
-                goto failed;
-        }
-
-        sp = &session;
-        memset(sp, 0, sizeof(*sp));
-        pp = sat->asn1;
-
-        if ((sp = d2i_SSL_SESSION(&sp, &pp, sat->asn1_len)) == NULL) {
-                fprintf(stderr, "FAIL: test %i - decoding failed\n", test_no);
-                goto failed;
-        }
-
-        if (session_cmp(sp, &sat->session) != 0) {
-                fprintf(stderr, "FAIL: test %i - decoding differs\n", test_no);
-                goto failed;
-        }
-
-        rv = 0;
-
-failed:
-        ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE));
-
-        free(asn1);
-
-        return (rv);
-}
-
-int
-main(int argc, char **argv)
-{
-        BIO *bio = NULL;
-        int failed = 0;
-        size_t i;
-
-        SSL_library_init();
-        SSL_load_error_strings();
-
-        bio = BIO_new_mem_buf(peer_cert_pem, -1);
-        if (bio == NULL)
-                errx(1, "failed to create bio");
-
-        peer_cert = PEM_read_bio_X509(bio, NULL, NULL, NULL);
-        if (peer_cert == NULL)
-                errx(1, "failed to read peer cert");
-
-        for (i = 0; i < N_SSL_ASN1_TESTS; i++)
-                failed += do_ssl_asn1_test(i, &ssl_asn1_tests[i]);
-
-        X509_free(peer_cert);
-        BIO_free(bio);
-
-        return (failed);
-}
diff --git a/src/regress/lib/libssl/bytestring/Makefile b/src/regress/lib/libssl/bytestring/Makefile
deleted file mode 100644
index 162c81d255..0000000000
--- a/src/regress/lib/libssl/bytestring/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.5 2016/11/04 17:51:54 guenther Exp $
-
-PROG=   bytestringtest
-LDADD=  ${SSL_INT} -lcrypto
-DPADD=  ${LIBCRYPTO} ${LIBSSL}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/bytestring/bytestringtest.c b/src/regress/lib/libssl/bytestring/bytestringtest.c
deleted file mode 100644
index 0e9f5f47e5..0000000000
--- a/src/regress/lib/libssl/bytestring/bytestringtest.c
+++ /dev/null
@@ -1,876 +0,0 @@
-/*      $OpenBSD: bytestringtest.c,v 1.12 2018/08/16 18:40:19 jsing Exp $       */
-/*
- * Copyright (c) 2014, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/crypto.h>
-
-#include "bytestring.h"
-
-/* This is from <openssl/base.h> in boringssl */
-#define OPENSSL_U64(x) x##ULL
-
-#define PRINT_ERROR printf("Error in %s [%s:%d]\n", __func__, __FILE__, \
-                __LINE__)
-
-#define CHECK(a) do {                                                   \
-        if (!(a)) {                                                     \
-                PRINT_ERROR;                                            \
-                return 0;                                               \
-        }                                                               \
-} while (0)
-
-#define CHECK_GOTO(a) do {                                              \
-        if (!(a)) {                                                     \
-                PRINT_ERROR;                                            \
-                goto err;                                               \
-        }                                                               \
-} while (0)
-
-static int
-test_skip(void)
-{
-        static const uint8_t kData[] = {1, 2, 3};
-        CBS data;
-
-        CBS_init(&data, kData, sizeof(kData));
-
-        CHECK(CBS_len(&data) == 3);
-        CHECK(CBS_skip(&data, 1));
-        CHECK(CBS_len(&data) == 2);
-        CHECK(CBS_skip(&data, 2));
-        CHECK(CBS_len(&data) == 0);
-        CHECK(!CBS_skip(&data, 1));
-
-        return 1;
-}
-
-static int
-test_get_u(void)
-{
-        static const uint8_t kData[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        uint8_t u8;
-        uint16_t u16;
-        uint32_t u32;
-        CBS data;
-
-        CBS_init(&data, kData, sizeof(kData));
-
-        CHECK(CBS_get_u8(&data, &u8));
-        CHECK(u8 == 1);
-        CHECK(CBS_get_u16(&data, &u16));
-        CHECK(u16 == 0x203);
-        CHECK(CBS_get_u24(&data, &u32));
-        CHECK(u32 == 0x40506);
-        CHECK(CBS_get_u32(&data, &u32));
-        CHECK(u32 == 0x708090a);
-        CHECK(!CBS_get_u8(&data, &u8));
-
-        return 1;
-}
-
-static int
-test_get_prefixed(void)
-{
-        static const uint8_t kData[] = {1, 2, 0, 2, 3, 4, 0, 0, 3, 3, 2, 1};
-        uint8_t u8;
-        uint16_t u16;
-        uint32_t u32;
-        CBS data, prefixed;
-
-        CBS_init(&data, kData, sizeof(kData));
-
-        CHECK(CBS_get_u8_length_prefixed(&data, &prefixed));
-        CHECK(CBS_len(&prefixed) == 1);
-        CHECK(CBS_get_u8(&prefixed, &u8));
-        CHECK(u8 == 2);
-        CHECK(CBS_get_u16_length_prefixed(&data, &prefixed));
-        CHECK(CBS_len(&prefixed) == 2);
-        CHECK(CBS_get_u16(&prefixed, &u16));
-        CHECK(u16 == 0x304);
-        CHECK(CBS_get_u24_length_prefixed(&data, &prefixed));
-        CHECK(CBS_len(&prefixed) == 3);
-        CHECK(CBS_get_u24(&prefixed, &u32));
-        CHECK(u32 == 0x30201);
-
-        return 1;
-}
-
-static int
-test_get_prefixed_bad(void)
-{
-        static const uint8_t kData1[] = {2, 1};
-        static const uint8_t kData2[] = {0, 2, 1};
-        static const uint8_t kData3[] = {0, 0, 2, 1};
-        CBS data, prefixed;
-
-        CBS_init(&data, kData1, sizeof(kData1));
-        CHECK(!CBS_get_u8_length_prefixed(&data, &prefixed));
-
-        CBS_init(&data, kData2, sizeof(kData2));
-        CHECK(!CBS_get_u16_length_prefixed(&data, &prefixed));
-
-        CBS_init(&data, kData3, sizeof(kData3));
-        CHECK(!CBS_get_u24_length_prefixed(&data, &prefixed));
-
-        return 1;
-}
-
-static int
-test_get_asn1(void)
-{
-        static const uint8_t kData1[] = {0x30, 2, 1, 2};
-        static const uint8_t kData2[] = {0x30, 3, 1, 2};
-        static const uint8_t kData3[] = {0x30, 0x80};
-        static const uint8_t kData4[] = {0x30, 0x81, 1, 1};
-        static const uint8_t kData5[4 + 0x80] = {0x30, 0x82, 0, 0x80};
-        static const uint8_t kData6[] = {0xa1, 3, 0x4, 1, 1};
-        static const uint8_t kData7[] = {0xa1, 3, 0x4, 2, 1};
-        static const uint8_t kData8[] = {0xa1, 3, 0x2, 1, 1};
-        static const uint8_t kData9[] = {0xa1, 3, 0x2, 1, 0xff};
-
-        CBS data, contents;
-        int present;
-        uint64_t value;
-
-        CBS_init(&data, kData1, sizeof(kData1));
-
-        CHECK(!CBS_peek_asn1_tag(&data, 0x1));
-        CHECK(CBS_peek_asn1_tag(&data, 0x30));
-
-        CHECK(CBS_get_asn1(&data, &contents, 0x30));
-        CHECK(CBS_len(&contents) == 2);
-        CHECK(memcmp(CBS_data(&contents), "\x01\x02", 2) == 0);
-
-        CBS_init(&data, kData2, sizeof(kData2));
-        /* data is truncated */
-        CHECK(!CBS_get_asn1(&data, &contents, 0x30));
-
-        CBS_init(&data, kData3, sizeof(kData3));
-        /* zero byte length of length */
-        CHECK(!CBS_get_asn1(&data, &contents, 0x30));
-
-        CBS_init(&data, kData4, sizeof(kData4));
-        /* long form mistakenly used. */
-        CHECK(!CBS_get_asn1(&data, &contents, 0x30));
-
-        CBS_init(&data, kData5, sizeof(kData5));
-        /* length takes too many bytes. */
-        CHECK(!CBS_get_asn1(&data, &contents, 0x30));
-
-        CBS_init(&data, kData1, sizeof(kData1));
-        /* wrong tag. */
-        CHECK(!CBS_get_asn1(&data, &contents, 0x31));
-
-        CBS_init(&data, NULL, 0);
-        /* peek at empty data. */
-        CHECK(!CBS_peek_asn1_tag(&data, 0x30));
-
-        CBS_init(&data, NULL, 0);
-        /* optional elements at empty data. */
-        CHECK(CBS_get_optional_asn1(&data, &contents, &present, 0xa0));
-        CHECK(!present);
-        CHECK(CBS_get_optional_asn1_octet_string(&data, &contents, &present,
-            0xa0));
-        CHECK(!present);
-        CHECK(CBS_len(&contents) == 0);
-        CHECK(CBS_get_optional_asn1_octet_string(&data, &contents, NULL, 0xa0));
-        CHECK(CBS_len(&contents) == 0);
-        CHECK(CBS_get_optional_asn1_uint64(&data, &value, 0xa0, 42));
-        CHECK(value == 42);
-
-        CBS_init(&data, kData6, sizeof(kData6));
-        /* optional element. */
-        CHECK(CBS_get_optional_asn1(&data, &contents, &present, 0xa0));
-        CHECK(!present);
-        CHECK(CBS_get_optional_asn1(&data, &contents, &present, 0xa1));
-        CHECK(present);
-        CHECK(CBS_len(&contents) == 3);
-        CHECK(memcmp(CBS_data(&contents), "\x04\x01\x01", 3) == 0);
-
-        CBS_init(&data, kData6, sizeof(kData6));
-        /* optional octet string. */
-        CHECK(CBS_get_optional_asn1_octet_string(&data, &contents, &present,
-            0xa0));
-        CHECK(!present);
-        CHECK(CBS_len(&contents) == 0);
-        CHECK(CBS_get_optional_asn1_octet_string(&data, &contents, &present,
-            0xa1));
-        CHECK(present);
-        CHECK(CBS_len(&contents) == 1);
-        CHECK(CBS_data(&contents)[0] == 1);
-
-        CBS_init(&data, kData7, sizeof(kData7));
-        /* invalid optional octet string. */
-        CHECK(!CBS_get_optional_asn1_octet_string(&data, &contents, &present,
-            0xa1));
-
-        CBS_init(&data, kData8, sizeof(kData8));
-        /* optional octet string. */
-        CHECK(CBS_get_optional_asn1_uint64(&data, &value, 0xa0, 42));
-        CHECK(value == 42);
-        CHECK(CBS_get_optional_asn1_uint64(&data, &value, 0xa1, 42));
-        CHECK(value == 1);
-
-        CBS_init(&data, kData9, sizeof(kData9));
-        /* invalid optional integer. */
-        CHECK(!CBS_get_optional_asn1_uint64(&data, &value, 0xa1, 42));
-
-        return 1;
-}
-
-static int
-test_get_optional_asn1_bool(void)
-{
-        CBS data;
-        int val;
-
-        static const uint8_t kTrue[] = {0x0a, 3, CBS_ASN1_BOOLEAN, 1, 0xff};
-        static const uint8_t kFalse[] = {0x0a, 3, CBS_ASN1_BOOLEAN, 1, 0x00};
-        static const uint8_t kInvalid[] = {0x0a, 3, CBS_ASN1_BOOLEAN, 1, 0x01};
-
-        CBS_init(&data, NULL, 0);
-        val = 2;
-        CHECK(CBS_get_optional_asn1_bool(&data, &val, 0x0a, 0));
-        CHECK(val == 0);
-
-        CBS_init(&data, kTrue, sizeof(kTrue));
-        val = 2;
-        CHECK(CBS_get_optional_asn1_bool(&data, &val, 0x0a, 0));
-        CHECK(val == 1);
-
-        CBS_init(&data, kFalse, sizeof(kFalse));
-        val = 2;
-        CHECK(CBS_get_optional_asn1_bool(&data, &val, 0x0a, 1));
-        CHECK(val == 0);
-
-        CBS_init(&data, kInvalid, sizeof(kInvalid));
-        CHECK(!CBS_get_optional_asn1_bool(&data, &val, 0x0a, 1));
-
-        return 1;
-}
-
-static int
-test_cbb_basic(void)
-{
-        static const uint8_t kExpected[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
-        uint8_t *buf = NULL;
-        size_t buf_len;
-        int ret = 0;
-        CBB cbb;
-
-        CHECK(CBB_init(&cbb, 100));
-
-        CBB_cleanup(&cbb);
-
-        CHECK(CBB_init(&cbb, 0));
-        CHECK_GOTO(CBB_add_u8(&cbb, 1));
-        CHECK_GOTO(CBB_add_u16(&cbb, 0x203));
-        CHECK_GOTO(CBB_add_u24(&cbb, 0x40506));
-        CHECK_GOTO(CBB_add_u32(&cbb, 0x708090a));
-        CHECK_GOTO(CBB_add_bytes(&cbb, (const uint8_t*) "\x0b\x0c", 2));
-        CHECK_GOTO(CBB_finish(&cbb, &buf, &buf_len));
-
-        ret = (buf_len == sizeof(kExpected)
-            && memcmp(buf, kExpected, buf_len) == 0);
-
-        if (0) {
-err:
-                CBB_cleanup(&cbb);
-        }
-        free(buf);
-        return ret;
-}
-
-static int
-test_cbb_fixed(void)
-{
-        CBB cbb;
-        uint8_t buf[1];
-        uint8_t *out_buf = NULL;
-        size_t out_size;
-        int ret = 0;
-
-        CHECK(CBB_init_fixed(&cbb, NULL, 0));
-        CHECK_GOTO(!CBB_add_u8(&cbb, 1));
-        CHECK_GOTO(CBB_finish(&cbb, &out_buf, &out_size));
-        CHECK(out_buf == NULL && out_size == 0);
-
-        CHECK(CBB_init_fixed(&cbb, buf, 1));
-        CHECK_GOTO(CBB_add_u8(&cbb, 1));
-        CHECK_GOTO(!CBB_add_u8(&cbb, 2));
-        CHECK_GOTO(CBB_finish(&cbb, &out_buf, &out_size));
-
-        ret = (out_buf == buf && out_size == 1 && buf[0] == 1);
-
-        if (0) {
-err:
-                CBB_cleanup(&cbb);
-        }
-
-        return ret;
-}
-
-static int
-test_cbb_finish_child(void)
-{
-        CBB cbb, child;
-        uint8_t *out_buf = NULL;
-        size_t out_size;
-        int ret = 0;
-
-        CHECK(CBB_init(&cbb, 16));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&cbb, &child));
-        CHECK_GOTO(!CBB_finish(&child, &out_buf, &out_size));
-        CHECK_GOTO(CBB_finish(&cbb, &out_buf, &out_size));
-
-        ret = (out_size == 1 && out_buf[0] == 0);
-
-err:
-        free(out_buf);
-        return ret;
-}
-
-static int
-test_cbb_prefixed(void)
-{
-        static const uint8_t kExpected[] = {0, 1, 1, 0, 2, 2, 3, 0, 0, 3,
-            4, 5, 6, 5, 4, 1, 0, 1, 2};
-        CBB cbb, contents, inner_contents, inner_inner_contents;
-        uint8_t *buf = NULL;
-        size_t buf_len;
-        int ret = 0;
-
-        CHECK(CBB_init(&cbb, 0));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u8(&contents, 1));
-        CHECK_GOTO(CBB_add_u16_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u16(&contents, 0x203));
-        CHECK_GOTO(CBB_add_u24_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u24(&contents, 0x40506));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&contents, &inner_contents));
-        CHECK_GOTO(CBB_add_u8(&inner_contents, 1));
-        CHECK_GOTO(CBB_add_u16_length_prefixed(&inner_contents,
-            &inner_inner_contents));
-        CHECK_GOTO(CBB_add_u8(&inner_inner_contents, 2));
-        CHECK_GOTO(CBB_finish(&cbb, &buf, &buf_len));
-
-        ret = (buf_len == sizeof(kExpected)
-            && memcmp(buf, kExpected, buf_len) == 0);
-
-        if (0) {
-err:
-                CBB_cleanup(&cbb);
-        }
-        free(buf);
-        return ret;
-}
-
-static int
-test_cbb_discard_child(void)
-{
-        static const uint8_t kExpected[] = {
-                0xaa,
-                0,
-                1, 0xbb,
-                0, 2, 0xcc, 0xcc,
-                0, 0, 3, 0xdd, 0xdd, 0xdd,
-                1, 0xff,
-        };
-        CBB cbb, contents, inner_contents, inner_inner_contents;
-        uint8_t *buf = NULL;
-        size_t buf_len;
-        int ret = 0;
-
-        CHECK(CBB_init(&cbb, 0));
-        CHECK_GOTO(CBB_add_u8(&cbb, 0xaa));
-
-        // Discarding |cbb|'s children preserves the byte written.
-        CBB_discard_child(&cbb);
-
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u8(&contents, 0xbb));
-        CHECK_GOTO(CBB_add_u16_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u16(&contents, 0xcccc));
-        CHECK_GOTO(CBB_add_u24_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u24(&contents, 0xdddddd));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&cbb, &contents));
-        CHECK_GOTO(CBB_add_u8(&contents, 0xff));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&contents, &inner_contents));
-        CHECK_GOTO(CBB_add_u8(&inner_contents, 0x42));
-        CHECK_GOTO(CBB_add_u16_length_prefixed(&inner_contents,
-            &inner_inner_contents));
-        CHECK_GOTO(CBB_add_u8(&inner_inner_contents, 0x99));
-
-        // Discard everything from |inner_contents| down.
-        CBB_discard_child(&contents);
-
-        CHECK_GOTO(CBB_finish(&cbb, &buf, &buf_len));
-
-        ret = (buf_len == sizeof(kExpected)
-            && memcmp(buf, kExpected, buf_len) == 0);
-
-        if (0) {
-err:
-                CBB_cleanup(&cbb);
-        }
-        free(buf);
-        return ret;
-}
-
-static int
-test_cbb_misuse(void)
-{
-        CBB cbb, child, contents;
-        uint8_t *buf = NULL;
-        size_t buf_len;
-        int ret = 0;
-
-        CHECK(CBB_init(&cbb, 0));
-        CHECK_GOTO(CBB_add_u8_length_prefixed(&cbb, &child));
-        CHECK_GOTO(CBB_add_u8(&child, 1));
-        CHECK_GOTO(CBB_add_u8(&cbb, 2));
-
-        /*
-         * Since we wrote to |cbb|, |child| is now invalid and attempts to write
-         * to it should fail.
-         */
-        CHECK_GOTO(!CBB_add_u8(&child, 1));
-        CHECK_GOTO(!CBB_add_u16(&child, 1));
-        CHECK_GOTO(!CBB_add_u24(&child, 1));
-        CHECK_GOTO(!CBB_add_u8_length_prefixed(&child, &contents));
-        CHECK_GOTO(!CBB_add_u16_length_prefixed(&child, &contents));
-        CHECK_GOTO(!CBB_add_asn1(&child, &contents, 1));
-        CHECK_GOTO(!CBB_add_bytes(&child, (const uint8_t*) "a", 1));
-        CHECK_GOTO(CBB_finish(&cbb, &buf, &buf_len));
-
-        ret = (buf_len == 3 && memcmp(buf, "\x01\x01\x02", 3) == 0);
-
-        if (0) {
-err:
-                CBB_cleanup(&cbb);
-        }
-        free(buf);
-        return ret;
-}
-
-static int
-test_cbb_asn1(void)
-{
-        static const uint8_t kExpected[] = {0x30, 3, 1, 2, 3};
-        uint8_t *buf = NULL, *test_data = NULL;
-        size_t buf_len;
-        CBB cbb, contents, inner_contents;
-        int ret = 0;
-        int alloc = 0;
-
-        CHECK_GOTO(CBB_init(&cbb, 0));
-        alloc = 1;
-        CHECK_GOTO(CBB_add_asn1(&cbb, &contents, 0x30));
-        CHECK_GOTO(CBB_add_bytes(&contents, (const uint8_t*) "\x01\x02\x03",
-            3));
-        CHECK_GOTO(CBB_finish(&cbb, &buf, &buf_len));
-        alloc = 0;
-
-        CHECK_GOTO(buf_len == sizeof(kExpected));
-        CHECK_GOTO(memcmp(buf, kExpected, buf_len) == 0);
-
-        free(buf);
-        buf = NULL;
-
-        CHECK_GOTO(((test_data = malloc(100000)) != NULL));
-        memset(test_data, 0x42, 100000);
-
-        CHECK_GOTO(CBB_init(&cbb, 0));
-        alloc = 1;
-        CHECK_GOTO(CBB_add_asn1(&cbb, &contents, 0x30));
-        CHECK_GOTO(CBB_add_bytes(&contents, test_data, 130));
-        CHECK_GOTO(CBB_finish(&cbb, &buf, &buf_len));
-        alloc = 0;
-
-        CHECK_GOTO(buf_len == 3 + 130);
-        CHECK_GOTO(memcmp(buf, "\x30\x81\x82", 3) == 0);
-        CHECK_GOTO(memcmp(buf + 3, test_data, 130) == 0);
-
-        free(buf);
-        buf = NULL;
-
-        CHECK_GOTO(CBB_init(&cbb, 0));
-        alloc = 1;
-        CHECK_GOTO(CBB_add_asn1(&cbb, &contents, 0x30));
-        CHECK_GOTO(CBB_add_bytes(&contents, test_data, 1000));
-        CHECK_GOTO(CBB_finish(&cbb, &buf, &buf_len));
-        alloc = 0;
-
-        CHECK_GOTO(buf_len == 4 + 1000);
-        CHECK_GOTO(memcmp(buf, "\x30\x82\x03\xe8", 4) == 0);
-        CHECK_GOTO(!memcmp(buf + 4, test_data, 1000));
-
-        free(buf);
-        buf = NULL;
-
-        CHECK_GOTO(CBB_init(&cbb, 0));
-        alloc = 1;
-        CHECK_GOTO(CBB_add_asn1(&cbb, &contents, 0x30));
-        CHECK_GOTO(CBB_add_asn1(&contents, &inner_contents, 0x30));
-        CHECK_GOTO(CBB_add_bytes(&inner_contents, test_data, 100000));
-        CHECK_GOTO(CBB_finish(&cbb, &buf, &buf_len));
-        alloc = 0;
-
-        CHECK_GOTO(buf_len == 5 + 5 + 100000);
-        CHECK_GOTO(memcmp(buf, "\x30\x83\x01\x86\xa5\x30\x83\x01\x86\xa0", 10)
-            == 0);
-        CHECK_GOTO(!memcmp(buf + 10, test_data, 100000));
-
-        ret = 1;
-
-        if (0) {
-err:
-                if (alloc)
-                        CBB_cleanup(&cbb);
-        }
-        free(buf);
-        free(test_data);
-        return ret;
-}
-
-static int
-do_indefinite_convert(const char *name, const uint8_t *definite_expected,
-    size_t definite_len, const uint8_t *indefinite, size_t indefinite_len)
-{
-        CBS in;
-        uint8_t *out = NULL;
-        size_t out_len;
-        int ret = 0;
-
-        CBS_init(&in, indefinite, indefinite_len);
-
-        CHECK_GOTO(CBS_asn1_indefinite_to_definite(&in, &out, &out_len));
-
-        if (out == NULL) {
-
-                if (indefinite_len != definite_len ||
-                    memcmp(definite_expected, indefinite, indefinite_len) != 0) {
-                        PRINT_ERROR;
-                        goto err;
-                }
-
-                return 1;
-        }
-
-        if (out_len != definite_len ||
-            memcmp(out, definite_expected, definite_len) != 0) {
-                PRINT_ERROR;
-                goto err;
-        }
-
-        ret = 1;
-err:
-        free(out);
-        return ret;
-}
-
-static int
-test_indefinite_convert(void)
-{
-        static const uint8_t kSimpleBER[] = {0x01, 0x01, 0x00};
-
-        /* kIndefBER contains a SEQUENCE with an indefinite length. */
-        static const uint8_t kIndefBER[] = {0x30, 0x80, 0x01, 0x01, 0x02, 0x00,
-            0x00};
-        static const uint8_t kIndefDER[] = {0x30, 0x03, 0x01, 0x01, 0x02};
-
-        /*
-         * kOctetStringBER contains an indefinite length OCTETSTRING with two
-         * parts.  These parts need to be concatenated in DER form.
-         */
-        static const uint8_t kOctetStringBER[] = {0x24, 0x80, 0x04, 0x02, 0,
-            1, 0x04, 0x02, 2,    3,    0x00, 0x00};
-        static const uint8_t kOctetStringDER[] = {0x04, 0x04, 0, 1, 2, 3};
-
-        /*
-         * kNSSBER is part of a PKCS#12 message generated by NSS that uses
-         * indefinite length elements extensively.
-         */
-        static const uint8_t kNSSBER[] = {
-            0x30, 0x80, 0x02, 0x01, 0x03, 0x30, 0x80, 0x06, 0x09, 0x2a, 0x86,
-            0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x80, 0x24, 0x80,
-            0x04, 0x04, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x30, 0x39, 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e,
-            0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0x84, 0x98, 0xfc, 0x66,
-            0x33, 0xee, 0xba, 0xe7, 0x90, 0xc1, 0xb6, 0xe8, 0x8f, 0xfe, 0x1d,
-            0xc5, 0xa5, 0x97, 0x93, 0x3e, 0x04, 0x10, 0x38, 0x62, 0xc6, 0x44,
-            0x12, 0xd5, 0x30, 0x00, 0xf8, 0xf2, 0x1b, 0xf0, 0x6e, 0x10, 0x9b,
-            0xb8, 0x02, 0x02, 0x07, 0xd0, 0x00, 0x00,
-        };
-
-        static const uint8_t kNSSDER[] = {
-            0x30, 0x53, 0x02, 0x01, 0x03, 0x30, 0x13, 0x06, 0x09, 0x2a, 0x86,
-            0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x06, 0x04, 0x04,
-            0x01, 0x02, 0x03, 0x04, 0x30, 0x39, 0x30, 0x21, 0x30, 0x09, 0x06,
-            0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0x84,
-            0x98, 0xfc, 0x66, 0x33, 0xee, 0xba, 0xe7, 0x90, 0xc1, 0xb6, 0xe8,
-            0x8f, 0xfe, 0x1d, 0xc5, 0xa5, 0x97, 0x93, 0x3e, 0x04, 0x10, 0x38,
-            0x62, 0xc6, 0x44, 0x12, 0xd5, 0x30, 0x00, 0xf8, 0xf2, 0x1b, 0xf0,
-            0x6e, 0x10, 0x9b, 0xb8, 0x02, 0x02, 0x07, 0xd0,
-        };
-
-        CHECK(do_indefinite_convert("kSimpleBER", kSimpleBER, sizeof(kSimpleBER),
-            kSimpleBER, sizeof(kSimpleBER)));
-        CHECK(do_indefinite_convert("kIndefBER", kIndefDER, sizeof(kIndefDER),
-            kIndefBER, sizeof(kIndefBER)));
-        CHECK(do_indefinite_convert("kOctetStringBER", kOctetStringDER,
-            sizeof(kOctetStringDER), kOctetStringBER,
-            sizeof(kOctetStringBER)));
-        CHECK(do_indefinite_convert("kNSSBER", kNSSDER, sizeof(kNSSDER), kNSSBER,
-            sizeof(kNSSBER)));
-
-        return 1;
-}
-
-typedef struct {
-        uint64_t value;
-        const char *encoding;
-        size_t encoding_len;
-} ASN1_UINT64_TEST;
-
-static const ASN1_UINT64_TEST kAsn1Uint64Tests[] = {
-        {0, "\x02\x01\x00", 3},
-        {1, "\x02\x01\x01", 3},
-        {127, "\x02\x01\x7f", 3},
-        {128, "\x02\x02\x00\x80", 4},
-        {0xdeadbeef, "\x02\x05\x00\xde\xad\xbe\xef", 7},
-        {OPENSSL_U64(0x0102030405060708),
-            "\x02\x08\x01\x02\x03\x04\x05\x06\x07\x08", 10},
-        {OPENSSL_U64(0xffffffffffffffff),
-            "\x02\x09\x00\xff\xff\xff\xff\xff\xff\xff\xff", 11},
-};
-
-typedef struct {
-        const char *encoding;
-        size_t encoding_len;
-} ASN1_INVALID_UINT64_TEST;
-
-static const ASN1_INVALID_UINT64_TEST kAsn1InvalidUint64Tests[] = {
-        /* Bad tag. */
-        {"\x03\x01\x00", 3},
-        /* Empty contents. */
-        {"\x02\x00", 2},
-        /* Negative number. */
-        {"\x02\x01\x80", 3},
-        /* Overflow. */
-        {"\x02\x09\x01\x00\x00\x00\x00\x00\x00\x00\x00", 11},
-        /* Leading zeros. */
-        {"\x02\x02\x00\x01", 4},
-};
-
-static int
-test_asn1_uint64(void)
-{
-        CBB cbb;
-        uint8_t *out = NULL;
-        size_t i;
-        int ret = 0;
-        int alloc = 0;
-
-        for (i = 0; i < sizeof(kAsn1Uint64Tests) / sizeof(kAsn1Uint64Tests[0]);
-             i++) {
-                const ASN1_UINT64_TEST *test = &kAsn1Uint64Tests[i];
-                CBS cbs;
-                uint64_t value;
-                size_t len;
-
-                CBS_init(&cbs, (const uint8_t *)test->encoding,
-                    test->encoding_len);
-
-                CHECK(CBS_get_asn1_uint64(&cbs, &value));
-                CHECK(CBS_len(&cbs) == 0);
-                CHECK(value == test->value);
-
-                CHECK(CBB_init(&cbb, 0));
-                alloc = 1;
-                CHECK_GOTO(CBB_add_asn1_uint64(&cbb, test->value));
-                CHECK_GOTO(CBB_finish(&cbb, &out, &len));
-                alloc = 0;
-
-                CHECK_GOTO(len == test->encoding_len);
-                CHECK_GOTO(memcmp(out, test->encoding, len) == 0);
-                free(out);
-                out = NULL;
-        }
-
-        for (i = 0; i < sizeof(kAsn1InvalidUint64Tests)
-            / sizeof(kAsn1InvalidUint64Tests[0]); i++) {
-                const ASN1_INVALID_UINT64_TEST *test =
-                    &kAsn1InvalidUint64Tests[i];
-                CBS cbs;
-                uint64_t value;
-
-                CBS_init(&cbs, (const uint8_t *)test->encoding,
-                    test->encoding_len);
-                CHECK(!CBS_get_asn1_uint64(&cbs, &value));
-        }
-
-        ret = 1;
-
-        if (0) {
-err:
-                if (alloc)
-                        CBB_cleanup(&cbb);
-        }
-        free(out);
-
-        return ret;
-}
-
-static int
-test_offset(void)
-{
-        uint8_t v;
-        static const uint8_t input[] = {1, 2, 3, 4, 5};
-        CBS data;
-
-        CBS_init(&data, input, sizeof(input));
-        CHECK(sizeof(input) == 5);
-        CHECK(CBS_len(&data) == 5);
-        CHECK(CBS_offset(&data) == 0);
-        CHECK(CBS_get_u8(&data, &v));
-        CHECK(v == 1);
-        CHECK(CBS_len(&data) == 4);
-        CHECK(CBS_offset(&data) == 1);
-        CHECK(CBS_skip(&data, 2));
-        CHECK(CBS_len(&data) == 2);
-        CHECK(CBS_offset(&data) == 3);
-        CHECK(CBS_get_u8(&data, &v));
-        CHECK(v == 4);
-        CHECK(CBS_get_u8(&data, &v));
-        CHECK(v == 5);
-        CHECK(CBS_len(&data) == 0);
-        CHECK(CBS_offset(&data) == 5);
-        CHECK(!CBS_skip(&data, 1));
-
-        CBS_init(&data, input, sizeof(input));
-        CHECK(CBS_skip(&data, 2));
-        CHECK(CBS_len(&data) == 3);
-        CHECK(CBS_offset(&data) == 2);
-        CHECK(CBS_skip(&data, 3));
-        CHECK(CBS_len(&data) == 0);
-        CHECK(CBS_offset(&data) == 5);
-        CHECK(!CBS_get_u8(&data, &v));
-
-        return 1;
-}
-
-static int
-test_write_bytes(void)
-{
-        int ret = 0;
-        uint8_t v;
-        size_t len;
-        static const uint8_t input[] = {'f', 'o', 'o', 'b', 'a', 'r'};
-        CBS data;
-        char *tmp = NULL;
-
-        CHECK_GOTO((tmp = malloc(sizeof(input))) != NULL);
-        memset(tmp, 100, sizeof(input));
-
-        CBS_init(&data, input, sizeof(input));
-        CHECK_GOTO(CBS_len(&data) == 6);
-        CHECK_GOTO(CBS_offset(&data) == 0);
-        CHECK_GOTO(CBS_get_u8(&data, &v));
-        CHECK_GOTO(v == 102 /* f */);
-        CHECK_GOTO(CBS_skip(&data, 1));
-        CHECK_GOTO(!CBS_skip(&data, 15));
-        CHECK_GOTO(CBS_write_bytes(&data, tmp, sizeof(input), &len));
-        CHECK_GOTO(len == 4);
-        CHECK_GOTO(memcmp(input + 2, tmp, len) == 0);
-        CHECK_GOTO(tmp[4] == 100 && tmp[5] == 100);
-
-        ret = 1;
-
-err:
-        free(tmp);
-        return ret;
-}
-
-static int
-test_cbs_dup(void)
-{
-        CBS data, check;
-        static const uint8_t input[] = {'f', 'o', 'o', 'b', 'a', 'r'};
-
-        CBS_init(&data, input, sizeof(input));
-        CHECK(CBS_len(&data) == 6);
-        CBS_dup(&data, &check);
-        CHECK(CBS_len(&check) == 6);
-        CHECK(CBS_data(&data) == CBS_data(&check));
-        CHECK(CBS_skip(&data, 1));
-        CHECK(CBS_len(&data) == 5);
-        CHECK(CBS_len(&check) == 6);
-        CHECK(CBS_data(&data) == CBS_data(&check) + 1);
-        CHECK(CBS_skip(&check, 1));
-        CHECK(CBS_len(&data) == 5);
-        CHECK(CBS_len(&check) == 5);
-        CHECK(CBS_data(&data) == CBS_data(&check));
-        CHECK(CBS_offset(&data) == 1);
-        CHECK(CBS_offset(&check) == 1);
-
-        CBS_init(&data, input, sizeof(input));
-        CHECK(CBS_skip(&data, 5));
-        CBS_dup(&data, &check);
-        CHECK(CBS_len(&data) == 1);
-        CHECK(CBS_len(&check) == 1);
-        CHECK(CBS_data(&data) == input + 5);
-        CHECK(CBS_data(&data) == CBS_data(&check));
-        CHECK(CBS_offset(&data) == 5);
-        CHECK(CBS_offset(&check) == 5);
-
-        return 1;
-}
-
-int
-main(void)
-{
-        int failed = 0;
-
-        failed |= !test_skip();
-        failed |= !test_get_u();
-        failed |= !test_get_prefixed();
-        failed |= !test_get_prefixed_bad();
-        failed |= !test_get_asn1();
-        failed |= !test_cbb_basic();
-        failed |= !test_cbb_fixed();
-        failed |= !test_cbb_finish_child();
-        failed |= !test_cbb_discard_child();
-        failed |= !test_cbb_misuse();
-        failed |= !test_cbb_prefixed();
-        failed |= !test_cbb_asn1();
-        failed |= !test_indefinite_convert();
-        failed |= !test_asn1_uint64();
-        failed |= !test_get_optional_asn1_bool();
-        failed |= !test_offset();
-        failed |= !test_write_bytes();
-        failed |= !test_cbs_dup();
-
-        if (!failed)
-                printf("PASS\n");
-        return failed;
-}
diff --git a/src/regress/lib/libssl/certs/ca.pem b/src/regress/lib/libssl/certs/ca.pem
deleted file mode 100644
index 07f9b3fddb..0000000000
--- a/src/regress/lib/libssl/certs/ca.pem
+++ /dev/null
@@ -1,45 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIJAJz/hGfwYXLrMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
-VElORyBQVVJQT1NFUyBPTkxZMR0wGwYDVQQDDBRPcGVuU1NMIFRlc3QgUm9vdCBD
-QTAeFw0xNDA1MjQxNDQ1MTFaFw0yNDA1MjExNDQ1MTFaMGgxCzAJBgNVBAYTAlVL
-MRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVTVElORyBQ
-VVJQT1NFUyBPTkxZMR0wGwYDVQQDDBRPcGVuU1NMIFRlc3QgUm9vdCBDQTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMaarigKGOra5Mc/LrhOkcmHzDs
-vkYL7dfaaht8fLBKRTYwzSBvO9x54koTWjq7HkbaxkYAg3HnDTkNCyzkGKNdM89H
-q/PtGIFFlceQIOat3Kjd05Iw3PtLEWTDjT6FMA9Mkjk/XbpmycqRIwNKtgICoFsG
-juIpc4P31kxK7i3ri+JnlyvVmRZjJxrheJB0qHGXilrOVDPOliDn//jXbcyzXemu
-R8KgAeQM4IIs9jYHJOgHrTItIpwa9wNTEp9KCGkO6xr20NkKyDp6XRyd+hmnUB7r
-77WTptvKPFFTjTDFqEtcif9U2kVkCfn2mSRO8noCbVH++fuR8LMWlD99gt8CAwEA
-AaNjMGEwHQYDVR0OBBYEFIwZD9dCMXcFBuHTsZ/rOft4cTpFMB8GA1UdIwQYMBaA
-FIwZD9dCMXcFBuHTsZ/rOft4cTpFMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCPfqm4KbYtXEB8aP1RdUH2BkPSjyau
-WQLMGfKNF/zkUQue0REgdJ4wVR06NTTlOCsfHC6b68vgz2QFC1mM8ZANgDiyr4M1
-6gjvP0eZQVxokJ3EMzjDMFRHIiFrZZAFr7aGq8dxoruuehovqyehuJRakAe0oNUb
-4ZTKrGuTKh9Mwti9721XNFByjeTFL2dlH6ulz7qyfI+lrTi+pNsUchuVYE8a1TP3
-OEiG6whsyPU1YoTlemC1mvW0ixtj8Tcem0KyotCUyOmJlwyWj0bA43sCI6z/OVqJ
-tVvwgfqrOeVNk9nN2JslCsttnwstwqUfDoEXFoScej2CT0QezFGPTN21
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDvjCCAqagAwIBAgIJAPrXr2k7uM/OMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
-BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
-VElORyBQVVJQT1NFUyBPTkxZMR0wGwYDVQQDDBRPcGVuU1NMIFRlc3QgUm9vdCBD
-QTAeFw0xNDA1MjQxNDQ1MTFaFw0yNDA1MDExNDQ1MTFaMHAxCzAJBgNVBAYTAlVL
-MRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVTVElORyBQ
-VVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJtZWRpYXRl
-IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsErw75CmLYD6pkrG
-W/YhAl/K8L5wJYxDjqu2FghxjD8K308W3EHq4uBxEwR1OHXaM1+6ZZw7/r2I37VL
-IdurBEAIEUdbzx0so74FPawgz5EW2CTqoJnK8F71/vo5Kj1VPwW46CxwxUR3cfvJ
-GNXND2ip0TcyTSPLROXOyQakcVfIGJmdSa1wHKi+c2gMA4emADudZUOYLrg80gr2
-ldePm07ynbVsKKzCcStw8MdmoW9Qt3fLnPJn2TFUUBNWj+4kvL+88edWCVQXKNds
-ysD/CDrH4W/hjyPDStVsM6XpiNU0+L2ZY6fcj3OP8d0goOx45xotMn9m8hNkCGsr
-VXx9IwIDAQABo2MwYTAdBgNVHQ4EFgQUNsNsiOeV/rC97M4+PYarIYGH2towHwYD
-VR0jBBgwFoAUjBkP10IxdwUG4dOxn+s5+3hxOkUwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAAIwwR8jyFN6qYGIRAKi
-ahyeHd26hNPC4RiCvjz6dytuvDUqfMTUZcjBy6Ez1Wsfs1/PC8u3IDpOTwZSz72K
-ACQzPpmXREWkO5nx8I+W+94yJsbklhsTxDlZj3X2oJCQ7qO4hdIpYESWfMchYra9
-5e55SMBXeGDp+uRILt+6UfOXCGaXaoYqyrzQROJAiGy1x96A/5sU6ZU3KdKN1JLM
-XTZ268ihubCMRVScHnpYUjRDoGrhnQM7007ybVfRUGNXDs+ENqjGfyxc5ScR+Un4
-UQtOd4zD2g9wrdXvlDiqxci6W7IOEPVP6qHG2GIh+T2zpO3GOAuZCe5cjLiCDATs
-hNw=
------END CERTIFICATE-----
diff --git a/src/regress/lib/libssl/certs/client.pem b/src/regress/lib/libssl/certs/client.pem
deleted file mode 100644
index ce4bf49ce6..0000000000
--- a/src/regress/lib/libssl/certs/client.pem
+++ /dev/null
@@ -1,51 +0,0 @@
-subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Client Cert
-issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA
------BEGIN CERTIFICATE-----
-MIIDpTCCAo2gAwIBAgIJAPYm3GvOr5eTMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
-VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt
-ZWRpYXRlIENBMB4XDTE0MDUyNDE0NDUxMVoXDTI0MDQwMTE0NDUxMVowZDELMAkG
-A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU
-RVNUSU5HIFBVUlBPU0VTIE9OTFkxGTAXBgNVBAMMEFRlc3QgQ2xpZW50IENlcnQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0ranbHRLcLVqN+0BzcZpY
-+yOLqxzDWT1LD9eW1stC4NzXX9/DCtSIVyN7YIHdGLrIPr64IDdXXaMRzgZ2rOKs
-lmHCAiFpO/ja99gGCJRxH0xwQatqAULfJVHeUhs7OEGOZc2nWifjqKvGfNTilP7D
-nwi69ipQFq9oS19FmhwVHk2wg7KZGHI1qDyG04UrfCZMRitvS9+UVhPpIPjuiBi2
-x3/FZIpL5gXJvvFK6xHY63oq2asyzBATntBgnP4qJFWWcvRx24wF1PnZabxuVoL2
-bPnQ/KvONDrw3IdqkKhYNTul7jEcu3OlcZIMw+7DiaKJLAzKb/bBF5gm/pwW6As9
-AgMBAAGjTjBMMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXgMCwGCWCGSAGG
-+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTANBgkqhkiG9w0B
-AQUFAAOCAQEAJzA4KTjkjXGSC4He63yX9Br0DneGBzjAwc1H6f72uqnCs8m7jgkE
-PQJFdTzQUKh97QPUuayZ2gl8XHagg+iWGy60Kw37gQ0+lumCN2sllvifhHU9R03H
-bWtS4kue+yQjMbrzf3zWygMDgwvFOUAIgBpH9qGc+CdNu97INTYd0Mvz51vLlxRn
-sC5aBYCWaZFnw3lWYxf9eVFRy9U+DkYFqX0LpmbDtcKP7AZGE6ZwSzaim+Cnoz1u
-Cgn+QmpFXgJKMFIZ82iSZISn+JkCCGxctZX1lMvai4Wi8Y0HxW9FTFZ6KBNwwE4B
-zjbN/ehBkgLlW/DWfi44DvwUHmuU6QP3cw==
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAtK2p2x0S3C1ajftAc3GaWPsji6scw1k9Sw/XltbLQuDc11/f
-wwrUiFcje2CB3Ri6yD6+uCA3V12jEc4GdqzirJZhwgIhaTv42vfYBgiUcR9McEGr
-agFC3yVR3lIbOzhBjmXNp1on46irxnzU4pT+w58IuvYqUBavaEtfRZocFR5NsIOy
-mRhyNag8htOFK3wmTEYrb0vflFYT6SD47ogYtsd/xWSKS+YFyb7xSusR2Ot6Ktmr
-MswQE57QYJz+KiRVlnL0cduMBdT52Wm8blaC9mz50PyrzjQ68NyHapCoWDU7pe4x
-HLtzpXGSDMPuw4miiSwMym/2wReYJv6cFugLPQIDAQABAoIBAAZOyc9MhIwLSU4L
-p4RgQvM4UVVe8/Id+3XTZ8NsXExJbWxXfIhiqGjaIfL8u4vsgRjcl+v1s/jo2/iT
-KMab4o4D8gXD7UavQVDjtjb/ta79WL3SjRl2Uc9YjjMkyq6WmDNQeo2NKDdafCTB
-1uzSJtLNipB8Z53ELPuHJhxX9QMHrMnuha49riQgXZ7buP9iQrHJFhImBjSzbxJx
-L+TI6rkyLSf9Wi0Pd3L27Ob3QWNfNRYNSeTE+08eSRChkur5W0RuXAcuAICdQlCl
-LBvWO/LmmvbzCqiDcgy/TliSb6CGGwgiNG7LJZmlkYNj8laGwalNlYZs3UrVv6NO
-Br2loAECgYEA2kvCvPGj0Dg/6g7WhXDvAkEbcaL1tSeCxBbNH+6HS2UWMWvyTtCn
-/bbD519QIdkvayy1QjEf32GV/UjUVmlULMLBcDy0DGjtL3+XpIhLKWDNxN1v1/ai
-1oz23ZJCOgnk6K4qtFtlRS1XtynjA+rBetvYvLP9SKeFrnpzCgaA2r0CgYEA0+KX
-1ACXDTNH5ySX3kMjSS9xdINf+OOw4CvPHFwbtc9aqk2HePlEsBTz5I/W3rKwXva3
-NqZ/bRqVVeZB/hHKFywgdUQk2Uc5z/S7Lw70/w1HubNTXGU06Ngb6zOFAo/o/TwZ
-zTP1BMIKSOB6PAZPS3l+aLO4FRIRotfFhgRHOoECgYEAmiZbqt8cJaJDB/5YYDzC
-mp3tSk6gIb936Q6M5VqkMYp9pIKsxhk0N8aDCnTU+kIK6SzWBpr3/d9Ecmqmfyq7
-5SvWO3KyVf0WWK9KH0abhOm2BKm2HBQvI0DB5u8sUx2/hsvOnjPYDISbZ11t0MtK
-u35Zy89yMYcSsIYJjG/ROCUCgYEAgI2P9G5PNxEP5OtMwOsW84Y3Xat/hPAQFlI+
-HES+AzbFGWJkeT8zL2nm95tVkFP1sggZ7Kxjz3w7cpx7GX0NkbWSE9O+T51pNASV
-tN1sQ3p5M+/a+cnlqgfEGJVvc7iAcXQPa3LEi5h2yPR49QYXAgG6cifn3dDSpmwn
-SUI7PQECgYEApGCIIpSRPLAEHTGmP87RBL1smurhwmy2s/pghkvUkWehtxg0sGHh
-kuaqDWcskogv+QC0sVdytiLSz8G0DwcEcsHK1Fkyb8A+ayiw6jWJDo2m9+IF4Fww
-1Te6jFPYDESnbhq7+TLGgHGhtwcu5cnb4vSuYXGXKupZGzoLOBbv1Zw=
------END RSA PRIVATE KEY-----
diff --git a/src/regress/lib/libssl/certs/server.pem b/src/regress/lib/libssl/certs/server.pem
deleted file mode 100644
index 7412490f51..0000000000
--- a/src/regress/lib/libssl/certs/server.pem
+++ /dev/null
@@ -1,51 +0,0 @@
-subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Server Cert
-issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA
------BEGIN CERTIFICATE-----
-MIIDpTCCAo2gAwIBAgIJAPYm3GvOr5eUMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
-VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt
-ZWRpYXRlIENBMB4XDTE0MDUyNDE0NDUxMloXDTI0MDQwMTE0NDUxMlowZDELMAkG
-A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU
-RVNUSU5HIFBVUlBPU0VTIE9OTFkxGTAXBgNVBAMMEFRlc3QgU2VydmVyIENlcnQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDzhPOSNtyyRspmeuUpxfNJ
-KCLTuf7g3uQ4zu4iHOmRO5TQci+HhVlLZrHF9XqFXcIP0y4pWDbMSGuiorUmzmfi
-R7bfSdI/+qIQt8KXRH6HNG1t8ou0VSvWId5TS5Dq/er5ODUr9OaaDva7EquHIcMv
-vPQGuI+OEAcnleVCy9HVEIySrO4P3CNIicnGkwwiAud05yUAq/gPXBC1hTtmlPD7
-TVcGVSEiJdvzqqlgv02qedGrkki6GY4S7GjZxrrf7Foc2EP+51LJzwLQx3/JfrCU
-41NEWAsu/Sl0tQabXESN+zJ1pDqoZ3uHMgpQjeGiE0olr+YcsSW/tJmiU9OiAr8R
-AgMBAAGjTjBMMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXgMCwGCWCGSAGG
-+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTANBgkqhkiG9w0B
-AQUFAAOCAQEADfy8VrY5er5ebYLyiC1il5kVOuJHSf8aN5SciJz/VcifA1+Hl2Bu
-CfuizhP/kUdB9PTSj8ep9sL+5PBFl7CZJDO6Sxs5+qJe15XvLBP8UEdvc779plL6
-StUMJT0aU/MaqUZZCldC3G4CcbwzOzKSD5YzvxxIGspxBWRduZKKMOju/4aqK76p
-dwA/VGCve9mjft3LIrb0gSaPi5KmdGtpAjzW3H1+63DSqxCYb1oiPtUZBs4STwjh
-WPRmAEVR4RPCETM3Sth4C+bE0QMCGY12ctcbzhj7Xgo7LcSpqviq6JD8SPuU7ISL
-hy4NcnBBHJr9OV9WTLpmS9V9Vg6QmOpxQw==
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA84TzkjbcskbKZnrlKcXzSSgi07n+4N7kOM7uIhzpkTuU0HIv
-h4VZS2axxfV6hV3CD9MuKVg2zEhroqK1Js5n4ke230nSP/qiELfCl0R+hzRtbfKL
-tFUr1iHeU0uQ6v3q+Tg1K/Tmmg72uxKrhyHDL7z0BriPjhAHJ5XlQsvR1RCMkqzu
-D9wjSInJxpMMIgLndOclAKv4D1wQtYU7ZpTw+01XBlUhIiXb86qpYL9NqnnRq5JI
-uhmOEuxo2ca63+xaHNhD/udSyc8C0Md/yX6wlONTRFgLLv0pdLUGm1xEjfsydaQ6
-qGd7hzIKUI3hohNKJa/mHLElv7SZolPTogK/EQIDAQABAoIBAADq9FwNtuE5IRQn
-zGtO4q7Y5uCzZ8GDNYr9RKp+P2cbuWDbvVAecYq2NV9QoIiWJOAYZKklOvekIju3
-r0UZLA0PRiIrTg6NrESx3JrjWDK8QNlUO7CPTZ39/K+FrmMkV9lem9yxjJjyC34D
-AQB+YRTx+l14HppjdxNwHjAVQpIx/uO2F5xAMuk32+3K+pq9CZUtrofe1q4Agj9R
-5s8mSy9pbRo9kW9wl5xdEotz1LivFOEiqPUJTUq5J5PeMKao3vdK726XI4Z455Nm
-W2/MA0YV0ug2FYinHcZdvKM6dimH8GLfa3X8xKRfzjGjTiMSwsdjgMa4awY3tEHH
-674jhAECgYEA/zqMrc0zsbNk83sjgaYIug5kzEpN4ic020rSZsmQxSCerJTgNhmg
-utKSCt0Re09Jt3LqG48msahX8ycqDsHNvlEGPQSbMu9IYeO3Wr3fAm75GEtFWePY
-BhM73I7gkRt4s8bUiUepMG/wY45c5tRF23xi8foReHFFe9MDzh8fJFECgYEA9EFX
-4qAik1pOJGNei9BMwmx0I0gfVEIgu0tzeVqT45vcxbxr7RkTEaDoAG6PlbWP6D9a
-WQNLp4gsgRM90ZXOJ4up5DsAWDluvaF4/omabMA+MJJ5kGZ0gCj5rbZbKqUws7x8
-bp+6iBfUPJUbcqNqFmi/08Yt7vrDnMnyMw2A/sECgYEAiiuRMxnuzVm34hQcsbhH
-6ymVqf7j0PW2qK0F4H1ocT9qhzWFd+RB3kHWrCjnqODQoI6GbGr/4JepHUpre1ex
-4UEN5oSS3G0ru0rC3U4C59dZ5KwDHFm7ffZ1pr52ljfQDUsrjjIMRtuiwNK2OoRa
-WSsqiaL+SDzSB+nBmpnAizECgYBdt/y6rerWUx4MhDwwtTnel7JwHyo2MDFS6/5g
-n8qC2Lj6/fMDRE22w+CA2esp7EJNQJGv+b27iFpbJEDh+/Lf5YzIT4MwVskQ5bYB
-JFcmRxUVmf4e09D7o705U/DjCgMH09iCsbLmqQ38ONIRSHZaJtMDtNTHD1yi+jF+
-OT43gQKBgQC/2OHZoko6iRlNOAQ/tMVFNq7fL81GivoQ9F1U0Qr+DH3ZfaH8eIkX
-xT0ToMPJUzWAn8pZv0snA0um6SIgvkCuxO84OkANCVbttzXImIsL7pFzfcwV/ERK
-UM6j0ZuSMFOCr/lGPAoOQU0fskidGEHi1/kW+suSr28TqsyYZpwBDQ==
------END RSA PRIVATE KEY-----
diff --git a/src/regress/lib/libssl/ciphers/Makefile b/src/regress/lib/libssl/ciphers/Makefile
deleted file mode 100644
index c9a58a5e09..0000000000
--- a/src/regress/lib/libssl/ciphers/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2015/02/06 08:48:39 jsing Exp $
-
-PROG=   cipherstest
-LDADD=  -lssl -lcrypto
-DPADD=  ${LIBSSL} ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/ciphers/cipherstest.c b/src/regress/lib/libssl/ciphers/cipherstest.c
deleted file mode 100644
index d76fbfc8c0..0000000000
--- a/src/regress/lib/libssl/ciphers/cipherstest.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/ssl.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-static int
-get_put_test(const char *name, const SSL_METHOD *method)
-{
-        STACK_OF(SSL_CIPHER) *ciphers;
-        const SSL_CIPHER *cipher;
-        unsigned char buf[2];
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int ret = 1;
-        int i, len;
-
-        if ((len = method->put_cipher_by_char(NULL, NULL)) != 2) {
-                fprintf(stderr,
-                    "%s: put_cipher_by_char() returned len %i (want 2)\n",
-                    name, len);
-                return (1);
-        }
-
-        if ((ssl_ctx = SSL_CTX_new(method)) == NULL) {
-                fprintf(stderr, "%s: SSL_CTX_new() returned NULL\n", name);
-                goto failure;
-        }
-        if ((ssl = SSL_new(ssl_ctx)) == NULL) {
-                fprintf(stderr, "%s: SSL_new() returned NULL\n", name);
-                goto failure;
-        }
-
-        if ((ciphers = SSL_get_ciphers(ssl)) == NULL) {
-                fprintf(stderr, "%s: no ciphers\n", name);
-                goto failure;
-        }
-
-        for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
-                cipher = sk_SSL_CIPHER_value(ciphers, i);
-                if ((len = method->put_cipher_by_char(cipher, buf)) != 2) {
-                        fprintf(stderr,
-                            "%s: put_cipher_by_char() returned len %i for %s "
-                            "(want 2)\n",
-                            name, len, SSL_CIPHER_get_name(cipher));
-                        goto failure;
-                }
-                if ((cipher = method->get_cipher_by_char(buf)) == NULL) {
-                        fprintf(stderr,
-                            "%s: get_cipher_by_char() returned NULL for %s\n",
-                            name, SSL_CIPHER_get_name(cipher));
-                        goto failure;
-                }
-        }
-
-        ret = 0;
-
-failure:
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-
-        return (ret);
-}
-
-static int
-cipher_get_put_tests(void)
-{
-        int failed = 0;
-
-        failed |= get_put_test("SSLv23", SSLv23_method());
-        failed |= get_put_test("SSLv23_client", SSLv23_client_method());
-        failed |= get_put_test("SSLv23_server", SSLv23_server_method());
-
-        failed |= get_put_test("TLSv1", TLSv1_method());
-        failed |= get_put_test("TLSv1_client", TLSv1_client_method());
-        failed |= get_put_test("TLSv1_server", TLSv1_server_method());
-
-        failed |= get_put_test("TLSv1_1", TLSv1_1_method());
-        failed |= get_put_test("TLSv1_1_client", TLSv1_1_client_method());
-        failed |= get_put_test("TLSv1_1_server", TLSv1_1_server_method());
-
-        failed |= get_put_test("TLSv1_2", TLSv1_2_method());
-        failed |= get_put_test("TLSv1_2_client", TLSv1_2_client_method());
-        failed |= get_put_test("TLSv1_2_server", TLSv1_2_server_method());
-
-        failed |= get_put_test("DTLSv1", DTLSv1_method());
-        failed |= get_put_test("DTLSv1_client", DTLSv1_client_method());
-        failed |= get_put_test("DTLSv1_server", DTLSv1_server_method());
-
-        return failed;
-}
-
-static int
-cipher_get_by_value_tests(void)
-{
-        STACK_OF(SSL_CIPHER) *ciphers;
-        const SSL_CIPHER *cipher;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        unsigned long id;
-        uint16_t value;
-        int ret = 1;
-        int i;
-
-        if ((ssl_ctx = SSL_CTX_new(SSLv23_method())) == NULL) {
-                fprintf(stderr, "SSL_CTX_new() returned NULL\n");
-                goto failure;
-        }
-        if ((ssl = SSL_new(ssl_ctx)) == NULL) {
-                fprintf(stderr, "SSL_new() returned NULL\n");
-                goto failure;
-        }
-
-        if ((ciphers = SSL_get_ciphers(ssl)) == NULL) {
-                fprintf(stderr, "no ciphers\n");
-                goto failure;
-        }
-
-        for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
-                cipher = sk_SSL_CIPHER_value(ciphers, i);
-
-                id = SSL_CIPHER_get_id(cipher);
-                if (SSL_CIPHER_get_by_id(id) == NULL) {
-                        fprintf(stderr, "SSL_CIPHER_get_by_id() failed "
-                            "for %s (0x%lx)\n", SSL_CIPHER_get_name(cipher),
-                            id);
-                        goto failure;
-                }
-
-                value = SSL_CIPHER_get_value(cipher);
-                if (SSL_CIPHER_get_by_value(value) == NULL) {
-                        fprintf(stderr, "SSL_CIPHER_get_by_value() failed "
-                            "for %s (0x%04hx)\n", SSL_CIPHER_get_name(cipher),
-                            value);
-                        goto failure;
-                }
-        }
-
-        ret = 0;
-
-failure:
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-
-        return (ret);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-
-        SSL_library_init();
-
-        failed |= cipher_get_put_tests();
-        failed |= cipher_get_by_value_tests();
-
-        return (failed);
-}
diff --git a/src/regress/lib/libssl/client/Makefile b/src/regress/lib/libssl/client/Makefile
deleted file mode 100644
index 4f99f0e97c..0000000000
--- a/src/regress/lib/libssl/client/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2015/09/01 17:02:18 jsing Exp $
-
-PROG=   clienttest
-LDADD=  -lssl -lcrypto
-DPADD=  ${LIBSSL} ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c
deleted file mode 100644
index cb45dc583c..0000000000
--- a/src/regress/lib/libssl/client/clienttest.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/ssl.h>
-
-#include <openssl/dtls1.h>
-#include <openssl/ssl3.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-#define DTLS_HM_OFFSET (DTLS1_RT_HEADER_LENGTH + DTLS1_HM_HEADER_LENGTH)
-#define DTLS_RANDOM_OFFSET (DTLS_HM_OFFSET + 2)
-#define DTLS_CIPHER_OFFSET (DTLS_HM_OFFSET + 38)
-
-#define SSL3_HM_OFFSET (SSL3_RT_HEADER_LENGTH + SSL3_HM_HEADER_LENGTH)
-#define SSL3_RANDOM_OFFSET (SSL3_HM_OFFSET + 2)
-#define SSL3_CIPHER_OFFSET (SSL3_HM_OFFSET + 37)
-
-static unsigned char cipher_list_dtls1[] = {
-        0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85,
-        0x00, 0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84,
-        0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
-        0x00, 0x2f, 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08,
-        0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
-};
-
-static unsigned char client_hello_dtls1[] = {
-        0x16, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x00, 0x00,
-        0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x54, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0xc0,
-        0x14, 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00,
-        0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0,
-        0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00,
-        0x2f, 0x00, 0x41, 0xc0, 0x12, 0xc0, 0x08, 0x00,
-        0x16, 0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00,
-        0x04, 0x00, 0x23, 0x00, 0x00,
-};
-
-static unsigned char cipher_list_tls10[] = {
-        0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85,
-        0x00, 0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84,
-        0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
-        0x00, 0x2f, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07,
-        0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
-        0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
-};
-
-static unsigned char client_hello_tls10[] = {
-        0x16, 0x03, 0x01, 0x00, 0x71, 0x01, 0x00, 0x00,
-        0x6d, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, 0xc0, 0x14,
-        0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 0x88,
-        0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13,
-        0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f,
-        0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
-        0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
-        0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00, 0x16,
-        0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
-        0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
-        0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
-};
-
-static unsigned char cipher_list_tls11[] = {
-        0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85,
-        0x00, 0x88, 0x00, 0x81, 0x00, 0x35, 0x00, 0x84,
-        0xc0, 0x13, 0xc0, 0x09, 0x00, 0x33, 0x00, 0x45,
-        0x00, 0x2f, 0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07,
-        0x00, 0x05, 0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08,
-        0x00, 0x16, 0x00, 0x0a, 0x00, 0xff,
-};
-
-static unsigned char client_hello_tls11[] = {
-        0x16, 0x03, 0x01, 0x00, 0x71, 0x01, 0x00, 0x00,
-        0x6d, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, 0xc0, 0x14,
-        0xc0, 0x0a, 0x00, 0x39, 0xff, 0x85, 0x00, 0x88,
-        0x00, 0x81, 0x00, 0x35, 0x00, 0x84, 0xc0, 0x13,
-        0xc0, 0x09, 0x00, 0x33, 0x00, 0x45, 0x00, 0x2f,    
-        0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
-        0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
-        0x00, 0x0a, 0x00, 0xff, 0x01, 0x00, 0x00, 0x16,
-        0x00, 0x0b, 0x00, 0x02, 0x01, 0x00, 0x00, 0x0a,
-        0x00, 0x08, 0x00, 0x06, 0x00, 0x1d, 0x00, 0x17,
-        0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
-};
-
-static unsigned char cipher_list_tls12_aes[] = {
-        0xc0, 0x30, 0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24,
-        0xc0, 0x14, 0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b,
-        0x00, 0x39, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa,
-        0xff, 0x85, 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81,
-        0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0,
-        0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27,
-        0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e,
-        0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45,
-        0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba,
-        0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
-        0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
-        0x00, 0x0a, 0x00, 0xff,
-};
-
-static unsigned char cipher_list_tls12_chacha[] = {
-        0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30,
-        0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14,
-        0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39,
-        0xff, 0x85, 0x00, 0xc4, 0x00, 0x88, 0x00, 0x81,
-        0x00, 0x9d, 0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0,
-        0x00, 0x84, 0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27,
-        0xc0, 0x23, 0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e,
-        0x00, 0x67, 0x00, 0x33, 0x00, 0xbe, 0x00, 0x45,
-        0x00, 0x9c, 0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba,
-        0x00, 0x41, 0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05,
-        0x00, 0x04, 0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16,
-        0x00, 0x0a, 0x00, 0xff,
-};
-
-static unsigned char client_hello_tls12[] = {
-        0x16, 0x03, 0x01, 0x00, 0xbf, 0x01, 0x00, 0x00,
-        0xbb, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0xcc, 0xa9,
-        0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c,
-        0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a,
-        0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, 0xff, 0x85,
-        0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d,
-        0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84,
-        0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23,
-        0xc0, 0x13, 0xc0, 0x09, 0x00, 0x9e, 0x00, 0x67,
-        0x00, 0x33, 0x00, 0xbe, 0x00, 0x45, 0x00, 0x9c,
-        0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41,
-        0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04,
-        0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a,
-        0x00, 0xff, 0x01, 0x00, 0x00, 0x36, 0x00, 0x0b,
-        0x00, 0x02, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08,
-        0x00, 0x06, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18,
-        0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x1c,
-        0x00, 0x1a, 0x06, 0x01, 0x06, 0x03, 0xef, 0xef,
-        0x05, 0x01, 0x05, 0x03, 0x04, 0x01, 0x04, 0x03,
-        0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x03,
-        0x02, 0x01, 0x02, 0x03,
-};
-
-struct client_hello_test {
-        const unsigned char *desc;
-        const int protocol;
-        const size_t random_start;
-        const SSL_METHOD *(*ssl_method)(void);
-        const long ssl_options;
-};
-
-static struct client_hello_test client_hello_tests[] = {
-        {
-                .desc = "DTLSv1 client",
-                .protocol = DTLS1_VERSION,
-                .random_start = DTLS_RANDOM_OFFSET,
-                .ssl_method = DTLSv1_client_method,
-        },
-        {
-                .desc = "TLSv1 client",
-                .protocol = TLS1_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = TLSv1_client_method,
-        },
-        {
-                .desc = "TLSv1_1 client",
-                .protocol = TLS1_1_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = TLSv1_1_client_method,
-        },
-        {
-                .desc = "TLSv1_2 client",
-                .protocol = TLS1_2_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = TLSv1_2_client_method,
-        },
-        {
-                .desc = "SSLv23 default",
-                .protocol = TLS1_2_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = SSLv23_client_method,
-                .ssl_options = 0,
-        },
-        {
-                .desc = "SSLv23 (no TLSv1.2)",
-                .protocol = TLS1_1_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = SSLv23_client_method,
-                .ssl_options = SSL_OP_NO_TLSv1_2,
-        },
-        {
-                .desc = "SSLv23 (no TLSv1.1)",
-                .protocol = TLS1_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = SSLv23_client_method,
-                .ssl_options = SSL_OP_NO_TLSv1_1,
-        },
-        {
-                .desc = "TLS default",
-                .protocol = TLS1_2_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = TLS_client_method,
-                .ssl_options = 0,
-        },
-        {
-                .desc = "TLS (no TLSv1.2)",
-                .protocol = TLS1_1_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = TLS_client_method,
-                .ssl_options = SSL_OP_NO_TLSv1_2,
-        },
-        {
-                .desc = "TLS (no TLSv1.1)",
-                .protocol = TLS1_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = TLS_client_method,
-                .ssl_options = SSL_OP_NO_TLSv1_1,
-        },
-        {
-                .desc = "TLS (no TLSv1.0, no TLSv1.1)",
-                .protocol = TLS1_2_VERSION,
-                .random_start = SSL3_RANDOM_OFFSET,
-                .ssl_method = TLS_client_method,
-                .ssl_options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1,
-        },
-};
-
-#define N_CLIENT_HELLO_TESTS \
-    (sizeof(client_hello_tests) / sizeof(*client_hello_tests))
-
-static void
-hexdump(const unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 1; i <= len; i++)
-                fprintf(stderr, " 0x%02hhx,%s", buf[i - 1], i % 8 ? "" : "\n");
-
-        fprintf(stderr, "\n");
-}
-
-static inline int
-ssl_aes_is_accelerated(void)
-{
-#if defined(__i386__) || defined(__x86_64__)
-        return ((OPENSSL_cpu_caps() & (1ULL << 57)) != 0);
-#else
-        return (0);
-#endif
-}
-
-static int
-make_client_hello(int protocol, char **out, size_t *outlen)
-{
-        size_t client_hello_len, cipher_list_len, cipher_list_offset;
-        const char *client_hello, *cipher_list;
-        char *p;
-        
-        *out = NULL;
-        *outlen = 0;
-
-        switch (protocol) {
-        case DTLS1_VERSION:
-                client_hello = client_hello_dtls1;
-                client_hello_len = sizeof(client_hello_dtls1);
-                cipher_list = cipher_list_dtls1;
-                cipher_list_len = sizeof(cipher_list_dtls1);
-                cipher_list_offset = DTLS_CIPHER_OFFSET;
-                break;
-        
-        case TLS1_VERSION:
-                client_hello = client_hello_tls10;
-                client_hello_len = sizeof(client_hello_tls10);
-                cipher_list = cipher_list_tls10;
-                cipher_list_len = sizeof(cipher_list_tls10);
-                cipher_list_offset = SSL3_CIPHER_OFFSET;
-                break;
-
-        case TLS1_1_VERSION:
-                client_hello = client_hello_tls11;
-                client_hello_len = sizeof(client_hello_tls11);
-                cipher_list = cipher_list_tls11;
-                cipher_list_len = sizeof(cipher_list_tls11);
-                cipher_list_offset = SSL3_CIPHER_OFFSET;
-                break;
-
-        case TLS1_2_VERSION:
-                client_hello = client_hello_tls12;
-                client_hello_len = sizeof(client_hello_tls12);
-                if (ssl_aes_is_accelerated() == 1)
-                        cipher_list = cipher_list_tls12_aes;
-                else
-                        cipher_list = cipher_list_tls12_chacha;
-                cipher_list_len = sizeof(cipher_list_tls12_chacha);
-                cipher_list_offset = SSL3_CIPHER_OFFSET;
-                break;
-        
-        default:
-                return (-1);
-        }
-
-        if ((p = malloc(client_hello_len)) == NULL)
-                return (-1);
-
-        memcpy(p, client_hello, client_hello_len);
-        memcpy(p + cipher_list_offset, cipher_list, cipher_list_len);
-
-        *out = p;
-        *outlen = client_hello_len;
-
-        return (0);
-}
-
-static int
-client_hello_test(int testno, struct client_hello_test *cht)
-{
-        BIO *rbio = NULL, *wbio = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        char *client_hello = NULL;
-        size_t client_hello_len;
-        char *wbuf, rbuf[1];
-        int ret = 1;
-        size_t i;
-        long len;
-
-        fprintf(stderr, "Test %i - %s\n", testno, cht->desc);
-
-        /* Providing a small buf causes *_get_server_hello() to return. */
-        if ((rbio = BIO_new_mem_buf(rbuf, sizeof(rbuf))) == NULL) {
-                fprintf(stderr, "Failed to setup rbio\n");
-                goto failure;
-        }
-        if ((wbio = BIO_new(BIO_s_mem())) == NULL) {
-                fprintf(stderr, "Failed to setup wbio\n");
-                goto failure;
-        }
-
-        if ((ssl_ctx = SSL_CTX_new(cht->ssl_method())) == NULL) {
-                fprintf(stderr, "SSL_CTX_new() returned NULL\n");
-                goto failure;
-        }
-
-        SSL_CTX_set_options(ssl_ctx, cht->ssl_options);
-
-        if ((ssl = SSL_new(ssl_ctx)) == NULL) {
-                fprintf(stderr, "SSL_new() returned NULL\n");
-                goto failure;
-        }
-
-        rbio->references = 2;
-        wbio->references = 2;
-
-        SSL_set_bio(ssl, rbio, wbio);
-        
-        if (SSL_connect(ssl) != 0) {
-                fprintf(stderr, "SSL_connect() returned non-zero\n");
-                goto failure;
-        }
-
-        len = BIO_get_mem_data(wbio, &wbuf);
-
-        if (make_client_hello(cht->protocol, &client_hello,
-            &client_hello_len) != 0)
-                goto failure;
-
-        if ((size_t)len != client_hello_len) {
-                fprintf(stderr, "FAIL: test returned ClientHello length %li, "
-                    "want %zu\n", len, client_hello_len);
-                fprintf(stderr, "received:\n");
-                hexdump(wbuf, len);
-                goto failure;
-        }
-
-        /* We expect the client random to differ. */
-        i = cht->random_start + SSL3_RANDOM_SIZE;
-        if (memcmp(client_hello, wbuf, cht->random_start) != 0 ||
-            memcmp(&client_hello[cht->random_start],
-                &wbuf[cht->random_start], SSL3_RANDOM_SIZE) == 0 ||
-            memcmp(&client_hello[i], &wbuf[i], len - i) != 0) {
-                fprintf(stderr, "FAIL: ClientHello differs:\n");
-                fprintf(stderr, "received:\n");
-                memset(&wbuf[cht->random_start], 0, SSL3_RANDOM_SIZE);
-                hexdump(wbuf, len);
-                fprintf(stderr, "test data:\n");
-                hexdump(client_hello, client_hello_len);
-                fprintf(stderr, "\n");
-                goto failure;
-        }
-        
-        ret = 0;
-
-failure:
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-
-        rbio->references = 1;
-        wbio->references = 1;
-
-        BIO_free(rbio);
-        BIO_free(wbio);
-
-        free(client_hello);
-
-        return (ret);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-        size_t i;
-
-        SSL_library_init();
-
-        for (i = 0; i < N_CLIENT_HELLO_TESTS; i++)
-                failed |= client_hello_test(i, &client_hello_tests[i]);
-
-        return (failed);
-}
diff --git a/src/regress/lib/libssl/pqueue/Makefile b/src/regress/lib/libssl/pqueue/Makefile
deleted file mode 100644
index 48c2cb7e61..0000000000
--- a/src/regress/lib/libssl/pqueue/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2016/11/04 19:45:12 jsing Exp $
-
-PROG=   pq_test
-SRC=    ${.CURDIR}/../../../../lib/libssl
-CFLAGS+=        -I${SRC}
-
-LDADD=  ${SSL_INT} -lcrypto
-DPADD=  ${LIBSSL} ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-REGRESS_TARGETS= regress-pq_test
-
-regress-pq_test: ${PROG}
-        ${.OBJDIR}/pq_test | cmp -s ${.CURDIR}/expected.txt /dev/stdin
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/pqueue/expected.txt b/src/regress/lib/libssl/pqueue/expected.txt
deleted file mode 100644
index c59d6cd838..0000000000
--- a/src/regress/lib/libssl/pqueue/expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-item    6966726167696c69
-item    7374696365787069
-item    737570657263616c
diff --git a/src/regress/lib/libssl/pqueue/pq_test.c b/src/regress/lib/libssl/pqueue/pq_test.c
deleted file mode 100644
index a078ba5366..0000000000
--- a/src/regress/lib/libssl/pqueue/pq_test.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* crypto/pqueue/pq_test.c */
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "pqueue.h"
-
-/* remember to change expected.txt if you change these values */
-unsigned char prio1[8] = "supercal";
-unsigned char prio2[8] = "ifragili";
-unsigned char prio3[8] = "sticexpi";
-
-static void
-pqueue_print(pqueue pq)
-{
-        pitem *iter, *item;
-
-        iter = pqueue_iterator(pq);
-        for (item = pqueue_next(&iter); item != NULL;
-            item = pqueue_next(&iter)) {
-                printf("item\t%02x%02x%02x%02x%02x%02x%02x%02x\n",
-                    item->priority[0], item->priority[1],
-                    item->priority[2], item->priority[3],
-                    item->priority[4], item->priority[5],
-                    item->priority[6], item->priority[7]);
-        }
-}
-
-int
-main(void)
-{
-        pitem *item;
-        pqueue pq;
-
-        pq = pqueue_new();
-
-        item = pitem_new(prio3, NULL);
-        pqueue_insert(pq, item);
-
-        item = pitem_new(prio1, NULL);
-        pqueue_insert(pq, item);
-
-        item = pitem_new(prio2, NULL);
-        pqueue_insert(pq, item);
-
-        item = pqueue_find(pq, prio1);
-        fprintf(stderr, "found %p\n", item->priority);
-
-        item = pqueue_find(pq, prio2);
-        fprintf(stderr, "found %p\n", item->priority);
-
-        item = pqueue_find(pq, prio3);
-        fprintf(stderr, "found %p\n", item ? item->priority: 0);
-
-        pqueue_print(pq);
-
-        for (item = pqueue_pop(pq); item != NULL; item = pqueue_pop(pq))
-                pitem_free(item);
-
-        pqueue_free(pq);
-        return 0;
-}
diff --git a/src/regress/lib/libssl/server/Makefile b/src/regress/lib/libssl/server/Makefile
deleted file mode 100644
index 705190d076..0000000000
--- a/src/regress/lib/libssl/server/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2017/03/05 14:15:53 jsing Exp $
-
-PROG=   servertest
-LDADD=  -lssl -lcrypto
-DPADD=  ${LIBSSL} ${LIBCRYPTO}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-REGRESS_TARGETS= \
-        regress-servertest
-
-regress-servertest: ${PROG}
-        ./servertest \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/ca.pem
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/server/servertest.c b/src/regress/lib/libssl/server/servertest.c
deleted file mode 100644
index 32578599e5..0000000000
--- a/src/regress/lib/libssl/server/servertest.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* $OpenBSD: servertest.c,v 1.1 2017/03/05 14:15:53 jsing Exp $ */
-/*
- * Copyright (c) 2015, 2016, 2017 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/ssl.h>
-
-#include <openssl/err.h>
-#include <openssl/dtls1.h>
-#include <openssl/ssl3.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <string.h>
-
-char *server_ca_file;
-char *server_cert_file;
-char *server_key_file;
-
-static unsigned char sslv2_client_hello_tls10[] = {
-        0x80, 0x6a, 0x01, 0x03, 0x01, 0x00, 0x51, 0x00,
-        0x00, 0x00, 0x10, 0x00, 0x00, 0x39, 0x00, 0x00,
-        0x38, 0x00, 0x00, 0x35, 0x00, 0x00, 0x16, 0x00,
-        0x00, 0x13, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x33,
-        0x00, 0x00, 0x32, 0x00, 0x00, 0x2f, 0x00, 0x00,
-        0x07, 0x00, 0x00, 0x66, 0x00, 0x00, 0x05, 0x00,
-        0x00, 0x04, 0x00, 0x00, 0x63, 0x00, 0x00, 0x62,
-        0x00, 0x00, 0x61, 0x00, 0x00, 0x15, 0x00, 0x00,
-        0x12, 0x00, 0x00, 0x09, 0x00, 0x00, 0x65, 0x00,
-        0x00, 0x64, 0x00, 0x00, 0x60, 0x00, 0x00, 0x14,
-        0x00, 0x00, 0x11, 0x00, 0x00, 0x08, 0x00, 0x00,
-        0x06, 0x00, 0x00, 0x03, 0xdd, 0xb6, 0x59, 0x26,
-        0x46, 0xe6, 0x79, 0x77, 0xf4, 0xec, 0x42, 0x76,
-        0xc8, 0x73, 0xad, 0x9c,
-};
-
-static unsigned char sslv2_client_hello_tls12[] = {
-        0x80, 0xcb, 0x01, 0x03, 0x03, 0x00, 0xa2, 0x00,
-        0x00, 0x00, 0x20, 0x00, 0x00, 0xa5, 0x00, 0x00,
-        0xa3, 0x00, 0x00, 0xa1, 0x00, 0x00, 0x9f, 0x00,
-        0x00, 0x6b, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x69,
-        0x00, 0x00, 0x68, 0x00, 0x00, 0x39, 0x00, 0x00,
-        0x38, 0x00, 0x00, 0x37, 0x00, 0x00, 0x36, 0x00,
-        0x00, 0x88, 0x00, 0x00, 0x87, 0x00, 0x00, 0x86,
-        0x00, 0x00, 0x85, 0x00, 0x00, 0x9d, 0x00, 0x00,
-        0x3d, 0x00, 0x00, 0x35, 0x00, 0x00, 0x84, 0x00,
-        0x00, 0xa4, 0x00, 0x00, 0xa2, 0x00, 0x00, 0xa0,
-        0x00, 0x00, 0x9e, 0x00, 0x00, 0x67, 0x00, 0x00,
-        0x40, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x3e, 0x00,
-        0x00, 0x33, 0x00, 0x00, 0x32, 0x00, 0x00, 0x31,
-        0x00, 0x00, 0x30, 0x00, 0x00, 0x9a, 0x00, 0x00,
-        0x99, 0x00, 0x00, 0x98, 0x00, 0x00, 0x97, 0x00,
-        0x00, 0x45, 0x00, 0x00, 0x44, 0x00, 0x00, 0x43,
-        0x00, 0x00, 0x42, 0x00, 0x00, 0x9c, 0x00, 0x00,
-        0x3c, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x96, 0x00,
-        0x00, 0x41, 0x00, 0x00, 0x07, 0x00, 0x00, 0x05,
-        0x00, 0x00, 0x04, 0x00, 0x00, 0x16, 0x00, 0x00,
-        0x13, 0x00, 0x00, 0x10, 0x00, 0x00, 0x0d, 0x00,
-        0x00, 0x0a, 0x00, 0x00, 0xff, 0x1d, 0xfd, 0x90,
-        0x03, 0x61, 0x3c, 0x5a, 0x22, 0x83, 0xed, 0x11,
-        0x85, 0xf4, 0xea, 0x36, 0x59, 0xd9, 0x1b, 0x27,
-        0x22, 0x01, 0x14, 0x07, 0x66, 0xb2, 0x24, 0xf5,
-        0x4e, 0x7d, 0x9d, 0x9c, 0x52,
-};
-
-struct server_hello_test {
-        const unsigned char *desc;
-        unsigned char *client_hello;
-        const size_t client_hello_len;
-        const SSL_METHOD *(*ssl_method)(void);
-        const long ssl_options;
-};
-
-static struct server_hello_test server_hello_tests[] = {
-        {
-                .desc = "TLSv1.0 in SSLv2 record",
-                .client_hello = sslv2_client_hello_tls10,
-                .client_hello_len = sizeof(sslv2_client_hello_tls10),
-                .ssl_method = TLS_server_method,
-                .ssl_options = 0,
-        },
-        {
-                .desc = "TLSv1.2 in SSLv2 record",
-                .client_hello = sslv2_client_hello_tls12,
-                .client_hello_len = sizeof(sslv2_client_hello_tls12),
-                .ssl_method = TLS_server_method,
-                .ssl_options = 0,
-        },
-};
-
-#define N_SERVER_HELLO_TESTS \
-    (sizeof(server_hello_tests) / sizeof(*server_hello_tests))
-
-static int
-server_hello_test(int testno, struct server_hello_test *sht)
-{
-        BIO *rbio = NULL, *wbio = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int ret = 1;
-
-        fprintf(stderr, "Test %i - %s\n", testno, sht->desc);
-
-        if ((rbio = BIO_new_mem_buf(sht->client_hello,
-            sht->client_hello_len)) == NULL) {
-                fprintf(stderr, "Failed to setup rbio\n");
-                goto failure;
-        }
-        if ((wbio = BIO_new(BIO_s_mem())) == NULL) {
-                fprintf(stderr, "Failed to setup wbio\n");
-                goto failure;
-        }
-
-        if ((ssl_ctx = SSL_CTX_new(sht->ssl_method())) == NULL) {
-                fprintf(stderr, "SSL_CTX_new() returned NULL\n");
-                goto failure;
-        }
-
-        if (SSL_CTX_use_certificate_file(ssl_ctx, server_cert_file,
-            SSL_FILETYPE_PEM) != 1) {
-                fprintf(stderr, "Failed to load server certificate");
-                goto failure;
-        }
-        if (SSL_CTX_use_PrivateKey_file(ssl_ctx, server_key_file,
-            SSL_FILETYPE_PEM) != 1) {
-                fprintf(stderr, "Failed to load server private key");
-                goto failure;
-        }
-
-        SSL_CTX_set_dh_auto(ssl_ctx, 1);
-        SSL_CTX_set_ecdh_auto(ssl_ctx, 1);
-        SSL_CTX_set_options(ssl_ctx, sht->ssl_options);
-
-        if ((ssl = SSL_new(ssl_ctx)) == NULL) {
-                fprintf(stderr, "SSL_new() returned NULL\n");
-                goto failure;
-        }
-
-        rbio->references = 2;
-        wbio->references = 2;
-
-        SSL_set_bio(ssl, rbio, wbio);
-        
-        if (SSL_accept(ssl) != 0) {
-                fprintf(stderr, "SSL_accept() returned non-zero\n");
-                ERR_print_errors_fp(stderr);
-                goto failure;
-        }
-
-        ret = 0;
-
- failure:
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-
-        rbio->references = 1;
-        wbio->references = 1;
-
-        BIO_free(rbio);
-        BIO_free(wbio);
-
-        return (ret);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-        size_t i;
-
-        if (argc != 4) {
-                fprintf(stderr, "usage: %s keyfile certfile cafile\n",
-                    argv[0]);
-                exit(1);
-        }
-
-        server_key_file = argv[1];
-        server_cert_file = argv[2];
-        server_ca_file = argv[3];
-
-        SSL_library_init();
-        SSL_load_error_strings();
-
-        for (i = 0; i < N_SERVER_HELLO_TESTS; i++)
-                failed |= server_hello_test(i, &server_hello_tests[i]);
-
-        return (failed);
-}
diff --git a/src/regress/lib/libssl/ssl/Makefile b/src/regress/lib/libssl/ssl/Makefile
deleted file mode 100644
index 581341c310..0000000000
--- a/src/regress/lib/libssl/ssl/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
-
-PROG=   ssltest
-LDADD=  -lcrypto -lssl
-DPADD=  ${LIBCRYPTO} ${LIBSSL}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Werror
-
-REGRESS_TARGETS=regress-ssltest
-
-regress-ssltest: ${PROG}
-        sh ${.CURDIR}/testssl \
-          ${.CURDIR}/../certs/server.pem ${.CURDIR}/../certs/server.pem \
-          ${.CURDIR}/../certs/ca.pem
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/ssl/ssltest.c b/src/regress/lib/libssl/ssl/ssltest.c
deleted file mode 100644
index 7137d0c407..0000000000
--- a/src/regress/lib/libssl/ssl/ssltest.c
+++ /dev/null
@@ -1,2044 +0,0 @@
-/* ssl/ssltest.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#define _BSD_SOURCE 1           /* Or gethostname won't be declared properly
-                                   on Linux and GNU platforms. */
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <ctype.h>
-
-#include <openssl/opensslconf.h>
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/ssl.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/dh.h>
-#include <openssl/bn.h>
-
-#define TEST_SERVER_CERT "../apps/server.pem"
-#define TEST_CLIENT_CERT "../apps/client.pem"
-
-static int verify_callback(int ok, X509_STORE_CTX *ctx);
-static RSA *tmp_rsa_cb(SSL *s, int is_export, int keylength);
-static void free_tmp_rsa(void);
-static int app_verify_callback(X509_STORE_CTX *ctx, void *arg);
-#define APP_CALLBACK_STRING "Test Callback Argument"
-struct app_verify_arg {
-        char *string;
-        int app_verify;
-        int allow_proxy_certs;
-        char *proxy_auth;
-        char *proxy_cond;
-};
-
-static DH *get_dh1024(void);
-static DH *get_dh1024dsa(void);
-
-static BIO *bio_err = NULL;
-static BIO *bio_stdout = NULL;
-
-static const char *alpn_client;
-static const char *alpn_server;
-static const char *alpn_expected;
-static unsigned char *alpn_selected;
-
-/*
- * next_protos_parse parses a comma separated list of strings into a string
- * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
- *   outlen: (output) set to the length of the resulting buffer on success.
- *   err: (maybe NULL) on failure, an error message line is written to this BIO.
- *   in: a NUL terminated string like "abc,def,ghi"
- *
- *   returns: a malloced buffer or NULL on failure.
- */
-static unsigned char *
-next_protos_parse(unsigned short *outlen, const char *in)
-{
-        size_t i, len, start = 0;
-        unsigned char *out;
-
-        len = strlen(in);
-        if (len >= 65535)
-                return (NULL);
-
-        if ((out = malloc(strlen(in) + 1)) == NULL)
-                return (NULL);
-
-        for (i = 0; i <= len; ++i) {
-                if (i == len || in[i] == ',') {
-                        if (i - start > 255) {
-                                free(out);
-                                return (NULL);
-                        }
-                        out[start] = i - start;
-                        start = i + 1;
-                } else
-                        out[i+1] = in[i];
-        }
-        *outlen = len + 1;
-        return (out);
-}
-
-static int
-cb_server_alpn(SSL *s, const unsigned char **out, unsigned char *outlen,
-    const unsigned char *in, unsigned int inlen, void *arg)
-{
-        unsigned char *protos;
-        unsigned short protos_len;
-
-        if ((protos = next_protos_parse(&protos_len, alpn_server)) == NULL) {
-                fprintf(stderr,
-                    "failed to parser ALPN server protocol string: %s\n",
-                    alpn_server);
-                abort();
-        }
-
-        if (SSL_select_next_proto((unsigned char **)out, outlen, protos,
-            protos_len, in, inlen) != OPENSSL_NPN_NEGOTIATED) {
-                free(protos);
-                return (SSL_TLSEXT_ERR_NOACK);
-        }
-
-        /*
-         * Make a copy of the selected protocol which will be freed in
-         * verify_alpn.
-         */
-        if ((alpn_selected = malloc(*outlen)) == NULL) {
-                fprintf(stderr, "malloc failed\n");
-                abort();
-        }
-        memcpy(alpn_selected, *out, *outlen);
-        *out = alpn_selected;
-        free(protos);
-
-        return (SSL_TLSEXT_ERR_OK);
-}
-
-static int
-verify_alpn(SSL *client, SSL *server)
-{
-        const unsigned char *client_proto, *server_proto;
-        unsigned int client_proto_len = 0, server_proto_len = 0;
-
-        SSL_get0_alpn_selected(client, &client_proto, &client_proto_len);
-        SSL_get0_alpn_selected(server, &server_proto, &server_proto_len);
-
-        free(alpn_selected);
-        alpn_selected = NULL;
-
-        if (client_proto_len != server_proto_len ||
-            memcmp(client_proto, server_proto, client_proto_len) != 0) {
-                BIO_printf(bio_stdout, "ALPN selected protocols differ!\n");
-                goto err;
-        }
-
-        if (client_proto_len > 0 && alpn_expected == NULL) {
-                BIO_printf(bio_stdout, "ALPN unexpectedly negotiated\n");
-                goto err;
-        }
-
-        if (alpn_expected != NULL &&
-            (client_proto_len != strlen(alpn_expected) ||
-             memcmp(client_proto, alpn_expected, client_proto_len) != 0)) {
-                BIO_printf(bio_stdout, "ALPN selected protocols not equal to "
-                    "expected protocol: %s\n", alpn_expected);
-                goto err;
-        }
-
-        return (0);
-
-err:
-        BIO_printf(bio_stdout, "ALPN results: client: '");
-        BIO_write(bio_stdout, client_proto, client_proto_len);
-        BIO_printf(bio_stdout, "', server: '");
-        BIO_write(bio_stdout, server_proto, server_proto_len);
-        BIO_printf(bio_stdout, "'\n");
-        BIO_printf(bio_stdout, "ALPN configured: client: '%s', server: '%s'\n",
-            alpn_client, alpn_server);
-
-        return (-1);
-}
-
-static char *cipher = NULL;
-static int verbose = 0;
-static int debug = 0;
-
-int doit_biopair(SSL *s_ssl, SSL *c_ssl, long bytes, clock_t *s_time,
-    clock_t *c_time);
-int doit(SSL *s_ssl, SSL *c_ssl, long bytes);
-static int do_test_cipherlist(void);
-
-static void
-sv_usage(void)
-{
-        fprintf(stderr, "usage: ssltest [args ...]\n");
-        fprintf(stderr, "\n");
-        fprintf(stderr, " -server_auth  - check server certificate\n");
-        fprintf(stderr, " -client_auth  - do client authentication\n");
-        fprintf(stderr, " -proxy        - allow proxy certificates\n");
-        fprintf(stderr, " -proxy_auth <val> - set proxy policy rights\n");
-        fprintf(stderr, " -proxy_cond <val> - experssion to test proxy policy rights\n");
-        fprintf(stderr, " -v            - more output\n");
-        fprintf(stderr, " -d            - debug output\n");
-        fprintf(stderr, " -reuse        - use session-id reuse\n");
-        fprintf(stderr, " -num <val>    - number of connections to perform\n");
-        fprintf(stderr, " -bytes <val>  - number of bytes to swap between client/server\n");
-        fprintf(stderr, " -dhe1024dsa   - use 1024 bit key (with 160-bit subprime) for DHE\n");
-        fprintf(stderr, " -no_dhe       - disable DHE\n");
-        fprintf(stderr, " -no_ecdhe     - disable ECDHE\n");
-        fprintf(stderr, " -dtls1        - use DTLSv1\n");
-        fprintf(stderr, " -tls1         - use TLSv1\n");
-        fprintf(stderr, " -CApath arg   - PEM format directory of CA's\n");
-        fprintf(stderr, " -CAfile arg   - PEM format file of CA's\n");
-        fprintf(stderr, " -cert arg     - Server certificate file\n");
-        fprintf(stderr, " -key arg      - Server key file (default: same as -cert)\n");
-        fprintf(stderr, " -c_cert arg   - Client certificate file\n");
-        fprintf(stderr, " -c_key arg    - Client key file (default: same as -c_cert)\n");
-        fprintf(stderr, " -cipher arg   - The cipher list\n");
-        fprintf(stderr, " -bio_pair     - Use BIO pairs\n");
-        fprintf(stderr, " -f            - Test even cases that can't work\n");
-        fprintf(stderr, " -time         - measure processor time used by client and server\n");
-        fprintf(stderr, " -named_curve arg  - Elliptic curve name to use for ephemeral ECDH keys.\n" \
-                       "                 Use \"openssl ecparam -list_curves\" for all names\n"  \
-                       "                 (default is sect163r2).\n");
-        fprintf(stderr, " -test_cipherlist - verifies the order of the ssl cipher lists\n");
-        fprintf(stderr, " -alpn_client <string> - have client side offer ALPN\n");
-        fprintf(stderr, " -alpn_server <string> - have server side offer ALPN\n");
-        fprintf(stderr, " -alpn_expected <string> - the ALPN protocol that should be negotiated\n");
-}
-
-static void
-print_details(SSL *c_ssl, const char *prefix)
-{
-        const SSL_CIPHER *ciph;
-        X509 *cert;
-
-        ciph = SSL_get_current_cipher(c_ssl);
-        BIO_printf(bio_stdout, "%s%s, cipher %s %s",
-            prefix, SSL_get_version(c_ssl), SSL_CIPHER_get_version(ciph),
-            SSL_CIPHER_get_name(ciph));
-        cert = SSL_get_peer_certificate(c_ssl);
-        if (cert != NULL) {
-                EVP_PKEY *pkey = X509_get_pubkey(cert);
-                if (pkey != NULL) {
-                        if (pkey->type == EVP_PKEY_RSA &&
-                            pkey->pkey.rsa != NULL &&
-                            pkey->pkey.rsa->n != NULL) {
-                                BIO_printf(bio_stdout, ", %d bit RSA",
-                                    BN_num_bits(pkey->pkey.rsa->n));
-                        } else if (pkey->type == EVP_PKEY_DSA &&
-                            pkey->pkey.dsa != NULL &&
-                            pkey->pkey.dsa->p != NULL) {
-                                BIO_printf(bio_stdout, ", %d bit DSA",
-                                    BN_num_bits(pkey->pkey.dsa->p));
-                        }
-                        EVP_PKEY_free(pkey);
-                }
-                X509_free(cert);
-        }
-        /* The SSL API does not allow us to look at temporary RSA/DH keys,
-         * otherwise we should print their lengths too */
-        BIO_printf(bio_stdout, "\n");
-}
-
-static void
-lock_dbg_cb(int mode, int type, const char *file, int line)
-{
-        static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
-        const char *errstr = NULL;
-        int rw;
-
-        rw = mode & (CRYPTO_READ|CRYPTO_WRITE);
-        if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE))) {
-                errstr = "invalid mode";
-                goto err;
-        }
-
-        if (type < 0 || type >= CRYPTO_NUM_LOCKS) {
-                errstr = "type out of bounds";
-                goto err;
-        }
-
-        if (mode & CRYPTO_LOCK) {
-                if (modes[type]) {
-                        errstr = "already locked";
-                        /* must not happen in a single-threaded program
-                         * (would deadlock) */
-                        goto err;
-                }
-
-                modes[type] = rw;
-        } else if (mode & CRYPTO_UNLOCK) {
-                if (!modes[type]) {
-                        errstr = "not locked";
-                        goto err;
-                }
-
-                if (modes[type] != rw) {
-                        errstr = (rw == CRYPTO_READ) ?
-                            "CRYPTO_r_unlock on write lock" :
-                            "CRYPTO_w_unlock on read lock";
-                }
-
-                modes[type] = 0;
-        } else {
-                errstr = "invalid mode";
-                goto err;
-        }
-
-err:
-        if (errstr) {
-                /* we cannot use bio_err here */
-                fprintf(stderr,
-                    "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
-                    errstr, mode, type, file, line);
-        }
-}
-
-int
-main(int argc, char *argv[])
-{
-        char *CApath = NULL, *CAfile = NULL;
-        int badop = 0;
-        int bio_pair = 0;
-        int force = 0;
-        int tls1 = 0, dtls1 = 0, ret = 1;
-        int client_auth = 0;
-        int server_auth = 0, i;
-        struct app_verify_arg app_verify_arg =
-            { APP_CALLBACK_STRING, 0, 0, NULL, NULL };
-        char *server_cert = TEST_SERVER_CERT;
-        char *server_key = NULL;
-        char *client_cert = TEST_CLIENT_CERT;
-        char *client_key = NULL;
-        char *named_curve = NULL;
-        SSL_CTX *s_ctx = NULL;
-        SSL_CTX *c_ctx = NULL;
-        const SSL_METHOD *meth = NULL;
-        SSL *c_ssl, *s_ssl;
-        int number = 1, reuse = 0;
-        long bytes = 256L;
-        DH *dh;
-        int dhe1024dsa = 0;
-        EC_KEY *ecdh = NULL;
-        int no_dhe = 0;
-        int no_ecdhe = 0;
-        int print_time = 0;
-        clock_t s_time = 0, c_time = 0;
-        int test_cipherlist = 0;
-
-        verbose = 0;
-        debug = 0;
-        cipher = 0;
-
-        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE|BIO_FP_TEXT);
-
-        CRYPTO_set_locking_callback(lock_dbg_cb);
-
-        bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE|BIO_FP_TEXT);
-
-        argc--;
-        argv++;
-
-        while (argc >= 1) {
-                if (!strcmp(*argv, "-F")) {
-                        fprintf(stderr, "not compiled with FIPS support, so exitting without running.\n");
-                        exit(0);
-                } else if (strcmp(*argv, "-server_auth") == 0)
-                        server_auth = 1;
-                else if (strcmp(*argv, "-client_auth") == 0)
-                        client_auth = 1;
-                else if (strcmp(*argv, "-proxy_auth") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        app_verify_arg.proxy_auth= *(++argv);
-                } else if (strcmp(*argv, "-proxy_cond") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        app_verify_arg.proxy_cond= *(++argv);
-                } else if (strcmp(*argv, "-v") == 0)
-                        verbose = 1;
-                else if (strcmp(*argv, "-d") == 0)
-                        debug = 1;
-                else if (strcmp(*argv, "-reuse") == 0)
-                        reuse = 1;
-                else if (strcmp(*argv, "-dhe1024dsa") == 0) {
-                        dhe1024dsa = 1;
-                } else if (strcmp(*argv, "-no_dhe") == 0)
-                        no_dhe = 1;
-                else if (strcmp(*argv, "-no_ecdhe") == 0)
-                        no_ecdhe = 1;
-                else if (strcmp(*argv, "-dtls1") == 0)
-                        dtls1 = 1;
-                else if (strcmp(*argv, "-tls1") == 0)
-                        tls1 = 1;
-                else if (strncmp(*argv, "-num", 4) == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        number = atoi(*(++argv));
-                        if (number == 0)
-                                number = 1;
-                } else if (strcmp(*argv, "-bytes") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        bytes = atol(*(++argv));
-                        if (bytes == 0L)
-                                bytes = 1L;
-                        i = strlen(argv[0]);
-                        if (argv[0][i - 1] == 'k')
-                                bytes*=1024L;
-                        if (argv[0][i - 1] == 'm')
-                                bytes*=1024L*1024L;
-                } else if (strcmp(*argv, "-cert") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        server_cert= *(++argv);
-                } else if (strcmp(*argv, "-s_cert") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        server_cert= *(++argv);
-                } else if (strcmp(*argv, "-key") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        server_key= *(++argv);
-                } else if (strcmp(*argv, "-s_key") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        server_key= *(++argv);
-                } else if (strcmp(*argv, "-c_cert") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        client_cert= *(++argv);
-                } else if (strcmp(*argv, "-c_key") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        client_key= *(++argv);
-                } else if (strcmp(*argv, "-cipher") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        cipher= *(++argv);
-                } else if (strcmp(*argv, "-CApath") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        CApath= *(++argv);
-                } else if (strcmp(*argv, "-CAfile") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        CAfile= *(++argv);
-                } else if (strcmp(*argv, "-bio_pair") == 0) {
-                        bio_pair = 1;
-                } else if (strcmp(*argv, "-f") == 0) {
-                        force = 1;
-                } else if (strcmp(*argv, "-time") == 0) {
-                        print_time = 1;
-                } else if (strcmp(*argv, "-named_curve") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        named_curve = *(++argv);
-                } else if (strcmp(*argv, "-app_verify") == 0) {
-                        app_verify_arg.app_verify = 1;
-                } else if (strcmp(*argv, "-proxy") == 0) {
-                        app_verify_arg.allow_proxy_certs = 1;
-                } else if (strcmp(*argv, "-test_cipherlist") == 0) {
-                        test_cipherlist = 1;
-                } else if (strcmp(*argv, "-alpn_client") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        alpn_client = *(++argv);
-                } else if (strcmp(*argv, "-alpn_server") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        alpn_server = *(++argv);
-                } else if (strcmp(*argv, "-alpn_expected") == 0) {
-                        if (--argc < 1)
-                                goto bad;
-                        alpn_expected = *(++argv);
-                } else {
-                        fprintf(stderr, "unknown option %s\n", *argv);
-                        badop = 1;
-                        break;
-                }
-                argc--;
-                argv++;
-        }
-        if (badop) {
-bad:
-                sv_usage();
-                goto end;
-        }
-
-        if (test_cipherlist == 1) {
-                /* ensure that the cipher list are correctly sorted and exit */
-                if (do_test_cipherlist() == 0)
-                        exit(1);
-                ret = 0;
-                goto end;
-        }
-
-        if (!dtls1 && !tls1 &&
-            number > 1 && !reuse && !force) {
-                fprintf(stderr,
-                    "This case cannot work.  Use -f to perform "
-                    "the test anyway (and\n-d to see what happens), "
-                    "or add one of -dtls1, -tls1, -reuse\n"
-                    "to avoid protocol mismatch.\n");
-                exit(1);
-        }
-
-        if (print_time) {
-                if (!bio_pair) {
-                        fprintf(stderr, "Using BIO pair (-bio_pair)\n");
-                        bio_pair = 1;
-                }
-                if (number < 50 && !force)
-                        fprintf(stderr, "Warning: For accurate timings, use more connections (e.g. -num 1000)\n");
-        }
-
-/*      if (cipher == NULL) cipher=getenv("SSL_CIPHER"); */
-
-        SSL_library_init();
-        SSL_load_error_strings();
-
-        if (dtls1)
-                meth = DTLSv1_method();
-        else if (tls1)
-                meth = TLSv1_method();
-        else
-                meth = SSLv23_method();
-
-        c_ctx = SSL_CTX_new(meth);
-        s_ctx = SSL_CTX_new(meth);
-        if ((c_ctx == NULL) || (s_ctx == NULL)) {
-                ERR_print_errors(bio_err);
-                goto end;
-        }
-
-        if (cipher != NULL) {
-                SSL_CTX_set_cipher_list(c_ctx, cipher);
-                SSL_CTX_set_cipher_list(s_ctx, cipher);
-        }
-
-        if (!no_dhe) {
-                if (dhe1024dsa) {
-                        /* use SSL_OP_SINGLE_DH_USE to avoid small subgroup attacks */
-                        SSL_CTX_set_options(s_ctx, SSL_OP_SINGLE_DH_USE);
-                        dh = get_dh1024dsa();
-                } else
-                        dh = get_dh1024();
-                SSL_CTX_set_tmp_dh(s_ctx, dh);
-                DH_free(dh);
-        }
-
-        if (!no_ecdhe) {
-                int nid;
-
-                if (named_curve != NULL) {
-                        nid = OBJ_sn2nid(named_curve);
-                        if (nid == 0) {
-                                BIO_printf(bio_err, "unknown curve name (%s)\n", named_curve);
-                                goto end;
-                        }
-                } else
-                        nid = NID_X9_62_prime256v1;
-
-                ecdh = EC_KEY_new_by_curve_name(nid);
-                if (ecdh == NULL) {
-                        BIO_printf(bio_err, "unable to create curve\n");
-                        goto end;
-                }
-
-                SSL_CTX_set_tmp_ecdh(s_ctx, ecdh);
-                SSL_CTX_set_options(s_ctx, SSL_OP_SINGLE_ECDH_USE);
-                EC_KEY_free(ecdh);
-        }
-
-        SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
-
-        if (!SSL_CTX_use_certificate_file(s_ctx, server_cert,
-            SSL_FILETYPE_PEM)) {
-                ERR_print_errors(bio_err);
-        } else if (!SSL_CTX_use_PrivateKey_file(s_ctx,
-            (server_key ? server_key : server_cert), SSL_FILETYPE_PEM)) {
-                ERR_print_errors(bio_err);
-                goto end;
-        }
-
-        if (client_auth) {
-                SSL_CTX_use_certificate_file(c_ctx, client_cert,
-                    SSL_FILETYPE_PEM);
-                SSL_CTX_use_PrivateKey_file(c_ctx,
-                    (client_key ? client_key : client_cert),
-                    SSL_FILETYPE_PEM);
-        }
-
-        if ((!SSL_CTX_load_verify_locations(s_ctx, CAfile, CApath)) ||
-            (!SSL_CTX_set_default_verify_paths(s_ctx)) ||
-            (!SSL_CTX_load_verify_locations(c_ctx, CAfile, CApath)) ||
-            (!SSL_CTX_set_default_verify_paths(c_ctx))) {
-                /* fprintf(stderr,"SSL_load_verify_locations\n"); */
-                ERR_print_errors(bio_err);
-                /* goto end; */
-        }
-
-        if (client_auth) {
-                BIO_printf(bio_err, "client authentication\n");
-                SSL_CTX_set_verify(s_ctx,
-                    SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-                    verify_callback);
-                SSL_CTX_set_cert_verify_callback(s_ctx, app_verify_callback,
-                    &app_verify_arg);
-        }
-        if (server_auth) {
-                BIO_printf(bio_err, "server authentication\n");
-                SSL_CTX_set_verify(c_ctx, SSL_VERIFY_PEER,
-                    verify_callback);
-                SSL_CTX_set_cert_verify_callback(c_ctx, app_verify_callback,
-                    &app_verify_arg);
-        }
-
-        {
-                int session_id_context = 0;
-                SSL_CTX_set_session_id_context(s_ctx,
-                    (void *)&session_id_context, sizeof(session_id_context));
-        }
-
-        if (alpn_server != NULL)
-                SSL_CTX_set_alpn_select_cb(s_ctx, cb_server_alpn, NULL);
-
-        if (alpn_client != NULL) {
-                unsigned short alpn_len;
-                unsigned char *alpn = next_protos_parse(&alpn_len, alpn_client);
-
-                if (alpn == NULL) {
-                        BIO_printf(bio_err, "Error parsing -alpn_client argument\n");
-                        goto end;
-                }
-                SSL_CTX_set_alpn_protos(c_ctx, alpn, alpn_len);
-                free(alpn);
-        }
-
-        c_ssl = SSL_new(c_ctx);
-        s_ssl = SSL_new(s_ctx);
-
-        for (i = 0; i < number; i++) {
-                if (!reuse)
-                        SSL_set_session(c_ssl, NULL);
-                if (bio_pair)
-                        ret = doit_biopair(s_ssl, c_ssl, bytes, &s_time,
-                            &c_time);
-                else
-                        ret = doit(s_ssl, c_ssl, bytes);
-        }
-
-        if (!verbose) {
-                print_details(c_ssl, "");
-        }
-        if ((number > 1) || (bytes > 1L))
-                BIO_printf(bio_stdout, "%d handshakes of %ld bytes done\n",
-                    number, bytes);
-        if (print_time) {
-#ifdef CLOCKS_PER_SEC
-                /* "To determine the time in seconds, the value returned
-                 * by the clock function should be divided by the value
-                 * of the macro CLOCKS_PER_SEC."
-                 *                                       -- ISO/IEC 9899 */
-                BIO_printf(bio_stdout,
-                    "Approximate total server time: %6.2f s\n"
-                    "Approximate total client time: %6.2f s\n",
-                    (double)s_time/CLOCKS_PER_SEC,
-                    (double)c_time/CLOCKS_PER_SEC);
-#else
-                /* "`CLOCKS_PER_SEC' undeclared (first use this function)"
-                 *                            -- cc on NeXTstep/OpenStep */
-                BIO_printf(bio_stdout,
-                    "Approximate total server time: %6.2f units\n"
-                    "Approximate total client time: %6.2f units\n",
-                    (double)s_time,
-                    (double)c_time);
-#endif
-        }
-
-        SSL_free(s_ssl);
-        SSL_free(c_ssl);
-
-end:
-        SSL_CTX_free(s_ctx);
-        SSL_CTX_free(c_ctx);
-        BIO_free(bio_stdout);
-
-        free_tmp_rsa();
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE_cleanup();
-#endif
-        CRYPTO_cleanup_all_ex_data();
-        ERR_free_strings();
-        ERR_remove_thread_state(NULL);
-        EVP_cleanup();
-        CRYPTO_mem_leaks(bio_err);
-        BIO_free(bio_err);
-
-        exit(ret);
-        return ret;
-}
-
-int
-doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, clock_t *s_time,
-    clock_t *c_time)
-{
-        long cw_num = count, cr_num = count, sw_num = count, sr_num = count;
-        BIO *s_ssl_bio = NULL, *c_ssl_bio = NULL;
-        BIO *server = NULL, *server_io = NULL;
-        BIO *client = NULL, *client_io = NULL;
-        int ret = 1;
-
-        size_t bufsiz = 256; /* small buffer for testing */
-
-        if (!BIO_new_bio_pair(&server, bufsiz, &server_io, bufsiz))
-                goto err;
-        if (!BIO_new_bio_pair(&client, bufsiz, &client_io, bufsiz))
-                goto err;
-
-        s_ssl_bio = BIO_new(BIO_f_ssl());
-        if (!s_ssl_bio)
-                goto err;
-
-        c_ssl_bio = BIO_new(BIO_f_ssl());
-        if (!c_ssl_bio)
-                goto err;
-
-        SSL_set_connect_state(c_ssl);
-        SSL_set_bio(c_ssl, client, client);
-        (void)BIO_set_ssl(c_ssl_bio, c_ssl, BIO_NOCLOSE);
-
-        SSL_set_accept_state(s_ssl);
-        SSL_set_bio(s_ssl, server, server);
-        (void)BIO_set_ssl(s_ssl_bio, s_ssl, BIO_NOCLOSE);
-
-        do {
-                /* c_ssl_bio:          SSL filter BIO
-                 *
-                 * client:             pseudo-I/O for SSL library
-                 *
-                 * client_io:          client's SSL communication; usually to be
-                 *                     relayed over some I/O facility, but in this
-                 *                     test program, we're the server, too:
-                 *
-                 * server_io:          server's SSL communication
-                 *
-                 * server:             pseudo-I/O for SSL library
-                 *
-                 * s_ssl_bio:          SSL filter BIO
-                 *
-                 * The client and the server each employ a "BIO pair":
-                 * client + client_io, server + server_io.
-                 * BIO pairs are symmetric.  A BIO pair behaves similar
-                 * to a non-blocking socketpair (but both endpoints must
-                 * be handled by the same thread).
-                 * [Here we could connect client and server to the ends
-                 * of a single BIO pair, but then this code would be less
-                 * suitable as an example for BIO pairs in general.]
-                 *
-                 * Useful functions for querying the state of BIO pair endpoints:
-                 *
-                 * BIO_ctrl_pending(bio)              number of bytes we can read now
-                 * BIO_ctrl_get_read_request(bio)     number of bytes needed to fulfil
-                 *                                      other side's read attempt
-                 * BIO_ctrl_get_write_guarantee(bio)   number of bytes we can write now
-                 *
-                 * ..._read_request is never more than ..._write_guarantee;
-                 * it depends on the application which one you should use.
-                 */
-
-                /* We have non-blocking behaviour throughout this test program, but
-                 * can be sure that there is *some* progress in each iteration; so
-                 * we don't have to worry about ..._SHOULD_READ or ..._SHOULD_WRITE
-                 * -- we just try everything in each iteration
-                 */
-
-                {
-                        /* CLIENT */
-
-                        char cbuf[1024*8];
-                        int i, r;
-                        clock_t c_clock = clock();
-
-                        memset(cbuf, 0, sizeof(cbuf));
-
-                        if (debug)
-                                if (SSL_in_init(c_ssl))
-                                        printf("client waiting in SSL_connect - %s\n",
-                                            SSL_state_string_long(c_ssl));
-
-                        if (cw_num > 0) {
-                                /* Write to server. */
-
-                                if (cw_num > (long)sizeof cbuf)
-                                        i = sizeof cbuf;
-                                else
-                                        i = (int)cw_num;
-                                r = BIO_write(c_ssl_bio, cbuf, i);
-                                if (r < 0) {
-                                        if (!BIO_should_retry(c_ssl_bio)) {
-                                                fprintf(stderr, "ERROR in CLIENT\n");
-                                                goto err;
-                                        }
-                                        /* BIO_should_retry(...) can just be ignored here.
-                                         * The library expects us to call BIO_write with
-                                         * the same arguments again, and that's what we will
-                                         * do in the next iteration. */
-                                } else if (r == 0) {
-                                        fprintf(stderr, "SSL CLIENT STARTUP FAILED\n");
-                                        goto err;
-                                } else {
-                                        if (debug)
-                                                printf("client wrote %d\n", r);
-                                        cw_num -= r;
-
-                                }
-                        }
-
-                        if (cr_num > 0) {
-                                /* Read from server. */
-
-                                r = BIO_read(c_ssl_bio, cbuf, sizeof(cbuf));
-                                if (r < 0) {
-                                        if (!BIO_should_retry(c_ssl_bio)) {
-                                                fprintf(stderr, "ERROR in CLIENT\n");
-                                                goto err;
-                                        }
-                                        /* Again, "BIO_should_retry" can be ignored. */
-                                } else if (r == 0) {
-                                        fprintf(stderr, "SSL CLIENT STARTUP FAILED\n");
-                                        goto err;
-                                } else {
-                                        if (debug)
-                                                printf("client read %d\n", r);
-                                        cr_num -= r;
-                                }
-                        }
-
-                        /* c_time and s_time increments will typically be very small
-                         * (depending on machine speed and clock tick intervals),
-                         * but sampling over a large number of connections should
-                         * result in fairly accurate figures.  We cannot guarantee
-                         * a lot, however -- if each connection lasts for exactly
-                         * one clock tick, it will be counted only for the client
-                         * or only for the server or even not at all.
-                         */
-                        *c_time += (clock() - c_clock);
-                }
-
-                {
-                        /* SERVER */
-
-                        char sbuf[1024*8];
-                        int i, r;
-                        clock_t s_clock = clock();
-
-                        memset(sbuf, 0, sizeof(sbuf));
-
-                        if (debug)
-                                if (SSL_in_init(s_ssl))
-                                        printf("server waiting in SSL_accept - %s\n",
-                                            SSL_state_string_long(s_ssl));
-
-                        if (sw_num > 0) {
-                                /* Write to client. */
-
-                                if (sw_num > (long)sizeof sbuf)
-                                        i = sizeof sbuf;
-                                else
-                                        i = (int)sw_num;
-                                r = BIO_write(s_ssl_bio, sbuf, i);
-                                if (r < 0) {
-                                        if (!BIO_should_retry(s_ssl_bio)) {
-                                                fprintf(stderr, "ERROR in SERVER\n");
-                                                goto err;
-                                        }
-                                        /* Ignore "BIO_should_retry". */
-                                } else if (r == 0) {
-                                        fprintf(stderr, "SSL SERVER STARTUP FAILED\n");
-                                        goto err;
-                                } else {
-                                        if (debug)
-                                                printf("server wrote %d\n", r);
-                                        sw_num -= r;
-
-                                }
-                        }
-
-                        if (sr_num > 0) {
-                                /* Read from client. */
-
-                                r = BIO_read(s_ssl_bio, sbuf, sizeof(sbuf));
-                                if (r < 0) {
-                                        if (!BIO_should_retry(s_ssl_bio)) {
-                                                fprintf(stderr, "ERROR in SERVER\n");
-                                                goto err;
-                                        }
-                                        /* blah, blah */
-                                } else if (r == 0) {
-                                        fprintf(stderr, "SSL SERVER STARTUP FAILED\n");
-                                        goto err;
-                                } else {
-                                        if (debug)
-                                                printf("server read %d\n", r);
-                                        sr_num -= r;
-                                }
-                        }
-
-                        *s_time += (clock() - s_clock);
-                }
-
-                {
-                        /* "I/O" BETWEEN CLIENT AND SERVER. */
-
-                        size_t r1, r2;
-                        BIO *io1 = server_io, *io2 = client_io;
-                        /* we use the non-copying interface for io1
-                         * and the standard BIO_write/BIO_read interface for io2
-                         */
-
-                        static int prev_progress = 1;
-                        int progress = 0;
-
-                        /* io1 to io2 */
-                        do {
-                                size_t num;
-                                int r;
-
-                                r1 = BIO_ctrl_pending(io1);
-                                r2 = BIO_ctrl_get_write_guarantee(io2);
-
-                                num = r1;
-                                if (r2 < num)
-                                        num = r2;
-                                if (num) {
-                                        char *dataptr;
-
-                                        if (INT_MAX < num) /* yeah, right */
-                                                num = INT_MAX;
-
-                                        r = BIO_nread(io1, &dataptr, (int)num);
-                                        assert(r > 0);
-                                        assert(r <= (int)num);
-                                        /* possibly r < num (non-contiguous data) */
-                                        num = r;
-                                        r = BIO_write(io2, dataptr, (int)num);
-                                        if (r != (int)num) /* can't happen */
-                                        {
-                                                fprintf(stderr, "ERROR: BIO_write could not write "
-                                                    "BIO_ctrl_get_write_guarantee() bytes");
-                                                goto err;
-                                        }
-                                        progress = 1;
-
-                                        if (debug)
-                                                printf((io1 == client_io) ?
-                                                    "C->S relaying: %d bytes\n" :
-                                                    "S->C relaying: %d bytes\n",
-                                                    (int)num);
-                                }
-                        } while (r1 && r2);
-
-                        /* io2 to io1 */
-                        {
-                                size_t num;
-                                int r;
-
-                                r1 = BIO_ctrl_pending(io2);
-                                r2 = BIO_ctrl_get_read_request(io1);
-                                /* here we could use ..._get_write_guarantee instead of
-                                 * ..._get_read_request, but by using the latter
-                                 * we test restartability of the SSL implementation
-                                 * more thoroughly */
-                                num = r1;
-                                if (r2 < num)
-                                        num = r2;
-                                if (num) {
-                                        char *dataptr;
-
-                                        if (INT_MAX < num)
-                                                num = INT_MAX;
-
-                                        if (num > 1)
-                                                --num; /* test restartability even more thoroughly */
-
-                                        r = BIO_nwrite0(io1, &dataptr);
-                                        assert(r > 0);
-                                        if (r < (int)num)
-                                                num = r;
-                                        r = BIO_read(io2, dataptr, (int)num);
-                                        if (r != (int)num) /* can't happen */
-                                        {
-                                                fprintf(stderr, "ERROR: BIO_read could not read "
-                                                    "BIO_ctrl_pending() bytes");
-                                                goto err;
-                                        }
-                                        progress = 1;
-                                        r = BIO_nwrite(io1, &dataptr, (int)num);
-                                        if (r != (int)num) /* can't happen */
-                                        {
-                                                fprintf(stderr, "ERROR: BIO_nwrite() did not accept "
-                                                    "BIO_nwrite0() bytes");
-                                                goto err;
-                                        }
-
-                                        if (debug)
-                                                printf((io2 == client_io) ?
-                                                    "C->S relaying: %d bytes\n" :
-                                                    "S->C relaying: %d bytes\n",
-                                                    (int)num);
-                                }
-                        } /* no loop, BIO_ctrl_get_read_request now returns 0 anyway */
-
-                        if (!progress && !prev_progress) {
-                                if (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0) {
-                                        fprintf(stderr, "ERROR: got stuck\n");
-                                        goto err;
-                                }
-                        }
-                        prev_progress = progress;
-                }
-        } while (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0);
-
-        if (verbose)
-                print_details(c_ssl, "DONE via BIO pair: ");
-
-        if (verify_alpn(c_ssl, s_ssl) < 0) {
-                ret = 1;
-                goto err;
-        }
-
-        ret = 0;
-
-err:
-        ERR_print_errors(bio_err);
-
-        BIO_free(server);
-        BIO_free(server_io);
-        BIO_free(client);
-        BIO_free(client_io);
-        BIO_free(s_ssl_bio);
-        BIO_free(c_ssl_bio);
-
-        return ret;
-}
-
-
-#define W_READ  1
-#define W_WRITE 2
-#define C_DONE  1
-#define S_DONE  2
-
-int
-doit(SSL *s_ssl, SSL *c_ssl, long count)
-{
-        char cbuf[1024*8], sbuf[1024*8];
-        long cw_num = count, cr_num = count;
-        long sw_num = count, sr_num = count;
-        int ret = 1;
-        BIO *c_to_s = NULL;
-        BIO *s_to_c = NULL;
-        BIO *c_bio = NULL;
-        BIO *s_bio = NULL;
-        int c_r, c_w, s_r, s_w;
-        int i, j;
-        int done = 0;
-        int c_write, s_write;
-        int do_server = 0, do_client = 0;
-
-        memset(cbuf, 0, sizeof(cbuf));
-        memset(sbuf, 0, sizeof(sbuf));
-
-        c_to_s = BIO_new(BIO_s_mem());
-        s_to_c = BIO_new(BIO_s_mem());
-        if ((s_to_c == NULL) || (c_to_s == NULL)) {
-                ERR_print_errors(bio_err);
-                goto err;
-        }
-
-        c_bio = BIO_new(BIO_f_ssl());
-        s_bio = BIO_new(BIO_f_ssl());
-        if ((c_bio == NULL) || (s_bio == NULL)) {
-                ERR_print_errors(bio_err);
-                goto err;
-        }
-
-        SSL_set_connect_state(c_ssl);
-        SSL_set_bio(c_ssl, s_to_c, c_to_s);
-        BIO_set_ssl(c_bio, c_ssl, BIO_NOCLOSE);
-
-        SSL_set_accept_state(s_ssl);
-        SSL_set_bio(s_ssl, c_to_s, s_to_c);
-        BIO_set_ssl(s_bio, s_ssl, BIO_NOCLOSE);
-
-        c_r = 0;
-        s_r = 1;
-        c_w = 1;
-        s_w = 0;
-        c_write = 1, s_write = 0;
-
-        /* We can always do writes */
-        for (;;) {
-                do_server = 0;
-                do_client = 0;
-
-                i = (int)BIO_pending(s_bio);
-                if ((i && s_r) || s_w)
-                        do_server = 1;
-
-                i = (int)BIO_pending(c_bio);
-                if ((i && c_r) || c_w)
-                        do_client = 1;
-
-                if (do_server && debug) {
-                        if (SSL_in_init(s_ssl))
-                                printf("server waiting in SSL_accept - %s\n",
-                                    SSL_state_string_long(s_ssl));
-                }
-
-                if (do_client && debug) {
-                        if (SSL_in_init(c_ssl))
-                                printf("client waiting in SSL_connect - %s\n",
-                                    SSL_state_string_long(c_ssl));
-                }
-
-                if (!do_client && !do_server) {
-                        fprintf(stdout, "ERROR in STARTUP\n");
-                        ERR_print_errors(bio_err);
-                        goto err;
-                }
-
-                if (do_client && !(done & C_DONE)) {
-                        if (c_write) {
-                                j = (cw_num > (long)sizeof(cbuf)) ?
-                                    (int)sizeof(cbuf) : (int)cw_num;
-                                i = BIO_write(c_bio, cbuf, j);
-                                if (i < 0) {
-                                        c_r = 0;
-                                        c_w = 0;
-                                        if (BIO_should_retry(c_bio)) {
-                                                if (BIO_should_read(c_bio))
-                                                        c_r = 1;
-                                                if (BIO_should_write(c_bio))
-                                                        c_w = 1;
-                                        } else {
-                                                fprintf(stderr, "ERROR in CLIENT\n");
-                                                ERR_print_errors(bio_err);
-                                                goto err;
-                                        }
-                                } else if (i == 0) {
-                                        fprintf(stderr, "SSL CLIENT STARTUP FAILED\n");
-                                        goto err;
-                                } else {
-                                        if (debug)
-                                                printf("client wrote %d\n", i);
-                                        /* ok */
-                                        s_r = 1;
-                                        c_write = 0;
-                                        cw_num -= i;
-                                }
-                        } else {
-                                i = BIO_read(c_bio, cbuf, sizeof(cbuf));
-                                if (i < 0) {
-                                        c_r = 0;
-                                        c_w = 0;
-                                        if (BIO_should_retry(c_bio)) {
-                                                if (BIO_should_read(c_bio))
-                                                        c_r = 1;
-                                                if (BIO_should_write(c_bio))
-                                                        c_w = 1;
-                                        } else {
-                                                fprintf(stderr, "ERROR in CLIENT\n");
-                                                ERR_print_errors(bio_err);
-                                                goto err;
-                                        }
-                                } else if (i == 0) {
-                                        fprintf(stderr, "SSL CLIENT STARTUP FAILED\n");
-                                        goto err;
-                                } else {
-                                        if (debug)
-                                                printf("client read %d\n", i);
-                                        cr_num -= i;
-                                        if (sw_num > 0) {
-                                                s_write = 1;
-                                                s_w = 1;
-                                        }
-                                        if (cr_num <= 0) {
-                                                s_write = 1;
-                                                s_w = 1;
-                                                done = S_DONE|C_DONE;
-                                        }
-                                }
-                        }
-                }
-
-                if (do_server && !(done & S_DONE)) {
-                        if (!s_write) {
-                                i = BIO_read(s_bio, sbuf, sizeof(cbuf));
-                                if (i < 0) {
-                                        s_r = 0;
-                                        s_w = 0;
-                                        if (BIO_should_retry(s_bio)) {
-                                                if (BIO_should_read(s_bio))
-                                                        s_r = 1;
-                                                if (BIO_should_write(s_bio))
-                                                        s_w = 1;
-                                        } else {
-                                                fprintf(stderr, "ERROR in SERVER\n");
-                                                ERR_print_errors(bio_err);
-                                                goto err;
-                                        }
-                                } else if (i == 0) {
-                                        ERR_print_errors(bio_err);
-                                        fprintf(stderr, "SSL SERVER STARTUP FAILED in SSL_read\n");
-                                        goto err;
-                                } else {
-                                        if (debug)
-                                                printf("server read %d\n", i);
-                                        sr_num -= i;
-                                        if (cw_num > 0) {
-                                                c_write = 1;
-                                                c_w = 1;
-                                        }
-                                        if (sr_num <= 0) {
-                                                s_write = 1;
-                                                s_w = 1;
-                                                c_write = 0;
-                                        }
-                                }
-                        } else {
-                                j = (sw_num > (long)sizeof(sbuf)) ?
-                                    (int)sizeof(sbuf) : (int)sw_num;
-                                i = BIO_write(s_bio, sbuf, j);
-                                if (i < 0) {
-                                        s_r = 0;
-                                        s_w = 0;
-                                        if (BIO_should_retry(s_bio)) {
-                                                if (BIO_should_read(s_bio))
-                                                        s_r = 1;
-                                                if (BIO_should_write(s_bio))
-                                                        s_w = 1;
-                                        } else {
-                                                fprintf(stderr, "ERROR in SERVER\n");
-                                                ERR_print_errors(bio_err);
-                                                goto err;
-                                        }
-                                } else if (i == 0) {
-                                        ERR_print_errors(bio_err);
-                                        fprintf(stderr, "SSL SERVER STARTUP FAILED in SSL_write\n");
-                                        goto err;
-                                } else {
-                                        if (debug)
-                                                printf("server wrote %d\n", i);
-                                        sw_num -= i;
-                                        s_write = 0;
-                                        c_r = 1;
-                                        if (sw_num <= 0)
-                                                done |= S_DONE;
-                                }
-                        }
-                }
-
-                if ((done & S_DONE) && (done & C_DONE))
-                        break;
-        }
-
-        if (verbose)
-                print_details(c_ssl, "DONE: ");
-
-        if (verify_alpn(c_ssl, s_ssl) < 0) {
-                ret = 1;
-                goto err;
-        }
-
-        ret = 0;
-err:
-        /* We have to set the BIO's to NULL otherwise they will be
-         * free()ed twice.  Once when th s_ssl is SSL_free()ed and
-         * again when c_ssl is SSL_free()ed.
-         * This is a hack required because s_ssl and c_ssl are sharing the same
-         * BIO structure and SSL_set_bio() and SSL_free() automatically
-         * BIO_free non NULL entries.
-         * You should not normally do this or be required to do this */
-        if (s_ssl != NULL) {
-                s_ssl->rbio = NULL;
-                s_ssl->wbio = NULL;
-        }
-        if (c_ssl != NULL) {
-                c_ssl->rbio = NULL;
-                c_ssl->wbio = NULL;
-        }
-
-        BIO_free(c_to_s);
-        BIO_free(s_to_c);
-        BIO_free_all(c_bio);
-        BIO_free_all(s_bio);
-
-        return (ret);
-}
-
-static int
-get_proxy_auth_ex_data_idx(void)
-{
-        static volatile int idx = -1;
-        if (idx < 0) {
-                CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX);
-                if (idx < 0) {
-                        idx = X509_STORE_CTX_get_ex_new_index(0,
-                            "SSLtest for verify callback", NULL, NULL, NULL);
-                }
-                CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
-        }
-        return idx;
-}
-
-static int
-verify_callback(int ok, X509_STORE_CTX *ctx)
-{
-        char *s, buf[256];
-
-        s = X509_NAME_oneline(X509_get_subject_name(ctx->current_cert), buf,
-            sizeof buf);
-        if (s != NULL) {
-                if (ok)
-                        fprintf(stderr, "depth=%d %s\n",
-                            ctx->error_depth, buf);
-                else {
-                        fprintf(stderr, "depth=%d error=%d %s\n",
-                            ctx->error_depth, ctx->error, buf);
-                }
-        }
-
-        if (ok == 0) {
-                fprintf(stderr, "Error string: %s\n",
-                    X509_verify_cert_error_string(ctx->error));
-                switch (ctx->error) {
-                case X509_V_ERR_CERT_NOT_YET_VALID:
-                case X509_V_ERR_CERT_HAS_EXPIRED:
-                case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
-                        fprintf(stderr, "  ... ignored.\n");
-                        ok = 1;
-                }
-        }
-
-        if (ok == 1) {
-                X509 *xs = ctx->current_cert;
-#if 0
-                X509 *xi = ctx->current_issuer;
-#endif
-
-                if (xs->ex_flags & EXFLAG_PROXY) {
-                        unsigned int *letters =
-                            X509_STORE_CTX_get_ex_data(ctx,
-                            get_proxy_auth_ex_data_idx());
-
-                        if (letters) {
-                                int found_any = 0;
-                                int i;
-                                PROXY_CERT_INFO_EXTENSION *pci =
-                                    X509_get_ext_d2i(xs, NID_proxyCertInfo,
-                                    NULL, NULL);
-
-                                switch (OBJ_obj2nid(pci->proxyPolicy->policyLanguage)) {
-                                case NID_Independent:
-                                        /* Completely meaningless in this
-                                           program, as there's no way to
-                                           grant explicit rights to a
-                                           specific PrC.  Basically, using
-                                           id-ppl-Independent is the perfect
-                                           way to grant no rights at all. */
-                                        fprintf(stderr, "  Independent proxy certificate");
-                                        for (i = 0; i < 26; i++)
-                                                letters[i] = 0;
-                                        break;
-                                case NID_id_ppl_inheritAll:
-                                        /* This is basically a NOP, we
-                                           simply let the current rights
-                                           stand as they are. */
-                                        fprintf(stderr, "  Proxy certificate inherits all");
-                                        break;
-                                default:
-                                        s = (char *)
-                                        pci->proxyPolicy->policy->data;
-                                        i = pci->proxyPolicy->policy->length;
-
-                                        /* The algorithm works as follows:
-                                           it is assumed that previous
-                                           iterations or the initial granted
-                                           rights has already set some elements
-                                           of `letters'.  What we need to do is
-                                           to clear those that weren't granted
-                                           by the current PrC as well.  The
-                                           easiest way to do this is to add 1
-                                           to all the elements whose letters
-                                           are given with the current policy.
-                                           That way, all elements that are set
-                                           by the current policy and were
-                                           already set by earlier policies and
-                                           through the original grant of rights
-                                           will get the value 2 or higher.
-                                           The last thing to do is to sweep
-                                           through `letters' and keep the
-                                           elements having the value 2 as set,
-                                           and clear all the others. */
-
-                                        fprintf(stderr, "  Certificate proxy rights = %*.*s", i, i, s);
-                                        while (i-- > 0) {
-                                                int c = *s++;
-                                                if (isascii(c) && isalpha(c)) {
-                                                        if (islower(c))
-                                                                c = toupper(c);
-                                                        letters[c - 'A']++;
-                                                }
-                                        }
-                                        for (i = 0; i < 26; i++)
-                                                if (letters[i] < 2)
-                                                        letters[i] = 0;
-                                        else
-                                                letters[i] = 1;
-                                }
-
-                                found_any = 0;
-                                fprintf(stderr, ", resulting proxy rights = ");
-                                for (i = 0; i < 26; i++)
-                                        if (letters[i]) {
-                                        fprintf(stderr, "%c", i + 'A');
-                                        found_any = 1;
-                                }
-                                if (!found_any)
-                                        fprintf(stderr, "none");
-                                fprintf(stderr, "\n");
-
-                                PROXY_CERT_INFO_EXTENSION_free(pci);
-                        }
-                }
-        }
-
-        return (ok);
-}
-
-static void
-process_proxy_debug(int indent, const char *format, ...)
-{
-        static const char indentation[] =
-            ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-            ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"; /* That's 80 > */
-        char my_format[256];
-        va_list args;
-
-        (void) snprintf(my_format, sizeof(my_format), "%*.*s %s",
-            indent, indent, indentation, format);
-
-        va_start(args, format);
-        vfprintf(stderr, my_format, args);
-        va_end(args);
-}
-/* Priority levels:
-   0    [!]var, ()
-   1    & ^
-   2    |
-*/
-static int process_proxy_cond_adders(unsigned int letters[26],
-    const char *cond, const char **cond_end, int *pos, int indent);
-
-static int
-process_proxy_cond_val(unsigned int letters[26], const char *cond,
-    const char **cond_end, int *pos, int indent)
-{
-        int c;
-        int ok = 1;
-        int negate = 0;
-
-        while (isspace((int)*cond)) {
-                cond++;
-                (*pos)++;
-        }
-        c = *cond;
-
-        if (debug)
-                process_proxy_debug(indent,
-                    "Start process_proxy_cond_val at position %d: %s\n",
-                    *pos, cond);
-
-        while (c == '!') {
-                negate = !negate;
-                cond++;
-                (*pos)++;
-                while (isspace((int)*cond)) {
-                        cond++;
-                        (*pos)++;
-                }
-                c = *cond;
-        }
-
-        if (c == '(') {
-                cond++;
-                (*pos)++;
-                ok = process_proxy_cond_adders(letters, cond, cond_end, pos,
-                    indent + 1);
-                cond = *cond_end;
-                if (ok < 0)
-                        goto end;
-                while (isspace((int)*cond)) {
-                        cond++;
-                        (*pos)++;
-                }
-                c = *cond;
-                if (c != ')') {
-                        fprintf(stderr,
-                            "Weird condition character in position %d: "
-                            "%c\n", *pos, c);
-                        ok = -1;
-                        goto end;
-                }
-                cond++;
-                (*pos)++;
-        } else if (isascii(c) && isalpha(c)) {
-                if (islower(c))
-                        c = toupper(c);
-                ok = letters[c - 'A'];
-                cond++;
-                (*pos)++;
-        } else {
-                fprintf(stderr,
-                    "Weird condition character in position %d: "
-                    "%c\n", *pos, c);
-                ok = -1;
-                goto end;
-        }
-end:
-        *cond_end = cond;
-        if (ok >= 0 && negate)
-                ok = !ok;
-
-        if (debug)
-                process_proxy_debug(indent,
-                    "End process_proxy_cond_val at position %d: %s, returning %d\n",
-                    *pos, cond, ok);
-
-        return ok;
-}
-
-static int
-process_proxy_cond_multipliers(unsigned int letters[26], const char *cond,
-    const char **cond_end, int *pos, int indent)
-{
-        int ok;
-        char c;
-
-        if (debug)
-                process_proxy_debug(indent,
-                    "Start process_proxy_cond_multipliers at position %d: %s\n",
-                    *pos, cond);
-
-        ok = process_proxy_cond_val(letters, cond, cond_end, pos, indent + 1);
-        cond = *cond_end;
-        if (ok < 0)
-                goto end;
-
-        while (ok >= 0) {
-                while (isspace((int)*cond)) {
-                        cond++;
-                        (*pos)++;
-                }
-                c = *cond;
-
-                switch (c) {
-                case '&':
-                case '^':
-                        {
-                                int save_ok = ok;
-
-                                cond++;
-                                (*pos)++;
-                                ok = process_proxy_cond_val(letters,
-                                    cond, cond_end, pos, indent + 1);
-                                cond = *cond_end;
-                                if (ok < 0)
-                                        break;
-
-                                switch (c) {
-                                case '&':
-                                        ok &= save_ok;
-                                        break;
-                                case '^':
-                                        ok ^= save_ok;
-                                        break;
-                                default:
-                                        fprintf(stderr, "SOMETHING IS SERIOUSLY WRONG!"
-                                            " STOPPING\n");
-                                        exit(1);
-                                }
-                        }
-                        break;
-                default:
-                        goto end;
-                }
-        }
-end:
-        if (debug)
-                process_proxy_debug(indent,
-                    "End process_proxy_cond_multipliers at position %d: %s, "
-                    "returning %d\n",
-                    *pos, cond, ok);
-
-        *cond_end = cond;
-        return ok;
-}
-
-static int
-process_proxy_cond_adders(unsigned int letters[26], const char *cond,
-    const char **cond_end, int *pos, int indent)
-{
-        int ok;
-        char c;
-
-        if (debug)
-                process_proxy_debug(indent,
-                    "Start process_proxy_cond_adders at position %d: %s\n",
-                    *pos, cond);
-
-        ok = process_proxy_cond_multipliers(letters, cond, cond_end, pos,
-            indent + 1);
-        cond = *cond_end;
-        if (ok < 0)
-                goto end;
-
-        while (ok >= 0) {
-                while (isspace((int)*cond)) {
-                        cond++;
-                        (*pos)++;
-                }
-                c = *cond;
-
-                switch (c) {
-                case '|':
-                        {
-                                int save_ok = ok;
-
-                                cond++;
-                                (*pos)++;
-                                ok = process_proxy_cond_multipliers(letters,
-                                    cond, cond_end, pos, indent + 1);
-                                cond = *cond_end;
-                                if (ok < 0)
-                                        break;
-
-                                switch (c) {
-                                case '|':
-                                        ok |= save_ok;
-                                        break;
-                                default:
-                                        fprintf(stderr, "SOMETHING IS SERIOUSLY WRONG!"
-                                            " STOPPING\n");
-                                        exit(1);
-                                }
-                        }
-                        break;
-                default:
-                        goto end;
-                }
-        }
-end:
-        if (debug)
-                process_proxy_debug(indent,
-                    "End process_proxy_cond_adders at position %d: %s, returning %d\n",
-                    *pos, cond, ok);
-
-        *cond_end = cond;
-        return ok;
-}
-
-static int
-process_proxy_cond(unsigned int letters[26], const char *cond,
-    const char **cond_end)
-{
-        int pos = 1;
-        return process_proxy_cond_adders(letters, cond, cond_end, &pos, 1);
-}
-
-static int
-app_verify_callback(X509_STORE_CTX *ctx, void *arg)
-{
-        int ok = 1;
-        struct app_verify_arg *cb_arg = arg;
-        unsigned int letters[26]; /* only used with proxy_auth */
-
-        if (cb_arg->app_verify) {
-                char *s = NULL, buf[256];
-
-                fprintf(stderr, "In app_verify_callback, allowing cert. ");
-                fprintf(stderr, "Arg is: %s\n", cb_arg->string);
-                fprintf(stderr, "Finished printing do we have a context? 0x%p a cert? 0x%p\n",
-                    (void *)ctx, (void *)ctx->cert);
-                if (ctx->cert)
-                        s = X509_NAME_oneline(X509_get_subject_name(ctx->cert), buf, 256);
-                if (s != NULL) {
-                        fprintf(stderr, "cert depth=%d %s\n", ctx->error_depth, buf);
-                }
-                return (1);
-        }
-        if (cb_arg->proxy_auth) {
-                int found_any = 0, i;
-                char *sp;
-
-                for (i = 0; i < 26; i++)
-                        letters[i] = 0;
-                for (sp = cb_arg->proxy_auth; *sp; sp++) {
-                        int c = *sp;
-                        if (isascii(c) && isalpha(c)) {
-                                if (islower(c))
-                                        c = toupper(c);
-                                letters[c - 'A'] = 1;
-                        }
-                }
-
-                fprintf(stderr, "  Initial proxy rights = ");
-                for (i = 0; i < 26; i++)
-                        if (letters[i]) {
-                        fprintf(stderr, "%c", i + 'A');
-                        found_any = 1;
-                }
-                if (!found_any)
-                        fprintf(stderr, "none");
-                fprintf(stderr, "\n");
-
-                X509_STORE_CTX_set_ex_data(ctx,
-                    get_proxy_auth_ex_data_idx(), letters);
-        }
-        if (cb_arg->allow_proxy_certs) {
-                X509_STORE_CTX_set_flags(ctx, X509_V_FLAG_ALLOW_PROXY_CERTS);
-        }
-
-        ok = X509_verify_cert(ctx);
-
-        if (cb_arg->proxy_auth) {
-                if (ok > 0) {
-                        const char *cond_end = NULL;
-
-                        ok = process_proxy_cond(letters,
-                            cb_arg->proxy_cond, &cond_end);
-
-                        if (ok < 0)
-                                exit(3);
-                        if (*cond_end) {
-                                fprintf(stderr, "Stopped processing condition before it's end.\n");
-                                ok = 0;
-                        }
-                        if (!ok)
-                                fprintf(stderr, "Proxy rights check with condition '%s' proved invalid\n",
-                                    cb_arg->proxy_cond);
-                        else
-                                fprintf(stderr, "Proxy rights check with condition '%s' proved valid\n",
-                                    cb_arg->proxy_cond);
-                }
-        }
-        return (ok);
-}
-
-static RSA *rsa_tmp = NULL;
-
-static RSA *
-tmp_rsa_cb(SSL *s, int is_export, int keylength)
-{
-        BIGNUM *bn = NULL;
-        if (rsa_tmp == NULL) {
-                bn = BN_new();
-                rsa_tmp = RSA_new();
-                if (!bn || !rsa_tmp || !BN_set_word(bn, RSA_F4)) {
-                        BIO_printf(bio_err, "Memory error...");
-                        goto end;
-                }
-                BIO_printf(bio_err, "Generating temp (%d bit) RSA key...", keylength);
-                (void)BIO_flush(bio_err);
-                if (!RSA_generate_key_ex(rsa_tmp, keylength, bn, NULL)) {
-                        BIO_printf(bio_err, "Error generating key.");
-                        RSA_free(rsa_tmp);
-                        rsa_tmp = NULL;
-                }
-end:
-                BIO_printf(bio_err, "\n");
-                (void)BIO_flush(bio_err);
-        }
-        if (bn)
-                BN_free(bn);
-        return (rsa_tmp);
-}
-
-static void
-free_tmp_rsa(void)
-{
-        if (rsa_tmp != NULL) {
-                RSA_free(rsa_tmp);
-                rsa_tmp = NULL;
-        }
-}
-
-/* These DH parameters have been generated as follows:
- *    $ openssl dhparam -C -noout 1024
- *    $ openssl dhparam -C -noout -dsaparam 1024
- * (The second function has been renamed to avoid name conflicts.)
- */
-static DH *
-get_dh1024()
-{
-        static unsigned char dh1024_p[] = {
-                0xF8, 0x81, 0x89, 0x7D, 0x14, 0x24, 0xC5, 0xD1, 0xE6, 0xF7, 0xBF, 0x3A,
-                0xE4, 0x90, 0xF4, 0xFC, 0x73, 0xFB, 0x34, 0xB5, 0xFA, 0x4C, 0x56, 0xA2,
-                0xEA, 0xA7, 0xE9, 0xC0, 0xC0, 0xCE, 0x89, 0xE1, 0xFA, 0x63, 0x3F, 0xB0,
-                0x6B, 0x32, 0x66, 0xF1, 0xD1, 0x7B, 0xB0, 0x00, 0x8F, 0xCA, 0x87, 0xC2,
-                0xAE, 0x98, 0x89, 0x26, 0x17, 0xC2, 0x05, 0xD2, 0xEC, 0x08, 0xD0, 0x8C,
-                0xFF, 0x17, 0x52, 0x8C, 0xC5, 0x07, 0x93, 0x03, 0xB1, 0xF6, 0x2F, 0xB8,
-                0x1C, 0x52, 0x47, 0x27, 0x1B, 0xDB, 0xD1, 0x8D, 0x9D, 0x69, 0x1D, 0x52,
-                0x4B, 0x32, 0x81, 0xAA, 0x7F, 0x00, 0xC8, 0xDC, 0xE6, 0xD9, 0xCC, 0xC1,
-                0x11, 0x2D, 0x37, 0x34, 0x6C, 0xEA, 0x02, 0x97, 0x4B, 0x0E, 0xBB, 0xB1,
-                0x71, 0x33, 0x09, 0x15, 0xFD, 0xDD, 0x23, 0x87, 0x07, 0x5E, 0x89, 0xAB,
-                0x6B, 0x7C, 0x5F, 0xEC, 0xA6, 0x24, 0xDC, 0x53,
-        };
-        static unsigned char dh1024_g[] = {
-                0x02,
-        };
-        DH *dh;
-
-        if ((dh = DH_new()) == NULL)
-                return (NULL);
-        dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
-        dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
-        if ((dh->p == NULL) || (dh->g == NULL)) {
-                DH_free(dh);
-                return (NULL);
-        }
-        return (dh);
-}
-
-static DH *
-get_dh1024dsa()
-{
-        static unsigned char dh1024_p[] = {
-                0xC8, 0x00, 0xF7, 0x08, 0x07, 0x89, 0x4D, 0x90, 0x53, 0xF3, 0xD5, 0x00,
-                0x21, 0x1B, 0xF7, 0x31, 0xA6, 0xA2, 0xDA, 0x23, 0x9A, 0xC7, 0x87, 0x19,
-                0x3B, 0x47, 0xB6, 0x8C, 0x04, 0x6F, 0xFF, 0xC6, 0x9B, 0xB8, 0x65, 0xD2,
-                0xC2, 0x5F, 0x31, 0x83, 0x4A, 0xA7, 0x5F, 0x2F, 0x88, 0x38, 0xB6, 0x55,
-                0xCF, 0xD9, 0x87, 0x6D, 0x6F, 0x9F, 0xDA, 0xAC, 0xA6, 0x48, 0xAF, 0xFC,
-                0x33, 0x84, 0x37, 0x5B, 0x82, 0x4A, 0x31, 0x5D, 0xE7, 0xBD, 0x52, 0x97,
-                0xA1, 0x77, 0xBF, 0x10, 0x9E, 0x37, 0xEA, 0x64, 0xFA, 0xCA, 0x28, 0x8D,
-                0x9D, 0x3B, 0xD2, 0x6E, 0x09, 0x5C, 0x68, 0xC7, 0x45, 0x90, 0xFD, 0xBB,
-                0x70, 0xC9, 0x3A, 0xBB, 0xDF, 0xD4, 0x21, 0x0F, 0xC4, 0x6A, 0x3C, 0xF6,
-                0x61, 0xCF, 0x3F, 0xD6, 0x13, 0xF1, 0x5F, 0xBC, 0xCF, 0xBC, 0x26, 0x9E,
-                0xBC, 0x0B, 0xBD, 0xAB, 0x5D, 0xC9, 0x54, 0x39,
-        };
-        static unsigned char dh1024_g[] = {
-                0x3B, 0x40, 0x86, 0xE7, 0xF3, 0x6C, 0xDE, 0x67, 0x1C, 0xCC, 0x80, 0x05,
-                0x5A, 0xDF, 0xFE, 0xBD, 0x20, 0x27, 0x74, 0x6C, 0x24, 0xC9, 0x03, 0xF3,
-                0xE1, 0x8D, 0xC3, 0x7D, 0x98, 0x27, 0x40, 0x08, 0xB8, 0x8C, 0x6A, 0xE9,
-                0xBB, 0x1A, 0x3A, 0xD6, 0x86, 0x83, 0x5E, 0x72, 0x41, 0xCE, 0x85, 0x3C,
-                0xD2, 0xB3, 0xFC, 0x13, 0xCE, 0x37, 0x81, 0x9E, 0x4C, 0x1C, 0x7B, 0x65,
-                0xD3, 0xE6, 0xA6, 0x00, 0xF5, 0x5A, 0x95, 0x43, 0x5E, 0x81, 0xCF, 0x60,
-                0xA2, 0x23, 0xFC, 0x36, 0xA7, 0x5D, 0x7A, 0x4C, 0x06, 0x91, 0x6E, 0xF6,
-                0x57, 0xEE, 0x36, 0xCB, 0x06, 0xEA, 0xF5, 0x3D, 0x95, 0x49, 0xCB, 0xA7,
-                0xDD, 0x81, 0xDF, 0x80, 0x09, 0x4A, 0x97, 0x4D, 0xA8, 0x22, 0x72, 0xA1,
-                0x7F, 0xC4, 0x70, 0x56, 0x70, 0xE8, 0x20, 0x10, 0x18, 0x8F, 0x2E, 0x60,
-                0x07, 0xE7, 0x68, 0x1A, 0x82, 0x5D, 0x32, 0xA2,
-        };
-        DH *dh;
-
-        if ((dh = DH_new()) == NULL)
-                return (NULL);
-        dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
-        dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
-        if ((dh->p == NULL) || (dh->g == NULL)) {
-                DH_free(dh);
-                return (NULL);
-        }
-        dh->length = 160;
-        return (dh);
-}
-
-static int
-do_test_cipherlist(void)
-{
-        int i = 0;
-        const SSL_METHOD *meth;
-        const SSL_CIPHER *ci, *tci = NULL;
-
-        fprintf(stderr, "testing TLSv1 cipher list order: ");
-        meth = TLSv1_method();
-        tci = NULL;
-        while ((ci = meth->get_cipher(i++)) != NULL) {
-                if (tci != NULL) {
-                        if (ci->id >= tci->id) {
-                                fprintf(stderr,
-                                    "failed %lx vs. %lx\n", ci->id, tci->id);
-                                return 0;
-                        }
-                }
-                tci = ci;
-        }
-        fprintf(stderr, "ok\n");
-
-        return 1;
-}
diff --git a/src/regress/lib/libssl/ssl/testssl b/src/regress/lib/libssl/ssl/testssl
deleted file mode 100644
index 3563d13607..0000000000
--- a/src/regress/lib/libssl/ssl/testssl
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-key="$1"
-cert="$2"
-CA="-CAfile $3"
-ssltest="${4-./ssltest} -key $key -cert $cert -c_key $key -c_cert $cert"
-openssl=${5-openssl}
-extra="$6"
-
-$openssl version || exit 1
-
-if $openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then
-  dsa_cert=YES
-else
-  dsa_cert=NO
-fi
-
-#############################################################################
-
-echo test sslv2/sslv3
-$ssltest $extra || exit 1
-
-echo test sslv2/sslv3 with server authentication
-$ssltest -server_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with client authentication
-$ssltest -client_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication
-$ssltest -server_auth -client_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 via BIO pair
-$ssltest $extra || exit 1
-
-if [ $dsa_cert = NO ]; then
-  echo 'test sslv2/sslv3 w/o (EC)DHE via BIO pair'
-  $ssltest -bio_pair -no_dhe -no_ecdhe $extra || exit 1
-fi
-
-echo test sslv2/sslv3 with 1024bit DHE via BIO pair
-$ssltest -bio_pair -dhe1024dsa -v $extra || exit 1
-
-echo test sslv2/sslv3 with server authentication
-$ssltest -bio_pair -server_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with client authentication via BIO pair
-$ssltest -bio_pair -client_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication via BIO pair
-$ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication via BIO pair and app verify
-$ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
-
-echo "Testing ciphersuites"
-for protocol in TLSv1.2; do
-  echo "Testing ciphersuites for $protocol"
-  for cipher in `$openssl ciphers "$protocol+aRSA" | tr ':' ' '`; do
-    echo "Testing $cipher"
-    $ssltest -cipher $cipher
-    if [ $? -ne 0 ] ; then
-      echo "Failed $cipher"
-      exit 1
-    fi
-  done
-done
-
-#############################################################################
-
-if $openssl no-dh; then
-  echo skipping anonymous DH tests
-else
-  echo test tls1 with 1024bit anonymous DH, multiple handshakes
-  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
-fi
-
-#if $openssl no-rsa; then
-#  echo skipping RSA tests
-#else
-#  echo 'test tls1 with 1024bit RSA, no (EC)DHE, multiple handshakes'
-#  ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -no_ecdhe -num 10 -f -time $extra || exit 1
-#
-#  if $openssl no-dh; then
-#    echo skipping RSA+DHE tests
-#  else
-#    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
-#    ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
-#  fi
-#fi
-
-#
-# DTLS tests
-#
-
-echo test dtlsv1
-$ssltest -dtls1 $extra || exit 1
-
-echo test dtlsv1 with server authentication
-$ssltest -dtls1 -server_auth $CA $extra || exit 1
-
-echo test dtlsv1 with client authentication
-$ssltest -dtls1 -client_auth $CA $extra || exit 1
-
-echo test dtlsv1 with both client and server authentication
-$ssltest -dtls1 -server_auth -client_auth $CA $extra || exit 1
-
-echo "Testing DTLS ciphersuites"
-for protocol in SSLv3; do
-  echo "Testing ciphersuites for $protocol"
-  for cipher in `$openssl ciphers "RSA+$protocol" | tr ':' '\n' |
-    grep -v RC4`; do
-    echo "Testing $cipher"
-    $ssltest -cipher $cipher -dtls1
-    if [ $? -ne 0 ] ; then
-      echo "Failed $cipher"
-      exit 1
-    fi
-  done
-done
-
-#
-# ALPN tests
-#
-echo "Testing ALPN..."
-$ssltest -bio_pair -tls1 -alpn_client foo -alpn_server bar || exit 1
-$ssltest -bio_pair -tls1 -alpn_client foo -alpn_server foo \
-  -alpn_expected foo || exit 1
-$ssltest -bio_pair -tls1 -alpn_client foo,bar -alpn_server foo \
-  -alpn_expected foo || exit 1
-$ssltest -bio_pair -tls1 -alpn_client bar,foo -alpn_server foo \
-  -alpn_expected foo || exit 1
-$ssltest -bio_pair -tls1 -alpn_client bar,foo -alpn_server foo,bar \
-  -alpn_expected foo || exit 1
-$ssltest -bio_pair -tls1 -alpn_client bar,foo -alpn_server bar,foo \
-  -alpn_expected bar || exit 1
-$ssltest -bio_pair -tls1 -alpn_client foo,bar -alpn_server bar,foo \
-  -alpn_expected bar || exit 1
-$ssltest -bio_pair -tls1 -alpn_client baz -alpn_server bar,foo || exit 1
diff --git a/src/regress/lib/libssl/tlsext/Makefile b/src/regress/lib/libssl/tlsext/Makefile
deleted file mode 100644
index 48b5bc1e25..0000000000
--- a/src/regress/lib/libssl/tlsext/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2017/07/16 18:18:10 jsing Exp $
-
-PROG=   tlsexttest
-LDADD=  ${SSL_INT} -lcrypto
-DPADD=  ${LIBCRYPTO} ${LIBSSL}
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c
deleted file mode 100644
index b50736d802..0000000000
--- a/src/regress/lib/libssl/tlsext/tlsexttest.c
+++ /dev/null
@@ -1,2981 +0,0 @@
-/* $OpenBSD: tlsexttest.c,v 1.19 2018/11/06 01:19:35 jsing Exp $ */
-/*
- * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
- * Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-
-#include "ssl_locl.h"
-
-#include "bytestring.h"
-#include "ssl_tlsext.h"
-
-static void
-hexdump(const unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 1; i <= len; i++)
-                fprintf(stderr, " 0x%02hhx,%s", buf[i - 1], i % 8 ? "" : "\n");
-
-        fprintf(stderr, "\n");
-}
-
-static void
-hexdump2(const uint16_t *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 1; i <= len / 2; i++)
-                fprintf(stderr, " 0x%04hx,%s", buf[i - 1], i % 8 ? "" : "\n");
-
-        fprintf(stderr, "\n");
-}
-
-static void
-compare_data(const uint8_t *recv, size_t recv_len, const uint8_t *expect,
-    size_t expect_len)
-{
-        fprintf(stderr, "received:\n");
-        hexdump(recv, recv_len);
-
-        fprintf(stderr, "test data:\n");
-        hexdump(expect, expect_len);
-}
-
-static void
-compare_data2(const uint16_t *recv, size_t recv_len, const uint16_t *expect,
-    size_t expect_len)
-{
-        fprintf(stderr, "received:\n");
-        hexdump2(recv, recv_len);
-
-        fprintf(stderr, "test data:\n");
-        hexdump2(expect, expect_len);
-}
-
-#define FAIL(msg, ...)                                          \
-do {                                                            \
-        fprintf(stderr, "[%s:%d] FAIL: ", __FILE__, __LINE__);  \
-        fprintf(stderr, msg, ##__VA_ARGS__);                    \
-} while(0)
-
-/*
- * Supported Application-Layer Protocol Negotiation - RFC 7301
- *
- * There are already extensive unit tests for this so this just
- * tests the state info.
- */
-
-const uint8_t tlsext_alpn_multiple_protos_val[] = {
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31,
-        /* opaque ProtocolName<1..2^8-1> -- 'stun.nat' */
-        0x09, /* len */
-        0x73, 0x74, 0x75, 0x6e, 0x2e, 0x74, 0x75, 0x72, 0x6e
-};
-
-const uint8_t tlsext_alpn_multiple_protos[] = {
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x13, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31,
-        /* opaque ProtocolName<1..2^8-1> -- 'stun.nat' */
-        0x09, /* len */
-        0x73, 0x74, 0x75, 0x6e, 0x2e, 0x74, 0x75, 0x72, 0x6e
-};
-
-const uint8_t tlsext_alpn_single_proto_val[] = {
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31
-};
-
-const uint8_t tlsext_alpn_single_proto_name[] = {
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31 /* 'http/1.1' */
-};
-
-const uint8_t tlsext_alpn_single_proto[] = {
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x09, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31
-};
-
-static int
-test_tlsext_alpn_clienthello(void)
-{
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        uint8_t *data = NULL;
-        CBB cbb;
-        CBS cbs;
-        int failure, alert;
-        size_t dlen;
-
-        CBB_init(&cbb, 0);
-
-        failure = 1;
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        /* By default, we don't need this */
-        if (tlsext_alpn_clienthello_needs(ssl)) {
-                FAIL("clienthello should not need ALPN by default");
-                goto err;
-        }
-
-        /*
-         * Prereqs:
-         * 1) Set s->internal->alpn_client_proto_list
-         *    - Using SSL_set_alpn_protos()
-         * 2) We have not finished or renegotiated.
-         *    - S3I(s)->tmp.finish_md_len == 0
-         */
-        if (SSL_set_alpn_protos(ssl, tlsext_alpn_single_proto_val,
-            sizeof(tlsext_alpn_single_proto_val)) != 0) {
-                FAIL("should be able to set ALPN to http/1.1");
-                goto err;
-        }
-        if (!tlsext_alpn_clienthello_needs(ssl)) {
-                FAIL("clienthello should need ALPN by now");
-                goto err;
-        }
-
-        /* Make sure we can build the clienthello with a single proto. */
-
-        if (!tlsext_alpn_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build ALPN\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_alpn_single_proto)) {
-                FAIL("got clienthello ALPN with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_alpn_single_proto));
-                compare_data(data, dlen, tlsext_alpn_single_proto,
-                    sizeof(tlsext_alpn_single_proto));
-                goto err;
-        }
-        if (memcmp(data, tlsext_alpn_single_proto, dlen) != 0) {
-                FAIL("clienthello ALPN differs:\n");
-                compare_data(data, dlen, tlsext_alpn_single_proto,
-                    sizeof(tlsext_alpn_single_proto));
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        /* Make sure we can parse the single proto. */
-
-        CBS_init(&cbs, tlsext_alpn_single_proto,
-            sizeof(tlsext_alpn_single_proto));
-        if (!tlsext_alpn_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse ALPN");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (ssl->internal->alpn_client_proto_list_len !=
-            sizeof(tlsext_alpn_single_proto_val)) {
-                FAIL("got clienthello ALPN with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_alpn_single_proto_val));
-                compare_data(ssl->internal->alpn_client_proto_list,
-                    ssl->internal->alpn_client_proto_list_len,
-                    tlsext_alpn_single_proto_val,
-                    sizeof(tlsext_alpn_single_proto_val));
-                goto err;
-        }
-        if (memcmp(ssl->internal->alpn_client_proto_list,
-            tlsext_alpn_single_proto_val,
-            sizeof(tlsext_alpn_single_proto_val)) != 0) {
-                FAIL("clienthello ALPN differs:\n");
-                compare_data(data, dlen, tlsext_alpn_single_proto_val,
-                    sizeof(tlsext_alpn_single_proto_val));
-                goto err;
-        }
-
-        /* Make sure we can build the clienthello with multiple entries. */
-
-        if (SSL_set_alpn_protos(ssl, tlsext_alpn_multiple_protos_val,
-            sizeof(tlsext_alpn_multiple_protos_val)) != 0) {
-                FAIL("should be able to set ALPN to http/1.1");
-                goto err;
-        }
-        if (!tlsext_alpn_clienthello_needs(ssl)) {
-                FAIL("clienthello should need ALPN by now");
-                goto err;
-        }
-
-        if (!tlsext_alpn_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build ALPN\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_alpn_multiple_protos)) {
-                FAIL("got clienthello ALPN with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_alpn_multiple_protos));
-                compare_data(data, dlen, tlsext_alpn_multiple_protos,
-                    sizeof(tlsext_alpn_multiple_protos));
-                goto err;
-        }
-        if (memcmp(data, tlsext_alpn_multiple_protos, dlen) != 0) {
-                FAIL("clienthello ALPN differs:\n");
-                compare_data(data, dlen, tlsext_alpn_multiple_protos,
-                    sizeof(tlsext_alpn_multiple_protos));
-                goto err;
-        }
-
-        /* Make sure we can parse multiple protos */
-
-        CBS_init(&cbs, tlsext_alpn_multiple_protos,
-            sizeof(tlsext_alpn_multiple_protos));
-        if (!tlsext_alpn_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse ALPN");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (ssl->internal->alpn_client_proto_list_len !=
-            sizeof(tlsext_alpn_multiple_protos_val)) {
-                FAIL("got clienthello ALPN with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_alpn_multiple_protos_val));
-                compare_data(ssl->internal->alpn_client_proto_list,
-                    ssl->internal->alpn_client_proto_list_len,
-                    tlsext_alpn_multiple_protos_val,
-                    sizeof(tlsext_alpn_multiple_protos_val));
-                goto err;
-        }
-        if (memcmp(ssl->internal->alpn_client_proto_list,
-            tlsext_alpn_multiple_protos_val,
-            sizeof(tlsext_alpn_multiple_protos_val)) != 0) {
-                FAIL("clienthello ALPN differs:\n");
-                compare_data(data, dlen, tlsext_alpn_multiple_protos_val,
-                    sizeof(tlsext_alpn_multiple_protos_val));
-                goto err;
-        }
-
-        /* Make sure we can remove the list and avoid ALPN */
-
-        free(ssl->internal->alpn_client_proto_list);
-        ssl->internal->alpn_client_proto_list = NULL;
-        ssl->internal->alpn_client_proto_list_len = 0;
-
-        if (tlsext_alpn_clienthello_needs(ssl)) {
-                FAIL("clienthello should need ALPN by default");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-static int
-test_tlsext_alpn_serverhello(void)
-{
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        uint8_t *data = NULL;
-        CBB cbb;
-        CBS cbs;
-        int failure, alert;
-        size_t dlen;
-
-        CBB_init(&cbb, 0);
-
-        failure = 1;
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_server_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        /* By default, ALPN isn't needed. */
-        if (tlsext_alpn_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need ALPN by default\n");
-                goto err;
-        }
-
-        /*
-         * The server has a single ALPN selection which is set by
-         * SSL_CTX_set_alpn_select_cb() and calls SSL_select_next_proto().
-         *
-         * This will be a plain name and separate length.
-         */
-        if ((S3I(ssl)->alpn_selected = malloc(sizeof(tlsext_alpn_single_proto_name))) == NULL) {
-                errx(1, "failed to malloc");
-        }
-        memcpy(S3I(ssl)->alpn_selected, tlsext_alpn_single_proto_name,
-            sizeof(tlsext_alpn_single_proto_name));
-        S3I(ssl)->alpn_selected_len = sizeof(tlsext_alpn_single_proto_name);
-
-        if (!tlsext_alpn_serverhello_needs(ssl)) {
-                FAIL("serverhello should need ALPN after a protocol is selected\n");
-                goto err;
-        }
-
-        /* Make sure we can build a serverhello with one protocol */
-
-        if (!tlsext_alpn_serverhello_build(ssl, &cbb)) {
-                FAIL("serverhello should be able to build a response");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_alpn_single_proto)) {
-                FAIL("got clienthello ALPN with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_alpn_single_proto));
-                compare_data(data, dlen, tlsext_alpn_single_proto,
-                    sizeof(tlsext_alpn_single_proto));
-                goto err;
-        }
-        if (memcmp(data, tlsext_alpn_single_proto, dlen) != 0) {
-                FAIL("clienthello ALPN differs:\n");
-                compare_data(data, dlen, tlsext_alpn_single_proto,
-                    sizeof(tlsext_alpn_single_proto));
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        /* Make sure we can parse the single proto. */
-
-        CBS_init(&cbs, tlsext_alpn_single_proto,
-            sizeof(tlsext_alpn_single_proto));
-
-        /* Shouldn't be able to parse without requesting */
-        if (tlsext_alpn_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("Should only parse serverhello if we requested it");
-                goto err;
-        }
-
-        /* Should be able to parse once requested. */
-        if (SSL_set_alpn_protos(ssl, tlsext_alpn_single_proto_val,
-            sizeof(tlsext_alpn_single_proto_val)) != 0) {
-                FAIL("should be able to set ALPN to http/1.1");
-                goto err;
-        }
-        if (!tlsext_alpn_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("Should be able to parse serverhello when we request it");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (S3I(ssl)->alpn_selected_len !=
-            sizeof(tlsext_alpn_single_proto_name)) {
-                FAIL("got serverhello ALPN with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_alpn_single_proto_name));
-                compare_data(S3I(ssl)->alpn_selected,
-                    S3I(ssl)->alpn_selected_len,
-                    tlsext_alpn_single_proto_name,
-                    sizeof(tlsext_alpn_single_proto_name));
-                goto err;
-        }
-        if (memcmp(S3I(ssl)->alpn_selected,
-            tlsext_alpn_single_proto_name,
-            sizeof(tlsext_alpn_single_proto_name)) != 0) {
-                FAIL("serverhello ALPN differs:\n");
-                compare_data(S3I(ssl)->alpn_selected,
-                    S3I(ssl)->alpn_selected_len,
-                    tlsext_alpn_single_proto_name,
-                    sizeof(tlsext_alpn_single_proto_name));
-                goto err;
-        }
-
-        /*
-         * We should NOT be able to build a serverhello with multiple
-         * protocol names.  However, the existing code did not check for this
-         * case because it is passed in as an encoded value.
-         */
-
-        /* Make sure we can remove the list and avoid ALPN */
-
-        free(S3I(ssl)->alpn_selected);
-        S3I(ssl)->alpn_selected = NULL;
-        S3I(ssl)->alpn_selected_len = 0;
-
-        if (tlsext_alpn_serverhello_needs(ssl)) {
-                FAIL("serverhello should need ALPN by default");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-
-}
-
-/*
- * Supported Elliptic Curves - RFC 4492 section 5.1.1.
- *
- * This extension is only used by the client.
- */
-
-static uint8_t tlsext_supportedgroups_clienthello_default[] = {
-        0x00, 0x06,
-        0x00, 0x1d,  /* X25519 (29) */
-        0x00, 0x17,  /* secp256r1 (23) */
-        0x00, 0x18   /* secp384r1 (24) */
-};
-
-static uint16_t tlsext_supportedgroups_clienthello_secp384r1_val[] = {
-        0x0018   /* tls1_ec_nid2curve_id(NID_secp384r1) */
-};
-static uint8_t tlsext_supportedgroups_clienthello_secp384r1[] = {
-        0x00, 0x02,
-        0x00, 0x18  /* secp384r1 (24) */
-};
-
-/* Example from RFC 4492 section 5.1.1 */
-static uint16_t tlsext_supportedgroups_clienthello_nistp192and224_val[] = {
-        0x0013,  /* tls1_ec_nid2curve_id(NID_X9_62_prime192v1) */
-        0x0015   /* tls1_ec_nid2curve_id(NID_secp224r1) */
-};
-static uint8_t tlsext_supportedgroups_clienthello_nistp192and224[] = {
-        0x00, 0x04,
-        0x00, 0x13, /* secp192r1 aka NIST P-192 */
-        0x00, 0x15  /* secp224r1 aka NIST P-224 */
-};
-
-static int
-test_tlsext_supportedgroups_clienthello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        size_t dlen;
-        int failure, alert;
-        CBB cbb;
-        CBS cbs;
-
-        failure = 1;
-
-        if (!CBB_init(&cbb, 0))
-                errx(1, "failed to create CBB");
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        /*
-         * Default ciphers include EC so we need it by default.
-         */
-        if (!tlsext_supportedgroups_clienthello_needs(ssl)) {
-                FAIL("clienthello should need Ellipticcurves for default "
-                    "ciphers\n");
-                goto err;
-        }
-
-        /*
-         * Exclude cipher suites so we can test not including it.
-         */
-        if (!SSL_set_cipher_list(ssl, "TLSv1.2:!ECDHE:!ECDSA")) {
-                FAIL("clienthello should be able to set cipher list\n");
-                goto err;
-        }
-        if (tlsext_supportedgroups_clienthello_needs(ssl)) {
-                FAIL("clienthello should not need Ellipticcurves\n");
-                goto err;
-        }
-
-        /*
-         * Use libtls default for the rest of the testing
-         */
-        if (!SSL_set_cipher_list(ssl, "TLSv1.2+AEAD+ECDHE")) {
-                FAIL("clienthello should be able to set cipher list\n");
-                goto err;
-        }
-        if (!tlsext_supportedgroups_clienthello_needs(ssl)) {
-                FAIL("clienthello should need Ellipticcurves\n");
-                goto err;
-        }
-
-        /*
-         * Test with a session secp384r1.  The default is used instead.
-         */
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        if ((SSI(ssl)->tlsext_supportedgroups = malloc(sizeof(uint16_t)))
-            == NULL) {
-                FAIL("client could not malloc\n");
-                goto err;
-        }
-        SSI(ssl)->tlsext_supportedgroups[0] = tls1_ec_nid2curve_id(NID_secp384r1);
-        SSI(ssl)->tlsext_supportedgroups_length = 1;
-
-        if (!tlsext_supportedgroups_clienthello_needs(ssl)) {
-                FAIL("clienthello should need Ellipticcurves\n");
-                goto err;
-        }
-
-        if (!tlsext_supportedgroups_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build Ellipticcurves\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_supportedgroups_clienthello_default)) {
-                FAIL("got clienthello Ellipticcurves with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_supportedgroups_clienthello_default));
-                compare_data(data, dlen, tlsext_supportedgroups_clienthello_default,
-                    sizeof(tlsext_supportedgroups_clienthello_default));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_supportedgroups_clienthello_default, dlen) != 0) {
-                FAIL("clienthello Ellipticcurves differs:\n");
-                compare_data(data, dlen, tlsext_supportedgroups_clienthello_default,
-                    sizeof(tlsext_supportedgroups_clienthello_default));
-                goto err;
-        }
-
-        /*
-         * Test parsing secp384r1
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        CBS_init(&cbs, tlsext_supportedgroups_clienthello_secp384r1,
-            sizeof(tlsext_supportedgroups_clienthello_secp384r1));
-        if (!tlsext_supportedgroups_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse clienthello Ellipticcurves\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (SSI(ssl)->tlsext_supportedgroups_length !=
-            sizeof(tlsext_supportedgroups_clienthello_secp384r1_val) / sizeof(uint16_t)) {
-                FAIL("no tlsext_ellipticcurves from clienthello "
-                    "Ellipticcurves\n");
-                goto err;
-        }
-
-        if (memcmp(SSI(ssl)->tlsext_supportedgroups,
-            tlsext_supportedgroups_clienthello_secp384r1_val,
-            sizeof(tlsext_supportedgroups_clienthello_secp384r1_val)) != 0) {
-                FAIL("clienthello had an incorrect Ellipticcurves "
-                    "entry\n");
-                compare_data2(SSI(ssl)->tlsext_supportedgroups,
-                    SSI(ssl)->tlsext_supportedgroups_length * 2,
-                    tlsext_supportedgroups_clienthello_secp384r1_val,
-                    sizeof(tlsext_supportedgroups_clienthello_secp384r1_val));
-                goto err;
-        }
-
-        /*
-         * Use a custom order.
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        if ((ssl->internal->tlsext_supportedgroups = malloc(sizeof(uint16_t) * 2)) == NULL) {
-                FAIL("client could not malloc\n");
-                goto err;
-        }
-        ssl->internal->tlsext_supportedgroups[0] = tls1_ec_nid2curve_id(NID_X9_62_prime192v1);
-        ssl->internal->tlsext_supportedgroups[1] = tls1_ec_nid2curve_id(NID_secp224r1);
-        ssl->internal->tlsext_supportedgroups_length = 2;
-
-        if (!tlsext_supportedgroups_clienthello_needs(ssl)) {
-                FAIL("clienthello should need Ellipticcurves\n");
-                goto err;
-        }
-
-        if (!tlsext_supportedgroups_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build Ellipticcurves\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_supportedgroups_clienthello_nistp192and224)) {
-                FAIL("got clienthello Ellipticcurves with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_supportedgroups_clienthello_nistp192and224));
-                fprintf(stderr, "received:\n");
-                hexdump(data, dlen);
-                fprintf(stderr, "test data:\n");
-                hexdump(tlsext_supportedgroups_clienthello_nistp192and224,
-                    sizeof(tlsext_supportedgroups_clienthello_nistp192and224));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_supportedgroups_clienthello_nistp192and224, dlen) != 0) {
-                FAIL("clienthello Ellipticcurves differs:\n");
-                fprintf(stderr, "received:\n");
-                hexdump(data, dlen);
-                fprintf(stderr, "test data:\n");
-                hexdump(tlsext_supportedgroups_clienthello_nistp192and224,
-                    sizeof(tlsext_supportedgroups_clienthello_nistp192and224));
-                goto err;
-        }
-
-        /*
-         * Parse non-default curves to session.
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        /* Reset back to the default list. */
-        free(ssl->internal->tlsext_supportedgroups);
-        ssl->internal->tlsext_supportedgroups = NULL;
-        ssl->internal->tlsext_supportedgroups_length = 0;
-
-        CBS_init(&cbs, tlsext_supportedgroups_clienthello_nistp192and224,
-            sizeof(tlsext_supportedgroups_clienthello_nistp192and224));
-        if (!tlsext_supportedgroups_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse clienthello Ellipticcurves\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (SSI(ssl)->tlsext_supportedgroups_length !=
-            sizeof(tlsext_supportedgroups_clienthello_nistp192and224_val) / sizeof(uint16_t)) {
-                FAIL("no tlsext_ellipticcurves from clienthello "
-                    "Ellipticcurves\n");
-                goto err;
-        }
-
-        if (memcmp(SSI(ssl)->tlsext_supportedgroups,
-            tlsext_supportedgroups_clienthello_nistp192and224_val,
-            sizeof(tlsext_supportedgroups_clienthello_nistp192and224_val)) != 0) {
-                FAIL("clienthello had an incorrect Ellipticcurves entry\n");
-                compare_data2(SSI(ssl)->tlsext_supportedgroups,
-                    SSI(ssl)->tlsext_supportedgroups_length * 2,
-                    tlsext_supportedgroups_clienthello_nistp192and224_val,
-                    sizeof(tlsext_supportedgroups_clienthello_nistp192and224_val));
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-
-/* elliptic_curves is only used by the client so this doesn't test much. */
-static int
-test_tlsext_supportedgroups_serverhello(void)
-{
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure;
-
-        failure = 1;
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_server_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if (tlsext_supportedgroups_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need elliptic_curves\n");
-                goto err;
-        }
-
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        if (tlsext_supportedgroups_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need elliptic_curves\n");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-
-        return (failure);
-
-}
-
-/*
- * Supported Point Formats - RFC 4492 section 5.1.2.
- *
- * Examples are from the RFC.  Both client and server have the same build and
- * parse but the needs differ.
- */
-
-static uint8_t tlsext_ecpf_hello_uncompressed_val[] = {
-        TLSEXT_ECPOINTFORMAT_uncompressed
-};
-static uint8_t tlsext_ecpf_hello_uncompressed[] = {
-        0x01,
-        0x00 /* TLSEXT_ECPOINTFORMAT_uncompressed */
-};
-
-static uint8_t tlsext_ecpf_hello_prime[] = {
-        0x01,
-        0x01 /* TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime */
-};
-
-static uint8_t tlsext_ecpf_hello_prefer_order_val[] = {
-        TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime,
-        TLSEXT_ECPOINTFORMAT_uncompressed,
-        TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2
-};
-static uint8_t tlsext_ecpf_hello_prefer_order[] = {
-        0x03,
-        0x01, /* TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime */
-        0x00, /* TLSEXT_ECPOINTFORMAT_uncompressed */
-        0x02  /* TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2 */
-};
-
-static int
-test_tlsext_ecpf_clienthello(void)
-{
-        uint8_t *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        size_t dlen;
-        int failure, alert;
-        CBB cbb;
-        CBS cbs;
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        /*
-         * Default ciphers include EC so we need it by default.
-         */
-        if (!tlsext_ecpf_clienthello_needs(ssl)) {
-                FAIL("clienthello should need ECPointFormats for default "
-                    "ciphers\n");
-                goto err;
-        }
-
-        /*
-         * Exclude EC cipher suites so we can test not including it.
-         */
-        if (!SSL_set_cipher_list(ssl, "ALL:!ECDHE:!ECDH")) {
-                FAIL("clienthello should be able to set cipher list\n");
-                goto err;
-        }
-        if (tlsext_ecpf_clienthello_needs(ssl)) {
-                FAIL("clienthello should not need ECPointFormats\n");
-                goto err;
-        }
-
-        /*
-         * Use libtls default for the rest of the testing
-         */
-        if (!SSL_set_cipher_list(ssl, "TLSv1.2+AEAD+ECDHE")) {
-                FAIL("clienthello should be able to set cipher list\n");
-                goto err;
-        }
-        if (!tlsext_ecpf_clienthello_needs(ssl)) {
-                FAIL("clienthello should need ECPointFormats\n");
-                goto err;
-        }
-
-        /*
-         * The default ECPointFormats should only have uncompressed
-         */
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        if (!tlsext_ecpf_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build ECPointFormats\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_ecpf_hello_uncompressed)) {
-                FAIL("got clienthello ECPointFormats with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_ecpf_hello_uncompressed));
-                compare_data(data, dlen, tlsext_ecpf_hello_uncompressed,
-                    sizeof(tlsext_ecpf_hello_uncompressed));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_ecpf_hello_uncompressed, dlen) != 0) {
-                FAIL("clienthello ECPointFormats differs:\n");
-                compare_data(data, dlen, tlsext_ecpf_hello_uncompressed,
-                    sizeof(tlsext_ecpf_hello_uncompressed));
-                goto err;
-        }
-
-        /*
-         * Make sure we can parse the default.
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        CBS_init(&cbs, tlsext_ecpf_hello_uncompressed,
-            sizeof(tlsext_ecpf_hello_uncompressed));
-        if (!tlsext_ecpf_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse clienthello ECPointFormats\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (SSI(ssl)->tlsext_ecpointformatlist_length !=
-            sizeof(tlsext_ecpf_hello_uncompressed_val)) {
-                FAIL("no tlsext_ecpointformats from clienthello "
-                    "ECPointFormats\n");
-                goto err;
-        }
-
-        if (memcmp(SSI(ssl)->tlsext_ecpointformatlist,
-            tlsext_ecpf_hello_uncompressed_val,
-            sizeof(tlsext_ecpf_hello_uncompressed_val)) != 0) {
-                FAIL("clienthello had an incorrect ECPointFormats entry\n");
-                goto err;
-        }
-
-        /*
-         * Test with a custom order.
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        if ((ssl->internal->tlsext_ecpointformatlist = malloc(sizeof(uint8_t) * 3)) == NULL) {
-                FAIL("client could not malloc\n");
-                goto err;
-        }
-        ssl->internal->tlsext_ecpointformatlist[0] = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime;
-        ssl->internal->tlsext_ecpointformatlist[1] = TLSEXT_ECPOINTFORMAT_uncompressed;
-        ssl->internal->tlsext_ecpointformatlist[2] = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2;
-        ssl->internal->tlsext_ecpointformatlist_length = 3;
-
-        if (!tlsext_ecpf_clienthello_needs(ssl)) {
-                FAIL("clienthello should need ECPointFormats with a custom "
-                    "format\n");
-                goto err;
-        }
-
-        if (!tlsext_ecpf_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build ECPointFormats\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_ecpf_hello_prefer_order)) {
-                FAIL("got clienthello ECPointFormats with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_ecpf_hello_prefer_order));
-                compare_data(data, dlen, tlsext_ecpf_hello_prefer_order,
-                    sizeof(tlsext_ecpf_hello_prefer_order));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_ecpf_hello_prefer_order, dlen) != 0) {
-                FAIL("clienthello ECPointFormats differs:\n");
-                compare_data(data, dlen, tlsext_ecpf_hello_prefer_order,
-                    sizeof(tlsext_ecpf_hello_prefer_order));
-                goto err;
-        }
-
-        /*
-         * Make sure that we can parse this custom order.
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        /* Reset the custom list so we go back to the default uncompressed. */
-        free(ssl->internal->tlsext_ecpointformatlist);
-        ssl->internal->tlsext_ecpointformatlist = NULL;
-        ssl->internal->tlsext_ecpointformatlist_length = 0;
-
-        CBS_init(&cbs, tlsext_ecpf_hello_prefer_order,
-            sizeof(tlsext_ecpf_hello_prefer_order));
-        if (!tlsext_ecpf_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse clienthello ECPointFormats\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (SSI(ssl)->tlsext_ecpointformatlist_length !=
-            sizeof(tlsext_ecpf_hello_prefer_order_val)) {
-                FAIL("no tlsext_ecpointformats from clienthello "
-                    "ECPointFormats\n");
-                goto err;
-        }
-
-        if (memcmp(SSI(ssl)->tlsext_ecpointformatlist,
-            tlsext_ecpf_hello_prefer_order_val,
-            sizeof(tlsext_ecpf_hello_prefer_order_val)) != 0) {
-                FAIL("clienthello had an incorrect ECPointFormats entry\n");
-                goto err;
-        }
-
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-static int
-test_tlsext_ecpf_serverhello(void)
-{
-        uint8_t *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        size_t dlen;
-        int failure, alert;
-        CBB cbb;
-        CBS cbs;
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_server_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        /* Setup the state so we can call needs. */
-        if ((S3I(ssl)->hs.new_cipher =
-            ssl3_get_cipher_by_id(TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305))
-            == NULL) {
-                FAIL("serverhello cannot find cipher\n");
-                goto err;
-        }
-        if ((SSI(ssl)->tlsext_ecpointformatlist = malloc(sizeof(uint8_t)))
-            == NULL) {
-                FAIL("server could not malloc\n");
-                goto err;
-        }
-        SSI(ssl)->tlsext_ecpointformatlist[0] = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime;
-        SSI(ssl)->tlsext_ecpointformatlist_length = 1;
-
-        if (!tlsext_ecpf_serverhello_needs(ssl)) {
-                FAIL("serverhello should need ECPointFormats now\n");
-                goto err;
-        }
-
-        /*
-         * The server will ignore the session list and use either a custom
-         * list or the default (uncompressed).
-         */
-        if (!tlsext_ecpf_serverhello_build(ssl, &cbb)) {
-                FAIL("serverhello failed to build ECPointFormats\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_ecpf_hello_uncompressed)) {
-                FAIL("got serverhello ECPointFormats with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_ecpf_hello_uncompressed));
-                compare_data(data, dlen, tlsext_ecpf_hello_uncompressed,
-                    sizeof(tlsext_ecpf_hello_uncompressed));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_ecpf_hello_uncompressed, dlen) != 0) {
-                FAIL("serverhello ECPointFormats differs:\n");
-                compare_data(data, dlen, tlsext_ecpf_hello_uncompressed,
-                    sizeof(tlsext_ecpf_hello_uncompressed));
-                goto err;
-        }
-
-        /*
-         * Cannot parse a non-default list without at least uncompressed.
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        CBS_init(&cbs, tlsext_ecpf_hello_prime,
-            sizeof(tlsext_ecpf_hello_prime));
-        if (tlsext_ecpf_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("must include uncompressed in serverhello ECPointFormats\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        /*
-         * Test with a custom order that replaces the default uncompressed.
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        /* Add a session list even though it will be ignored. */
-        if ((SSI(ssl)->tlsext_ecpointformatlist = malloc(sizeof(uint8_t)))
-            == NULL) {
-                FAIL("server could not malloc\n");
-                goto err;
-        }
-        SSI(ssl)->tlsext_ecpointformatlist[0] = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2;
-        SSI(ssl)->tlsext_ecpointformatlist_length = 1;
-
-        /* Replace the default list with a custom one. */
-        if ((ssl->internal->tlsext_ecpointformatlist = malloc(sizeof(uint8_t) * 3)) == NULL) {
-                FAIL("server could not malloc\n");
-                goto err;
-        }
-        ssl->internal->tlsext_ecpointformatlist[0] = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime;
-        ssl->internal->tlsext_ecpointformatlist[1] = TLSEXT_ECPOINTFORMAT_uncompressed;
-        ssl->internal->tlsext_ecpointformatlist[2] = TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2;
-        ssl->internal->tlsext_ecpointformatlist_length = 3;
-
-        if (!tlsext_ecpf_serverhello_needs(ssl)) {
-                FAIL("serverhello should need ECPointFormats\n");
-                goto err;
-        }
-
-        if (!tlsext_ecpf_serverhello_build(ssl, &cbb)) {
-                FAIL("serverhello failed to build ECPointFormats\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_ecpf_hello_prefer_order)) {
-                FAIL("got serverhello ECPointFormats with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_ecpf_hello_prefer_order));
-                compare_data(data, dlen, tlsext_ecpf_hello_prefer_order,
-                    sizeof(tlsext_ecpf_hello_prefer_order));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_ecpf_hello_prefer_order, dlen) != 0) {
-                FAIL("serverhello ECPointFormats differs:\n");
-                compare_data(data, dlen, tlsext_ecpf_hello_prefer_order,
-                    sizeof(tlsext_ecpf_hello_prefer_order));
-                goto err;
-        }
-
-        /*
-         * Should be able to parse the custom list into a session list.
-         */
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        /* Reset back to the default (uncompressed) */
-        free(ssl->internal->tlsext_ecpointformatlist);
-        ssl->internal->tlsext_ecpointformatlist = NULL;
-        ssl->internal->tlsext_ecpointformatlist_length = 0;
-
-        CBS_init(&cbs, tlsext_ecpf_hello_prefer_order,
-            sizeof(tlsext_ecpf_hello_prefer_order));
-        if (!tlsext_ecpf_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse serverhello ECPointFormats\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (SSI(ssl)->tlsext_ecpointformatlist_length !=
-            sizeof(tlsext_ecpf_hello_prefer_order_val)) {
-                FAIL("no tlsext_ecpointformats from serverhello "
-                    "ECPointFormats\n");
-                goto err;
-        }
-
-        if (memcmp(SSI(ssl)->tlsext_ecpointformatlist,
-            tlsext_ecpf_hello_prefer_order_val,
-            sizeof(tlsext_ecpf_hello_prefer_order_val)) != 0) {
-                FAIL("serverhello had an incorrect ECPointFormats entry\n");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-/*
- * Renegotiation Indication - RFC 5746.
- */
-
-static unsigned char tlsext_ri_prev_client[] = {
-        0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-        0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-};
-
-static unsigned char tlsext_ri_prev_server[] = {
-        0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88,
-        0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11, 0x00,
-};
-
-static unsigned char tlsext_ri_clienthello[] = {
-        0x10,
-        0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-        0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-};
-
-static unsigned char tlsext_ri_serverhello[] = {
-        0x20,
-        0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-        0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-        0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99, 0x88,
-        0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11, 0x00,
-};
-
-static int
-test_tlsext_ri_clienthello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure;
-        size_t dlen;
-        int alert;
-        CBB cbb;
-        CBS cbs;
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLSv1_2_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if (tlsext_ri_clienthello_needs(ssl)) {
-                FAIL("clienthello should not need RI\n");
-                goto err;
-        }
-
-        if (!SSL_renegotiate(ssl)) {
-                FAIL("client failed to set renegotiate\n");
-                goto err;
-        }
-
-        if (!tlsext_ri_clienthello_needs(ssl)) {
-                FAIL("clienthello should need RI\n");
-                goto err;
-        }
-
-        memcpy(S3I(ssl)->previous_client_finished, tlsext_ri_prev_client,
-            sizeof(tlsext_ri_prev_client));
-        S3I(ssl)->previous_client_finished_len = sizeof(tlsext_ri_prev_client);
-
-        S3I(ssl)->renegotiate_seen = 0;
-
-        if (!tlsext_ri_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build RI\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_ri_clienthello)) {
-                FAIL("got clienthello RI with length %zu, "
-                    "want length %zu\n", dlen, sizeof(tlsext_ri_clienthello));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_ri_clienthello, dlen) != 0) {
-                FAIL("clienthello RI differs:\n");
-                fprintf(stderr, "received:\n");
-                hexdump(data, dlen);
-                fprintf(stderr, "test data:\n");
-                hexdump(tlsext_ri_clienthello, sizeof(tlsext_ri_clienthello));
-                goto err;
-        }
-
-        CBS_init(&cbs, tlsext_ri_clienthello, sizeof(tlsext_ri_clienthello));
-        if (!tlsext_ri_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse clienthello RI\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (S3I(ssl)->renegotiate_seen != 1) {
-                FAIL("renegotiate seen not set\n");
-                goto err;
-        }
-        if (S3I(ssl)->send_connection_binding != 1) {
-                FAIL("send connection binding not set\n");
-                goto err;
-        }
-
-        memset(S3I(ssl)->previous_client_finished, 0,
-            sizeof(S3I(ssl)->previous_client_finished));
-
-        S3I(ssl)->renegotiate_seen = 0;
-
-        CBS_init(&cbs, tlsext_ri_clienthello, sizeof(tlsext_ri_clienthello));
-        if (tlsext_ri_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("parsed invalid clienthello RI\n");
-                failure = 1;
-                goto err;
-        }
-
-        if (S3I(ssl)->renegotiate_seen == 1) {
-                FAIL("renegotiate seen set\n");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-static int
-test_tlsext_ri_serverhello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure;
-        size_t dlen;
-        int alert;
-        CBB cbb;
-        CBS cbs;
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_server_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if (tlsext_ri_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need RI\n");
-                goto err;
-        }
-
-        S3I(ssl)->send_connection_binding = 1;
-
-        if (!tlsext_ri_serverhello_needs(ssl)) {
-                FAIL("serverhello should need RI\n");
-                goto err;
-        }
-
-        memcpy(S3I(ssl)->previous_client_finished, tlsext_ri_prev_client,
-            sizeof(tlsext_ri_prev_client));
-        S3I(ssl)->previous_client_finished_len = sizeof(tlsext_ri_prev_client);
-
-        memcpy(S3I(ssl)->previous_server_finished, tlsext_ri_prev_server,
-            sizeof(tlsext_ri_prev_server));
-        S3I(ssl)->previous_server_finished_len = sizeof(tlsext_ri_prev_server);
-
-        S3I(ssl)->renegotiate_seen = 0;
-
-        if (!tlsext_ri_serverhello_build(ssl, &cbb)) {
-                FAIL("serverhello failed to build RI\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_ri_serverhello)) {
-                FAIL("got serverhello RI with length %zu, "
-                    "want length %zu\n", dlen, sizeof(tlsext_ri_serverhello));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_ri_serverhello, dlen) != 0) {
-                FAIL("serverhello RI differs:\n");
-                fprintf(stderr, "received:\n");
-                hexdump(data, dlen);
-                fprintf(stderr, "test data:\n");
-                hexdump(tlsext_ri_serverhello, sizeof(tlsext_ri_serverhello));
-                goto err;
-        }
-
-        CBS_init(&cbs, tlsext_ri_serverhello, sizeof(tlsext_ri_serverhello));
-        if (!tlsext_ri_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse serverhello RI\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (S3I(ssl)->renegotiate_seen != 1) {
-                FAIL("renegotiate seen not set\n");
-                goto err;
-        }
-        if (S3I(ssl)->send_connection_binding != 1) {
-                FAIL("send connection binding not set\n");
-                goto err;
-        }
-
-        memset(S3I(ssl)->previous_client_finished, 0,
-            sizeof(S3I(ssl)->previous_client_finished));
-        memset(S3I(ssl)->previous_server_finished, 0,
-            sizeof(S3I(ssl)->previous_server_finished));
-
-        S3I(ssl)->renegotiate_seen = 0;
-
-        CBS_init(&cbs, tlsext_ri_serverhello, sizeof(tlsext_ri_serverhello));
-        if (tlsext_ri_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("parsed invalid serverhello RI\n");
-                goto err;
-        }
-
-        if (S3I(ssl)->renegotiate_seen == 1) {
-                FAIL("renegotiate seen set\n");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-/*
- * Signature Algorithms - RFC 5246 section 7.4.1.4.1.
- */
-
-static unsigned char tlsext_sigalgs_clienthello[] = {
-        0x00, 0x1a, 0x06, 0x01, 0x06, 0x03, 0xef, 0xef,
-        0x05, 0x01, 0x05, 0x03, 0x04, 0x01, 0x04, 0x03,
-        0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x03,
-        0x02, 0x01, 0x02, 0x03,
-};
-
-static int
-test_tlsext_sigalgs_clienthello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure = 0;
-        size_t dlen;
-        int alert;
-        CBB cbb;
-        CBS cbs;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        ssl->client_version = TLS1_1_VERSION;
-
-        if (tlsext_sigalgs_clienthello_needs(ssl)) {
-                fprintf(stderr, "FAIL: clienthello should not need sigalgs\n");
-                failure = 1;
-                goto done;
-        }
-
-        ssl->client_version = TLS1_2_VERSION;
-
-        if (!tlsext_sigalgs_clienthello_needs(ssl)) {
-                fprintf(stderr, "FAIL: clienthello should need sigalgs\n");
-                failure = 1;
-                goto done;
-        }
-
-        if (!tlsext_sigalgs_clienthello_build(ssl, &cbb)) {
-                fprintf(stderr, "FAIL: clienthello failed to build sigalgs\n");
-                failure = 1;
-                goto done;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_sigalgs_clienthello)) {
-                fprintf(stderr, "FAIL: got clienthello sigalgs with length %zu, "
-                    "want length %zu\n", dlen, sizeof(tlsext_sigalgs_clienthello));
-                failure = 1;
-                goto done;
-        }
-
-        if (memcmp(data, tlsext_sigalgs_clienthello, dlen) != 0) {
-                fprintf(stderr, "FAIL: clienthello SNI differs:\n");
-                fprintf(stderr, "received:\n");
-                hexdump(data, dlen);
-                fprintf(stderr, "test data:\n");
-                hexdump(tlsext_sigalgs_clienthello, sizeof(tlsext_sigalgs_clienthello));
-                failure = 1;
-                goto done;
-        }
-
-        CBS_init(&cbs, tlsext_sigalgs_clienthello, sizeof(tlsext_sigalgs_clienthello));
-        if (!tlsext_sigalgs_clienthello_parse(ssl, &cbs, &alert)) {
-                fprintf(stderr, "FAIL: failed to parse clienthello SNI\n");
-                failure = 1;
-                goto done;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto done;
-        }
-
-        if (ssl->cert->pkeys[SSL_PKEY_RSA_SIGN].digest != EVP_sha512()) {
-                fprintf(stderr, "FAIL: RSA sign digest mismatch\n");
-                failure = 1;
-                goto done;
-        }
-        if (ssl->cert->pkeys[SSL_PKEY_RSA_ENC].digest != EVP_sha512()) {
-                fprintf(stderr, "FAIL: RSA enc digest mismatch\n");
-                failure = 1;
-                goto done;
-        }
-        if (ssl->cert->pkeys[SSL_PKEY_ECC].digest != EVP_sha512()) {
-                fprintf(stderr, "FAIL: ECC digest mismatch\n");
-                failure = 1;
-                goto done;
-        }
-        if (ssl->cert->pkeys[SSL_PKEY_GOST01].digest != EVP_streebog512()) {
-                fprintf(stderr, "FAIL: GOST01 digest mismatch\n");
-                failure = 1;
-                goto done;
-        }
-                
- done:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-static int
-test_tlsext_sigalgs_serverhello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure = 0;
-        size_t dlen;
-        int alert;
-        CBB cbb;
-        CBS cbs;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_server_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if (tlsext_sigalgs_serverhello_needs(ssl)) {
-                fprintf(stderr, "FAIL: serverhello should not need sigalgs\n");
-                failure = 1;
-                goto done;
-        }
-
-        if (tlsext_sigalgs_serverhello_build(ssl, &cbb)) {
-                fprintf(stderr, "FAIL: serverhello should not build sigalgs\n");
-                failure = 1;
-                goto done;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        CBS_init(&cbs, tlsext_sigalgs_clienthello, sizeof(tlsext_sigalgs_clienthello));
-        if (tlsext_sigalgs_serverhello_parse(ssl, &cbs, &alert)) {
-                fprintf(stderr, "FAIL: serverhello should not parse sigalgs\n");
-                failure = 1;
-                goto done;
-        }
-
- done:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-/*
- * Server Name Indication - RFC 6066 section 3.
- */
-
-#define TEST_SNI_SERVERNAME "www.libressl.org"
-
-static unsigned char tlsext_sni_clienthello[] = {
-        0x00, 0x13, 0x00, 0x00, 0x10, 0x77, 0x77, 0x77,
-        0x2e, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x73,
-        0x6c, 0x2e, 0x6f, 0x72, 0x67,
-};
-
-static unsigned char tlsext_sni_serverhello[] = {
-};
-
-static int
-test_tlsext_sni_clienthello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure;
-        size_t dlen;
-        int alert;
-        CBB cbb;
-        CBS cbs;
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if (tlsext_sni_clienthello_needs(ssl)) {
-                FAIL("clienthello should not need SNI\n");
-                goto err;
-        }
-
-        if (!SSL_set_tlsext_host_name(ssl, TEST_SNI_SERVERNAME)) {
-                FAIL("client failed to set server name\n");
-                goto err;
-        }
-
-        if (!tlsext_sni_clienthello_needs(ssl)) {
-                FAIL("clienthello should need SNI\n");
-                goto err;
-        }
-
-        if (!tlsext_sni_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build SNI\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_sni_clienthello)) {
-                FAIL("got clienthello SNI with length %zu, "
-                    "want length %zu\n", dlen, sizeof(tlsext_sni_clienthello));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_sni_clienthello, dlen) != 0) {
-                FAIL("clienthello SNI differs:\n");
-                fprintf(stderr, "received:\n");
-                hexdump(data, dlen);
-                fprintf(stderr, "test data:\n");
-                hexdump(tlsext_sni_clienthello, sizeof(tlsext_sni_clienthello));
-                goto err;
-        }
-
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        ssl->internal->hit = 0;
-
-        CBS_init(&cbs, tlsext_sni_clienthello, sizeof(tlsext_sni_clienthello));
-        if (!tlsext_sni_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse clienthello SNI\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (ssl->session->tlsext_hostname == NULL) {
-                FAIL("no tlsext_hostname from clienthello SNI\n");
-                goto err;
-        }
-
-        if (strlen(ssl->session->tlsext_hostname) != strlen(TEST_SNI_SERVERNAME) ||
-            strncmp(ssl->session->tlsext_hostname, TEST_SNI_SERVERNAME,
-                strlen(TEST_SNI_SERVERNAME)) != 0) {
-                FAIL("got tlsext_hostname `%s', want `%s'\n",
-                    ssl->session->tlsext_hostname, TEST_SNI_SERVERNAME);
-                goto err;
-        }
-
-        ssl->internal->hit = 1;
-
-        if ((ssl->session->tlsext_hostname = strdup("notthesame.libressl.org")) ==
-            NULL)
-                errx(1, "failed to strdup tlsext_hostname");
-
-        CBS_init(&cbs, tlsext_sni_clienthello, sizeof(tlsext_sni_clienthello));
-        if (tlsext_sni_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("parsed clienthello with mismatched SNI\n");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-static int
-test_tlsext_sni_serverhello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure;
-        size_t dlen;
-        int alert;
-        CBB cbb;
-        CBS cbs;
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_server_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        if (tlsext_sni_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need SNI\n");
-                goto err;
-        }
-
-        if (!SSL_set_tlsext_host_name(ssl, TEST_SNI_SERVERNAME)) {
-                FAIL("client failed to set server name\n");
-                goto err;
-        }
-
-        if ((ssl->session->tlsext_hostname = strdup(TEST_SNI_SERVERNAME)) ==
-            NULL)
-                errx(1, "failed to strdup tlsext_hostname");
-
-        if (!tlsext_sni_serverhello_needs(ssl)) {
-                FAIL("serverhello should need SNI\n");
-                goto err;
-        }
-
-        if (!tlsext_sni_serverhello_build(ssl, &cbb)) {
-                FAIL("serverhello failed to build SNI\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_sni_serverhello)) {
-                FAIL("got serverhello SNI with length %zu, "
-                    "want length %zu\n", dlen, sizeof(tlsext_sni_serverhello));
-                goto err;
-        }
-
-        if (memcmp(data, tlsext_sni_serverhello, dlen) != 0) {
-                FAIL("serverhello SNI differs:\n");
-                fprintf(stderr, "received:\n");
-                hexdump(data, dlen);
-                fprintf(stderr, "test data:\n");
-                hexdump(tlsext_sni_serverhello, sizeof(tlsext_sni_serverhello));
-                goto err;
-        }
-
-        free(ssl->session->tlsext_hostname);
-        ssl->session->tlsext_hostname = NULL;
-
-        CBS_init(&cbs, tlsext_sni_serverhello, sizeof(tlsext_sni_serverhello));
-        if (!tlsext_sni_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse serverhello SNI\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if (ssl->session->tlsext_hostname == NULL) {
-                FAIL("no tlsext_hostname after serverhello SNI\n");
-                goto err;
-        }
-
-        if (strlen(ssl->session->tlsext_hostname) != strlen(TEST_SNI_SERVERNAME) ||
-            strncmp(ssl->session->tlsext_hostname, TEST_SNI_SERVERNAME,
-                strlen(TEST_SNI_SERVERNAME)) != 0) {
-                FAIL("got tlsext_hostname `%s', want `%s'\n",
-                    ssl->session->tlsext_hostname, TEST_SNI_SERVERNAME);
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-static unsigned char tls_ocsp_clienthello_default[] = {
-        0x01, 0x00, 0x00, 0x00, 0x00
-};
-
-static int
-test_tlsext_ocsp_clienthello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        size_t dlen;
-        int failure;
-        int alert;
-        CBB cbb;
-        CBS cbs;
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if (tlsext_ocsp_clienthello_needs(ssl)) {
-                FAIL("clienthello should not need ocsp\n");
-                goto err;
-        }
-        SSL_set_tlsext_status_type(ssl, TLSEXT_STATUSTYPE_ocsp);
-
-        if (!tlsext_ocsp_clienthello_needs(ssl)) {
-                FAIL("clienthello should need ocsp\n");
-                goto err;
-        }
-        if (!tlsext_ocsp_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build SNI\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tls_ocsp_clienthello_default)) {
-                FAIL("got ocsp clienthello with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tls_ocsp_clienthello_default));
-                goto err;
-        }
-        if (memcmp(data, tls_ocsp_clienthello_default, dlen) != 0) {
-                FAIL("ocsp clienthello differs:\n");
-                fprintf(stderr, "received:\n");
-                hexdump(data, dlen);
-                fprintf(stderr, "test data:\n");
-                hexdump(tls_ocsp_clienthello_default,
-                    sizeof(tls_ocsp_clienthello_default));
-                goto err;
-        }
-        CBS_init(&cbs, tls_ocsp_clienthello_default,
-            sizeof(tls_ocsp_clienthello_default));
-        if (!tlsext_ocsp_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse ocsp clienthello\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-static int
-test_tlsext_ocsp_serverhello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        size_t dlen;
-        int failure;
-        CBB cbb;
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if (tlsext_ocsp_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need ocsp\n");
-                goto err;
-        }
-
-        ssl->internal->tlsext_status_expected = 1;
-
-        if (!tlsext_ocsp_serverhello_needs(ssl)) {
-                FAIL("serverhello should need ocsp\n");
-                goto err;
-        }
-        if (!tlsext_ocsp_serverhello_build(ssl, &cbb)) {
-                FAIL("serverhello failed to build ocsp\n");
-                goto err;
-        }
-
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-/*
- * Session ticket - RFC 5077 since no known implementations use 4507.
- *
- * Session tickets can be length 0 (special case) to 2^16-1.
- *
- * The state is encrypted by the server so it is opaque to the client.
- */
-static uint8_t tlsext_sessionticket_hello_min[1];
-static uint8_t tlsext_sessionticket_hello_max[65535];
-
-static int
-test_tlsext_sessionticket_clienthello(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure;
-        CBB cbb;
-        size_t dlen;
-        uint8_t dummy[1234];
-
-        failure = 1;
-
-        CBB_init(&cbb, 0);
-
-        /* Create fake session tickets with random data. */
-        arc4random_buf(tlsext_sessionticket_hello_min,
-            sizeof(tlsext_sessionticket_hello_min));
-        arc4random_buf(tlsext_sessionticket_hello_max,
-            sizeof(tlsext_sessionticket_hello_max));
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        /* Should need a ticket by default. */
-        if (!tlsext_sessionticket_clienthello_needs(ssl)) {
-                FAIL("clienthello should need Sessionticket for default "
-                    "ciphers\n");
-                goto err;
-        }
-
-        /* Test disabling tickets. */
-        if ((SSL_set_options(ssl, SSL_OP_NO_TICKET) & SSL_OP_NO_TICKET) == 0) {
-                FAIL("Cannot disable tickets in the TLS connection");
-                return 0;
-        }
-        if (tlsext_sessionticket_clienthello_needs(ssl)) {
-                FAIL("clienthello should not need SessionTicket if it was disabled");
-                goto err;
-        }
-
-        /* Test re-enabling tickets. */
-        if ((SSL_clear_options(ssl, SSL_OP_NO_TICKET) & SSL_OP_NO_TICKET) != 0) {
-                FAIL("Cannot re-enable tickets in the TLS connection");
-                return 0;
-        }
-        if (!tlsext_sessionticket_clienthello_needs(ssl)) {
-                FAIL("clienthello should need SessionTicket if it was disabled");
-                goto err;
-        }
-
-        /* Since we don't have a session, we should build an empty ticket. */
-        if (!tlsext_sessionticket_clienthello_build(ssl, &cbb)) {
-                FAIL("Cannot build a ticket");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen)) {
-                FAIL("Cannot finish CBB");
-                goto err;
-        }
-        if (dlen != 0) {
-                FAIL("Expected 0 length but found %zu\n", dlen);
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        /* With a new session (but no ticket), we should still have 0 length */
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-        if (!tlsext_sessionticket_clienthello_needs(ssl)) {
-                FAIL("Should still want a session ticket with a new session");
-                goto err;
-        }
-        if (!tlsext_sessionticket_clienthello_build(ssl, &cbb)) {
-                FAIL("Cannot build a ticket");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen)) {
-                FAIL("Cannot finish CBB");
-                goto err;
-        }
-        if (dlen != 0) {
-                FAIL("Expected 0 length but found %zu\n", dlen);
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        /* With a new session (and ticket), we should use that ticket */
-        SSL_SESSION_free(ssl->session);
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        arc4random_buf(&dummy, sizeof(dummy));
-        if ((ssl->session->tlsext_tick = malloc(sizeof(dummy))) == NULL) {
-                errx(1, "failed to malloc");
-        }
-        memcpy(ssl->session->tlsext_tick, dummy, sizeof(dummy));
-        ssl->session->tlsext_ticklen = sizeof(dummy);
-
-        if (!tlsext_sessionticket_clienthello_needs(ssl)) {
-                FAIL("Should still want a session ticket with a new session");
-                goto err;
-        }
-        if (!tlsext_sessionticket_clienthello_build(ssl, &cbb)) {
-                FAIL("Cannot build a ticket");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen)) {
-                FAIL("Cannot finish CBB");
-                goto err;
-        }
-        if (dlen != sizeof(dummy)) {
-                FAIL("Expected %zu length but found %zu\n", sizeof(dummy), dlen);
-                goto err;
-        }
-        if (memcmp(data, dummy, dlen) != 0) {
-                FAIL("serverhello SNI differs:\n");
-                compare_data(data, dlen,
-                    dummy, sizeof(dummy));
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-        free(ssl->session->tlsext_tick);
-        ssl->session->tlsext_tick = NULL;
-        ssl->session->tlsext_ticklen = 0;
-
-        /*
-         * Send in NULL to disable session tickets at runtime without going
-         * through SSL_set_options().
-         */
-        if (!SSL_set_session_ticket_ext(ssl, NULL, 0)) {
-                FAIL("Could not set a NULL custom ticket");
-                goto err;
-        }
-        /* Should not need a ticket in this case */
-        if (tlsext_sessionticket_clienthello_needs(ssl)) {
-                FAIL("Should not want to use session tickets with a NULL custom");
-                goto err;
-        }
-
-        /*
-         * If you want to remove the tlsext_session_ticket behavior, you have
-         * to do it manually.
-         */
-        free(ssl->internal->tlsext_session_ticket);
-        ssl->internal->tlsext_session_ticket = NULL;
-
-        if (!tlsext_sessionticket_clienthello_needs(ssl)) {
-                FAIL("Should need a session ticket again when the custom one is removed");
-                goto err;
-        }
-
-        /* Test a custom session ticket (not recommended in practice) */
-        if (!SSL_set_session_ticket_ext(ssl, tlsext_sessionticket_hello_max,
-            sizeof(tlsext_sessionticket_hello_max))) {
-                FAIL("Should be able to set a custom ticket");
-                goto err;
-        }
-        if (!tlsext_sessionticket_clienthello_needs(ssl)) {
-                FAIL("Should need a session ticket again when the custom one is not empty");
-                goto err;
-        }
-        if (!tlsext_sessionticket_clienthello_build(ssl, &cbb)) {
-                FAIL("Cannot build a ticket with a max length random payload");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen)) {
-                FAIL("Cannot finish CBB");
-                goto err;
-        }
-        if (dlen != sizeof(tlsext_sessionticket_hello_max)) {
-                FAIL("Expected %zu length but found %zu\n",
-                    sizeof(tlsext_sessionticket_hello_max), dlen);
-                goto err;
-        }
-        if (memcmp(data, tlsext_sessionticket_hello_max,
-            sizeof(tlsext_sessionticket_hello_max)) != 0) {
-                FAIL("Expected to get what we passed in");
-                compare_data(data, dlen,
-                    tlsext_sessionticket_hello_max,
-                    sizeof(tlsext_sessionticket_hello_max));
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-
-static int
-test_tlsext_sessionticket_serverhello(void)
-{
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure;
-        uint8_t *data;
-        size_t dlen;
-        CBB cbb;
-
-        CBB_init(&cbb, 0);
-
-        failure = 1;
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_server_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        /*
-         * By default, should not need a session ticket since the ticket
-         * is not yet expected.
-         */
-        if (tlsext_sessionticket_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need SessionTicket by default\n");
-                goto err;
-        }
-
-        /* Test disabling tickets. */
-        if ((SSL_set_options(ssl, SSL_OP_NO_TICKET) & SSL_OP_NO_TICKET) == 0) {
-                FAIL("Cannot disable tickets in the TLS connection");
-                return 0;
-        }
-        if (tlsext_sessionticket_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need SessionTicket if it was disabled");
-                goto err;
-        }
-
-        /* Test re-enabling tickets. */
-        if ((SSL_clear_options(ssl, SSL_OP_NO_TICKET) & SSL_OP_NO_TICKET) != 0) {
-                FAIL("Cannot re-enable tickets in the TLS connection");
-                return 0;
-        }
-        if (tlsext_sessionticket_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need SessionTicket yet");
-                goto err;
-        }
-
-        /* Set expected to require it. */
-        ssl->internal->tlsext_ticket_expected = 1;
-        if (!tlsext_sessionticket_serverhello_needs(ssl)) {
-                FAIL("serverhello should now be required for SessionTicket");
-                goto err;
-        }
-
-        /* server hello's session ticket should always be 0 length payload. */
-        if (!tlsext_sessionticket_serverhello_build(ssl, &cbb)) {
-                FAIL("Cannot build a ticket with a max length random payload");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen)) {
-                FAIL("Cannot finish CBB");
-                goto err;
-        }
-        if (dlen != 0) {
-                FAIL("Expected 0 length but found %zu\n", dlen);
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-
-        return (failure);
-}
-
-#ifndef OPENSSL_NO_SRTP
-/*
- * Supported Secure Real-time Transport Protocol (RFC 5764 section 4.1.1)
- */
-
-/* Colon separated string values */
-const char *tlsext_srtp_single_profile = "SRTP_AES128_CM_SHA1_80";
-const char *tlsext_srtp_multiple_profiles = "SRTP_AES128_CM_SHA1_80:SRTP_AES128_CM_SHA1_32";
-
-const char *tlsext_srtp_aes128cmsha80 = "SRTP_AES128_CM_SHA1_80";
-const char *tlsext_srtp_aes128cmsha32 = "SRTP_AES128_CM_SHA1_32";
-
-const uint8_t tlsext_srtp_single[] = {
-        /* SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1> */
-        0x00, 0x02, /* len */
-        0x00, 0x01, /* SRTP_AES128_CM_SHA1_80 */
-        0x00        /* opaque srtp_mki<0..255> */
-};
-
-const uint8_t tlsext_srtp_multiple[] = {
-        /* SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1> */
-        0x00, 0x04, /* len */
-        0x00, 0x01, /* SRTP_AES128_CM_SHA1_80 */
-        0x00, 0x02, /* SRTP_AES128_CM_SHA1_32 */
-        0x00    /* opaque srtp_mki<0..255> */
-};
-
-const uint8_t tlsext_srtp_multiple_invalid[] = {
-        /* SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1> */
-        0x00, 0x04, /* len */
-        0x00, 0x08, /* arbitrary value not found in known profiles */
-        0x00, 0x09, /* arbitrary value not found in known profiles */
-        0x00    /* opaque srtp_mki<0..255> */
-};
-
-const uint8_t tlsext_srtp_single_invalid[] = {
-        /* SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1> */
-        0x00, 0x02, /* len */
-        0x00, 0x08, /* arbitrary value not found in known profiles */
-        0x00    /* opaque srtp_mki<0..255> */
-};
-
-const uint8_t tlsext_srtp_multiple_one_valid[] = {
-        /* SRTPProtectionProfile SRTPProtectionProfiles<2..2^16-1> */
-        0x00, 0x04, /* len */
-        0x00, 0x08, /* arbitrary value not found in known profiles */
-        0x00, 0x02, /* SRTP_AES128_CM_SHA1_32 */
-        0x00        /* opaque srtp_mki<0..255> */
-};
-
-static int
-test_tlsext_srtp_clienthello(void)
-{
-        SRTP_PROTECTION_PROFILE *prof;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        uint8_t *data = NULL;
-        CBB cbb;
-        CBS cbs;
-        int failure, alert;
-        size_t dlen;
-
-        CBB_init(&cbb, 0);
-
-        failure = 1;
-
-        /* SRTP is for DTLS */
-        if ((ssl_ctx = SSL_CTX_new(DTLSv1_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        /* By default, we don't need this */
-        if (tlsext_srtp_clienthello_needs(ssl)) {
-                FAIL("clienthello should not need SRTP by default\n");
-                goto err;
-        }
-
-        if (SSL_set_tlsext_use_srtp(ssl, tlsext_srtp_single_profile) != 0) {
-                FAIL("should be able to set a single SRTP\n");
-                goto err;
-        }
-        if (!tlsext_srtp_clienthello_needs(ssl)) {
-                FAIL("clienthello should need SRTP\n");
-                goto err;
-        }
-
-        /* Make sure we can build the clienthello with a single profile. */
-
-        if (!tlsext_srtp_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build SRTP\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_srtp_single)) {
-                FAIL("got clienthello SRTP with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_srtp_single));
-                compare_data(data, dlen, tlsext_srtp_single,
-                    sizeof(tlsext_srtp_single));
-                goto err;
-        }
-        if (memcmp(data, tlsext_srtp_single, dlen) != 0) {
-                FAIL("clienthello SRTP differs:\n");
-                compare_data(data, dlen, tlsext_srtp_single,
-                    sizeof(tlsext_srtp_single));
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        /* Make sure we can parse the single profile. */
-
-        if (SSL_get_selected_srtp_profile(ssl) != NULL) {
-                FAIL("SRTP profile should not be set yet\n");
-                goto err;
-        }
-
-        CBS_init(&cbs, tlsext_srtp_single, sizeof(tlsext_srtp_single));
-        if (!tlsext_srtp_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse SRTP\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if ((prof = SSL_get_selected_srtp_profile(ssl)) == NULL) {
-                FAIL("SRTP profile should be set now\n");
-                goto err;
-        }
-        if (strcmp(prof->name, tlsext_srtp_aes128cmsha80) != 0) {
-                FAIL("SRTP profile was not set properly\n");
-                goto err;
-        }
-
-        if (!tlsext_srtp_serverhello_needs(ssl)) {
-                FAIL("should send server extension when profile selected\n");
-                goto err;
-        }
-
-        /* Make sure we can build the clienthello with multiple entries. */
-
-        if (SSL_set_tlsext_use_srtp(ssl, tlsext_srtp_multiple_profiles) != 0) {
-                FAIL("should be able to set SRTP to multiple profiles\n");
-                goto err;
-        }
-        if (!tlsext_srtp_clienthello_needs(ssl)) {
-                FAIL("clienthello should need SRTP by now\n");
-                goto err;
-        }
-
-        if (!tlsext_srtp_clienthello_build(ssl, &cbb)) {
-                FAIL("clienthello failed to build SRTP\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_srtp_multiple)) {
-                FAIL("got clienthello SRTP with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_srtp_multiple));
-                compare_data(data, dlen, tlsext_srtp_multiple,
-                    sizeof(tlsext_srtp_multiple));
-                goto err;
-        }
-        if (memcmp(data, tlsext_srtp_multiple, dlen) != 0) {
-                FAIL("clienthello SRTP differs:\n");
-                compare_data(data, dlen, tlsext_srtp_multiple,
-                    sizeof(tlsext_srtp_multiple));
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        /* Make sure we can parse multiple profiles (selects server preferred) */
-
-        ssl->internal->srtp_profile = NULL;
-
-        CBS_init(&cbs, tlsext_srtp_multiple,
-            sizeof(tlsext_srtp_multiple));
-        if (!tlsext_srtp_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse SRTP\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if ((prof = SSL_get_selected_srtp_profile(ssl)) == NULL) {
-                FAIL("SRTP profile should be set now\n");
-                goto err;
-        }
-        if (strcmp(prof->name, tlsext_srtp_aes128cmsha80) != 0) {
-                FAIL("SRTP profile was not set properly\n");
-                goto err;
-        }
-
-        if (!tlsext_srtp_serverhello_needs(ssl)) {
-                FAIL("should send server extension when profile selected\n");
-                goto err;
-        }
-
-        /*
-         * Make sure we can parse the clienthello with multiple entries
-         * where one is unknown.
-         */
-        ssl->internal->srtp_profile = NULL;
-
-        CBS_init(&cbs, tlsext_srtp_multiple_one_valid,
-            sizeof(tlsext_srtp_multiple_one_valid));
-        if (!tlsext_srtp_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse SRTP\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if ((prof = SSL_get_selected_srtp_profile(ssl)) == NULL) {
-                FAIL("SRTP profile should be set now\n");
-                goto err;
-        }
-        if (strcmp(prof->name, tlsext_srtp_aes128cmsha32) != 0) {
-                FAIL("SRTP profile was not set properly\n");
-                goto err;
-        }
-
-        if (!tlsext_srtp_serverhello_needs(ssl)) {
-                FAIL("should send server extension when profile selected\n");
-                goto err;
-        }
-
-        /* Make sure we fall back to negotiated when none work. */
-
-        ssl->internal->srtp_profile = NULL;
-
-        CBS_init(&cbs, tlsext_srtp_multiple_invalid,
-            sizeof(tlsext_srtp_multiple_invalid));
-        if (!tlsext_srtp_clienthello_parse(ssl, &cbs, &alert)) {
-                FAIL("should be able to fall back to negotiated\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        /* If we fallback, the server should NOT send the extension. */
-        if (SSL_get_selected_srtp_profile(ssl) != NULL) {
-                FAIL("should not have selected a profile when none found\n");
-                goto err;
-        }
-        if (tlsext_srtp_serverhello_needs(ssl)) {
-                FAIL("should not send server tlsext when no profile found\n");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-static int
-test_tlsext_srtp_serverhello(void)
-{
-        SRTP_PROTECTION_PROFILE *prof;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        uint8_t *data = NULL;
-        CBB cbb;
-        CBS cbs;
-        int failure, alert;
-        size_t dlen;
-
-        CBB_init(&cbb, 0);
-
-        failure = 1;
-
-        /* SRTP is for DTLS */
-        if ((ssl_ctx = SSL_CTX_new(DTLSv1_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        /* By default, we don't need this */
-        if (tlsext_srtp_serverhello_needs(ssl)) {
-                FAIL("serverhello should not need SRTP by default\n");
-                goto err;
-        }
-
-        if (srtp_find_profile_by_name((char *)tlsext_srtp_aes128cmsha80, &prof,
-            strlen(tlsext_srtp_aes128cmsha80))) {
-                FAIL("should be able to find the given profile\n");
-                goto err;
-        }
-        ssl->internal->srtp_profile = prof;
-        if (!tlsext_srtp_serverhello_needs(ssl)) {
-                FAIL("serverhello should need SRTP by now\n");
-                goto err;
-        }
-
-        /* Make sure we can build the serverhello with a single profile. */
-
-        if (!tlsext_srtp_serverhello_build(ssl, &cbb)) {
-                FAIL("serverhello failed to build SRTP\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_srtp_single)) {
-                FAIL("got serverhello SRTP with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_srtp_single));
-                compare_data(data, dlen, tlsext_srtp_single,
-                    sizeof(tlsext_srtp_single));
-                goto err;
-        }
-        if (memcmp(data, tlsext_srtp_single, dlen) != 0) {
-                FAIL("serverhello SRTP differs:\n");
-                compare_data(data, dlen, tlsext_srtp_single,
-                    sizeof(tlsext_srtp_single));
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-        free(data);
-        data = NULL;
-
-        /* Make sure we can parse the single profile. */
-        ssl->internal->srtp_profile = NULL;
-
-        if (SSL_get_selected_srtp_profile(ssl) != NULL) {
-                FAIL("SRTP profile should not be set yet\n");
-                goto err;
-        }
-
-        /* Setup the environment as if a client sent a list of profiles. */
-        if (SSL_set_tlsext_use_srtp(ssl, tlsext_srtp_multiple_profiles) != 0) {
-                FAIL("should be able to set multiple profiles in SRTP\n");
-                goto err;
-        }
-
-        CBS_init(&cbs, tlsext_srtp_single, sizeof(tlsext_srtp_single));
-        if (!tlsext_srtp_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("failed to parse SRTP\n");
-                goto err;
-        }
-        if (CBS_len(&cbs) != 0) {
-                FAIL("extension data remaining");
-                goto err;
-        }
-
-        if ((prof = SSL_get_selected_srtp_profile(ssl)) == NULL) {
-                FAIL("SRTP profile should be set now\n");
-                goto err;
-        }
-        if (strcmp(prof->name, tlsext_srtp_aes128cmsha80) != 0) {
-                FAIL("SRTP profile was not set properly\n");
-                goto err;
-        }
-
-        /* Make sure we cannot parse multiple profiles */
-        ssl->internal->srtp_profile = NULL;
-
-        CBS_init(&cbs, tlsext_srtp_multiple,
-            sizeof(tlsext_srtp_multiple));
-        if (tlsext_srtp_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("should not find multiple entries from the server\n");
-                goto err;
-        }
-
-        /* Make sure we cannot parse a serverhello with unknown profile */
-        ssl->internal->srtp_profile = NULL;
-
-        CBS_init(&cbs, tlsext_srtp_single_invalid,
-            sizeof(tlsext_srtp_single_invalid));
-        if (tlsext_srtp_serverhello_parse(ssl, &cbs, &alert)) {
-                FAIL("should not be able to parse this\n");
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-#endif /* OPENSSL_NO_SRTP */
-
-unsigned char tlsext_clienthello_default[] = {
-        0x00, 0x36, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00,
-        0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d,
-        0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
-        0x00, 0x0d, 0x00, 0x1c, 0x00, 0x1a, 0x06, 0x01,
-        0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x03,
-        0x04, 0x01, 0x04, 0x03, 0xee, 0xee, 0xed, 0xed,
-        0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
-};
-
-unsigned char tlsext_clienthello_disabled[] = {};
-
-static int
-test_tlsext_clienthello_build(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        size_t dlen;
-        int failure;
-        CBB cbb;
-
-        failure = 1;
-
-        if (!CBB_init(&cbb, 0))
-                errx(1, "failed to create CBB");
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-
-        if (!tlsext_clienthello_build(ssl, &cbb)) {
-                FAIL("failed to build clienthello extensions\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_clienthello_default)) {
-                FAIL("got clienthello extensions with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_clienthello_default));
-                compare_data(data, dlen, tlsext_clienthello_default,
-                    sizeof(tlsext_clienthello_default));
-                goto err;
-        }
-        if (memcmp(data, tlsext_clienthello_default, dlen) != 0) {
-                FAIL("clienthello extensions differs:\n");
-                compare_data(data, dlen, tlsext_clienthello_default,
-                    sizeof(tlsext_clienthello_default));
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-
-        /* Switch to TLSv1.1, disable EC ciphers and session tickets. */
-        ssl->client_version = TLS1_1_VERSION;
-        if (!SSL_set_cipher_list(ssl, "TLSv1.2:!ECDHE:!ECDSA")) {
-                FAIL("failed to set cipher list\n");
-                goto err;
-        }
-        if ((SSL_set_options(ssl, SSL_OP_NO_TICKET) & SSL_OP_NO_TICKET) == 0) {
-                FAIL("failed to disable session tickets");
-                return 0;
-        }
-
-        if (!tlsext_clienthello_build(ssl, &cbb)) {
-                FAIL("failed to build clienthello extensions\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_clienthello_disabled)) {
-                FAIL("got clienthello extensions with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_clienthello_disabled));
-                compare_data(data, dlen, tlsext_clienthello_disabled,
-                    sizeof(tlsext_clienthello_disabled));
-                goto err;
-        }
-        if (memcmp(data, tlsext_clienthello_disabled, dlen) != 0) {
-                FAIL("clienthello extensions differs:\n");
-                compare_data(data, dlen, tlsext_clienthello_disabled,
-                    sizeof(tlsext_clienthello_disabled));
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-unsigned char tlsext_serverhello_default[] = {};
-
-unsigned char tlsext_serverhello_enabled[] = {
-        0x00, 0x13, 0xff, 0x01, 0x00, 0x01, 0x00, 0x00,
-        0x05, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x02, 0x01,
-        0x00, 0x00, 0x23, 0x00, 0x00,
-};
-
-static int
-test_tlsext_serverhello_build(void)
-{
-        unsigned char *data = NULL;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        size_t dlen;
-        int failure;
-        CBB cbb;
-
-        failure = 1;
-
-        if (!CBB_init(&cbb, 0))
-                errx(1, "failed to create CBB");
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_server_method())) == NULL)
-                errx(1, "failed to create SSL_CTX");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL");
-        if ((ssl->session = SSL_SESSION_new()) == NULL)
-                errx(1, "failed to create session");
-
-        S3I(ssl)->hs.new_cipher =
-            ssl3_get_cipher_by_id(TLS1_CK_RSA_WITH_AES_128_SHA256);
-
-        if (!tlsext_serverhello_build(ssl, &cbb)) {
-                FAIL("failed to build serverhello extensions\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_serverhello_default)) {
-                FAIL("got serverhello extensions with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_serverhello_default));
-                compare_data(data, dlen, tlsext_serverhello_default,
-                    sizeof(tlsext_serverhello_default));
-                goto err;
-        }
-        if (memcmp(data, tlsext_serverhello_default, dlen) != 0) {
-                FAIL("serverhello extensions differs:\n");
-                compare_data(data, dlen, tlsext_serverhello_default,
-                    sizeof(tlsext_serverhello_default));
-                goto err;
-        }
-
-        CBB_cleanup(&cbb);
-        CBB_init(&cbb, 0);
-
-        /* Turn a few things on so we get extensions... */
-        S3I(ssl)->send_connection_binding = 1;
-        S3I(ssl)->hs.new_cipher =
-            ssl3_get_cipher_by_id(TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256);
-        ssl->internal->tlsext_status_expected = 1;
-        ssl->internal->tlsext_ticket_expected = 1;
-        if ((SSI(ssl)->tlsext_ecpointformatlist = malloc(1)) == NULL)
-                errx(1, "malloc failed");
-        SSI(ssl)->tlsext_ecpointformatlist_length = 1;
-        SSI(ssl)->tlsext_ecpointformatlist[0] =
-            TLSEXT_ECPOINTFORMAT_uncompressed;
-
-        if (!tlsext_serverhello_build(ssl, &cbb)) {
-                FAIL("failed to build serverhello extensions\n");
-                goto err;
-        }
-        if (!CBB_finish(&cbb, &data, &dlen))
-                errx(1, "failed to finish CBB");
-
-        if (dlen != sizeof(tlsext_serverhello_enabled)) {
-                FAIL("got serverhello extensions with length %zu, "
-                    "want length %zu\n", dlen,
-                    sizeof(tlsext_serverhello_enabled));
-                compare_data(data, dlen, tlsext_serverhello_enabled,
-                    sizeof(tlsext_serverhello_enabled));
-                goto err;
-        }
-        if (memcmp(data, tlsext_serverhello_enabled, dlen) != 0) {
-                FAIL("serverhello extensions differs:\n");
-                compare_data(data, dlen, tlsext_serverhello_enabled,
-                    sizeof(tlsext_serverhello_enabled));
-                goto err;
-        }
-
-        failure = 0;
-
- err:
-        CBB_cleanup(&cbb);
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-        free(data);
-
-        return (failure);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-
-        SSL_library_init();
-        SSL_load_error_strings();
-
-        failed |= test_tlsext_alpn_clienthello();
-        failed |= test_tlsext_alpn_serverhello();
-
-        failed |= test_tlsext_supportedgroups_clienthello();
-        failed |= test_tlsext_supportedgroups_serverhello();
-
-        failed |= test_tlsext_ecpf_clienthello();
-        failed |= test_tlsext_ecpf_serverhello();
-
-        failed |= test_tlsext_ri_clienthello();
-        failed |= test_tlsext_ri_serverhello();
-
-        failed |= test_tlsext_sigalgs_clienthello();
-        failed |= test_tlsext_sigalgs_serverhello();
-
-        failed |= test_tlsext_sni_clienthello();
-        failed |= test_tlsext_sni_serverhello();
-
-        failed |= test_tlsext_ocsp_clienthello();
-        failed |= test_tlsext_ocsp_serverhello();
-
-        failed |= test_tlsext_sessionticket_clienthello();
-        failed |= test_tlsext_sessionticket_serverhello();
-
-#ifndef OPENSSL_NO_SRTP
-        failed |= test_tlsext_srtp_clienthello();
-        failed |= test_tlsext_srtp_serverhello();
-#else
-        fprintf(stderr, "Skipping SRTP tests due to OPENSSL_NO_SRTP\n");
-#endif
-
-        failed |= test_tlsext_clienthello_build();
-        failed |= test_tlsext_serverhello_build();
-
-        return (failed);
-}
diff --git a/src/regress/lib/libssl/unit/Makefile b/src/regress/lib/libssl/unit/Makefile
deleted file mode 100644
index 6b8a397c07..0000000000
--- a/src/regress/lib/libssl/unit/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#       $OpenBSD: Makefile,v 1.9 2017/03/10 15:06:15 jsing Exp $
-
-TEST_CASES+= cipher_list
-TEST_CASES+= ssl_versions
-TEST_CASES+= tls_ext_alpn
-TEST_CASES+= tls_prf
-
-REGRESS_TARGETS= all_tests
-
-WARNINGS=       Yes
-LDLIBS=         ${SSL_INT} -lcrypto
-CFLAGS+=        -DLIBRESSL_INTERNAL -Wall -Wundef -Werror
-CFLAGS+=        -I${.CURDIR}/../../../../lib/libssl
-
-CLEANFILES+= ${TEST_CASES}
-
-all_tests: ${TEST_CASES}
-        @for test in $>; do \
-                ./$$test; \
-        done
-
-${TEST_CASES}: ${LIBSSL} ${LIBCRYPTO}
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/unit/cipher_list.c b/src/regress/lib/libssl/unit/cipher_list.c
deleted file mode 100644
index 70f547abd6..0000000000
--- a/src/regress/lib/libssl/unit/cipher_list.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*      $OpenBSD: cipher_list.c,v 1.9 2018/06/02 16:35:02 jsing Exp $   */
-/*
- * Copyright (c) 2015 Doug Hogan <doug@openbsd.org>
- * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Test TLS ssl bytes (aka cipher suites) to cipher list and back.
- *
- * TLSv1.0 - RFC 2246 section 7.4.1.2 (ClientHello struct)
- * TLSv1.1 - RFC 4346 section 7.4.1.2 (ClientHello struct)
- * TLSv1.2 - RFC 5246 section 7.4.1.2 (ClientHello struct)
- *
- * In all of these standards, the relevant structures are:
- *
- * uint8 CipherSuite[2];
- *
- * struct {
- *    ...
- *    CipherSuite cipher_suites<2..2^16-2>
- *    ...
- * } ClientHello;
- */
-
-#include <openssl/ssl.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include "ssl_locl.h"
-
-#include "tests.h"
-
-static uint8_t cipher_bytes[] = {
-        0xcc, 0xa8,     /* ECDHE-ECDSA-CHACHA20-POLY1305 */
-        0xcc, 0xa9,     /* ECDHE-RSA-CHACHA20-POLY1305 */
-        0xcc, 0xaa,     /* DHE-RSA-CHACHA20-POLY1305 */
-        0x00, 0x9c,     /* AES128-GCM-SHA256 */
-        0x00, 0x3d,     /* AES256-SHA256 */
-};
-
-static uint16_t cipher_values[] = {
-        0xcca8,         /* ECDHE-ECDSA-CHACHA20-POLY1305 */
-        0xcca9,         /* ECDHE-RSA-CHACHA20-POLY1305 */
-        0xccaa,         /* DHE-RSA-CHACHA20-POLY1305 */
-        0x009c,         /* AES128-GCM-SHA256 */
-        0x003d,         /* AES256-SHA256 */
-};
-
-#define N_CIPHERS (sizeof(cipher_bytes) / 2)
-
-static int
-ssl_bytes_to_list_alloc(SSL *s, STACK_OF(SSL_CIPHER) **ciphers)
-{
-        SSL_CIPHER *cipher;
-        uint16_t value;
-        CBS cbs;
-        int i;
-
-        CBS_init(&cbs, cipher_bytes, sizeof(cipher_bytes));
-
-        *ciphers = ssl_bytes_to_cipher_list(s, &cbs);
-        CHECK(*ciphers != NULL);
-        CHECK(sk_SSL_CIPHER_num(*ciphers) == N_CIPHERS);
-        for (i = 0; i < sk_SSL_CIPHER_num(*ciphers); i++) {
-                cipher = sk_SSL_CIPHER_value(*ciphers, i);
-                CHECK(cipher != NULL);
-                value = SSL_CIPHER_get_value(cipher);
-                CHECK(value == cipher_values[i]);
-        }
-
-        return 1;
-}
-
-static int
-ssl_list_to_bytes_scsv(SSL *s, STACK_OF(SSL_CIPHER) **ciphers)
-{
-        CBB cbb;
-        unsigned char *buf = NULL;
-        size_t buflen, outlen;
-        int ret = 0;
-
-        /* Space for cipher bytes, plus reneg SCSV and two spare bytes. */
-        CHECK(sk_SSL_CIPHER_num(*ciphers) == N_CIPHERS);
-        buflen = sizeof(cipher_bytes) + 2 + 2;
-        CHECK((buf = calloc(1, buflen)) != NULL);
-
-        CHECK(CBB_init_fixed(&cbb, buf, buflen));
-        CHECK(ssl_cipher_list_to_bytes(s, *ciphers, &cbb));
-        CHECK(CBB_finish(&cbb, NULL, &outlen));
-
-        CHECK_GOTO(outlen > 0 && outlen == buflen - 2);
-        CHECK_GOTO(memcmp(buf, cipher_bytes, sizeof(cipher_bytes)) == 0);
-        CHECK_GOTO(buf[buflen - 4] == 0x00 && buf[buflen - 3] == 0xff);
-        CHECK_GOTO(buf[buflen - 2] == 0x00 && buf[buflen - 1] == 0x00);
-
-        ret = 1;
-
-err:
-        free(buf);
-        return ret;
-}
-
-static int
-ssl_list_to_bytes_no_scsv(SSL *s, STACK_OF(SSL_CIPHER) **ciphers)
-{
-        CBB cbb;
-        unsigned char *buf = NULL;
-        size_t buflen, outlen;
-        int ret = 0;
-
-        /* Space for cipher bytes and two spare bytes */
-        CHECK(sk_SSL_CIPHER_num(*ciphers) == N_CIPHERS);
-        buflen = sizeof(cipher_bytes) + 2;
-        CHECK((buf = calloc(1, buflen)) != NULL);
-        buf[buflen - 2] = 0xfe;
-        buf[buflen - 1] = 0xab;
-
-        /* Set renegotiate so it doesn't add SCSV */
-        s->internal->renegotiate = 1;
-
-        CHECK(CBB_init_fixed(&cbb, buf, buflen));
-        CHECK(ssl_cipher_list_to_bytes(s, *ciphers, &cbb));
-        CHECK(CBB_finish(&cbb, NULL, &outlen));
-
-        CHECK_GOTO(outlen > 0 && outlen == buflen - 2);
-        CHECK_GOTO(memcmp(buf, cipher_bytes, sizeof(cipher_bytes)) == 0);
-        CHECK_GOTO(buf[buflen - 2] == 0xfe && buf[buflen - 1] == 0xab);
-
-        ret = 1;
-
-err:
-        free(buf);
-        return ret;
-}
-
-static int
-ssl_bytes_to_list_invalid(SSL *s, STACK_OF(SSL_CIPHER) **ciphers)
-{
-        uint8_t empty_cipher_bytes[] = {0};
-        CBS cbs;
-
-        sk_SSL_CIPHER_free(*ciphers);
-
-        /* Invalid length: CipherSuite is 2 bytes so it must be even */
-        CBS_init(&cbs, cipher_bytes, sizeof(cipher_bytes) - 1);
-        *ciphers = ssl_bytes_to_cipher_list(s, &cbs);
-        CHECK(*ciphers == NULL);
-
-        /* Invalid length: cipher_suites must be at least 2 */
-        CBS_init(&cbs, empty_cipher_bytes, sizeof(empty_cipher_bytes));
-        *ciphers = ssl_bytes_to_cipher_list(s, &cbs);
-        CHECK(*ciphers == NULL);
-
-        return 1;
-}
-
-int
-main(void)
-{
-        STACK_OF(SSL_CIPHER) *ciphers = NULL;
-        SSL_CTX *ctx = NULL;
-        SSL *s = NULL;
-        int rv = 1;
-
-        SSL_library_init();
-
-        /* Use TLSv1.2 client to get all ciphers. */
-        CHECK_GOTO((ctx = SSL_CTX_new(TLSv1_2_client_method())) != NULL);
-        CHECK_GOTO((s = SSL_new(ctx)) != NULL);
-
-        if (!ssl_bytes_to_list_alloc(s, &ciphers))
-                goto err;
-        if (!ssl_list_to_bytes_scsv(s, &ciphers))
-                goto err;
-        if (!ssl_list_to_bytes_no_scsv(s, &ciphers))
-                goto err;
-        if (!ssl_bytes_to_list_invalid(s, &ciphers))
-                goto err;
-
-        rv = 0;
-
-err:
-        sk_SSL_CIPHER_free(ciphers);
-        SSL_CTX_free(ctx);
-        SSL_free(s);
-
-        if (!rv)
-                printf("PASS %s\n", __FILE__);
-        
-        return rv;
-}
diff --git a/src/regress/lib/libssl/unit/ssl_versions.c b/src/regress/lib/libssl/unit/ssl_versions.c
deleted file mode 100644
index 11519c3732..0000000000
--- a/src/regress/lib/libssl/unit/ssl_versions.c
+++ /dev/null
@@ -1,797 +0,0 @@
-/* $OpenBSD: ssl_versions.c,v 1.6 2018/11/06 01:40:57 jsing Exp $ */
-/*
- * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/ssl.h>
-
-#include "ssl_locl.h"
-
-struct version_range_test {
-        const long options;
-        const uint16_t minver;
-        const uint16_t maxver;
-        const uint16_t want_minver;
-        const uint16_t want_maxver;
-};
-
-static struct version_range_test version_range_tests[] = {
-        {
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_3_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1_3,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1_1,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_2_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 |
-                    SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = 0,
-                .want_maxver = 0,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 |
-                    SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = TLS1_3_VERSION,
-                .want_maxver = TLS1_3_VERSION,
-        },
-        {
-                .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 |
-                    SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = 0,
-                .want_maxver = 0,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_2_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_2_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_3_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_1_VERSION,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = TLS1_1_VERSION,
-                .want_maxver = TLS1_3_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_2_VERSION,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = TLS1_2_VERSION,
-                .want_maxver = TLS1_3_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_3_VERSION,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = TLS1_3_VERSION,
-                .want_maxver = TLS1_3_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_1_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-};
-
-#define N_VERSION_RANGE_TESTS \
-    (sizeof(version_range_tests) / sizeof(*version_range_tests))
-
-static int
-test_ssl_enabled_version_range(void)
-{
-        struct version_range_test *vrt;
-        uint16_t minver, maxver;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failed = 1;
-        size_t i;
-
-        if ((ssl_ctx = SSL_CTX_new(TLS_method())) == NULL) { 
-                fprintf(stderr, "SSL_CTX_new() returned NULL\n");
-                goto failure;
-        }
-        if ((ssl = SSL_new(ssl_ctx)) == NULL) {
-                fprintf(stderr, "SSL_new() returned NULL\n");
-                goto failure;
-        }
-
-        failed = 0;
-
-        for (i = 0; i < N_VERSION_RANGE_TESTS; i++) {
-                vrt = &version_range_tests[i];
-
-                SSL_clear_options(ssl, SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 |
-                    SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3);
-                SSL_set_options(ssl, vrt->options);
-
-                minver = maxver = 0xffff;
-                ssl->internal->min_version = vrt->minver;
-                ssl->internal->max_version = vrt->maxver;
-
-                if (ssl_enabled_version_range(ssl, &minver, &maxver) != 1) {
-                        if (vrt->want_minver != 0 || vrt->want_maxver != 0) {
-                                fprintf(stderr, "FAIL: test %zu - failed but "
-                                    "wanted non-zero versions\n", i);
-                                failed++;
-                        }
-                        continue;
-                }
-                if (minver != vrt->want_minver) {
-                        fprintf(stderr, "FAIL: test %zu - got minver %x, "
-                            "want %x\n", i, minver, vrt->want_minver);
-                        failed++;
-                }
-                if (maxver != vrt->want_maxver) {
-                        fprintf(stderr, "FAIL: test %zu - got maxver %x, "
-                            "want %x\n", i, maxver, vrt->want_maxver);
-                        failed++;
-                }
-        }
-
- failure:
-        SSL_CTX_free(ssl_ctx);
-        SSL_free(ssl);
-
-        return (failed);
-}
-
-struct shared_version_test {
-        const SSL_METHOD *(*ssl_method)(void);
-        const long options;
-        const uint16_t minver;
-        const uint16_t maxver;
-        const uint16_t peerver;
-        const uint16_t want_maxver;
-};
-
-static struct shared_version_test shared_version_tests[] = {
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = SSL2_VERSION,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = SSL3_VERSION,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_2_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_3_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = 0x7f12,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_2_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_2_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_2_VERSION,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = SSL_OP_NO_TLSv1,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_1_VERSION,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_1_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = SSL_OP_NO_TLSv1,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_VERSION,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_1_VERSION,
-                .peerver = TLS1_2_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_VERSION,
-                .peerver = TLS1_2_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-        {
-                .ssl_method = TLSv1_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-        {
-                .ssl_method = TLSv1_method,
-                .options = 0,
-                .minver = TLS1_1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_VERSION,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLSv1_1_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .ssl_method = DTLSv1_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = DTLS1_VERSION,
-                .want_maxver = DTLS1_VERSION,
-        },
-        {
-                .ssl_method = DTLSv1_method,
-                .options = 0,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .peerver = TLS1_2_VERSION,
-                .want_maxver = 0,
-        },
-};
-
-#define N_SHARED_VERSION_TESTS \
-    (sizeof(shared_version_tests) / sizeof(*shared_version_tests))
-
-static int
-test_ssl_max_shared_version(void)
-{
-        struct shared_version_test *svt;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        uint16_t maxver;
-        int failed = 0;
-        size_t i;
-
-        failed = 0;
-
-        for (i = 0; i < N_SHARED_VERSION_TESTS; i++) {
-                svt = &shared_version_tests[i];
-
-                if ((ssl_ctx = SSL_CTX_new(svt->ssl_method())) == NULL) { 
-                        fprintf(stderr, "SSL_CTX_new() returned NULL\n");
-                        return 1;
-                }
-                if ((ssl = SSL_new(ssl_ctx)) == NULL) {
-                        fprintf(stderr, "SSL_new() returned NULL\n");
-                        return 1;
-                }
-
-                SSL_clear_options(ssl, SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 |
-                    SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3);
-                SSL_set_options(ssl, svt->options);
-
-                maxver = 0;
-                ssl->internal->min_version = svt->minver;
-                ssl->internal->max_version = svt->maxver;
-
-                if (ssl_max_shared_version(ssl, svt->peerver, &maxver) != 1) {
-                        if (svt->want_maxver != 0) {
-                                fprintf(stderr, "FAIL: test %zu - failed but "
-                                    "wanted non-zero shared version\n", i);
-                                failed++;
-                        }
-                        continue;
-                }
-                if (maxver != svt->want_maxver) {
-                        fprintf(stderr, "FAIL: test %zu - got shared "
-                            "version %x, want %x\n", i, maxver,
-                            svt->want_maxver);
-                        failed++;
-                }
-
-                SSL_CTX_free(ssl_ctx);
-                SSL_free(ssl);
-        }
-
-        return (failed);
-}
-
-struct min_max_version_test {
-        const SSL_METHOD *(*ssl_method)(void);
-        const uint16_t minver;
-        const uint16_t maxver;
-        const uint16_t want_minver;
-        const uint16_t want_maxver;
-};
-
-static struct min_max_version_test min_max_version_tests[] = {
-        {
-                .ssl_method = TLS_method,
-                .minver = 0,
-                .maxver = 0,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = TLS1_VERSION,
-                .maxver = 0,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = 0,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = 0,
-                .maxver = TLS1_3_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = TLS1_1_VERSION,
-                .maxver = 0,
-                .want_minver = TLS1_1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = TLS1_2_VERSION,
-                .maxver = 0,
-                .want_minver = TLS1_2_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = 0x0300,
-                .maxver = 0,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = 0x0305,
-                .maxver = 0,
-                .want_minver = 0,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = 0,
-                .maxver = 0x0305,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_2_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = 0,
-                .maxver = TLS1_1_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = 0,
-                .maxver = TLS1_VERSION,
-                .want_minver = TLS1_VERSION,
-                .want_maxver = TLS1_VERSION,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = 0,
-                .maxver = 0x0300,
-                .want_minver = 0,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLS_method,
-                .minver = TLS1_2_VERSION,
-                .maxver = TLS1_1_VERSION,
-                .want_minver = TLS1_2_VERSION,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLSv1_1_method,
-                .minver = 0,
-                .maxver = 0,
-                .want_minver = TLS1_1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .ssl_method = TLSv1_1_method,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = TLS1_1_VERSION,
-                .want_maxver = TLS1_1_VERSION,
-        },
-        {
-                .ssl_method = TLSv1_1_method,
-                .minver = TLS1_2_VERSION,
-                .maxver = 0,
-                .want_minver = 0,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = TLSv1_1_method,
-                .minver = 0,
-                .maxver = TLS1_VERSION,
-                .want_minver = 0,
-                .want_maxver = 0,
-        },
-        {
-                .ssl_method = DTLSv1_method,
-                .minver = 0,
-                .maxver = 0,
-                .want_minver = DTLS1_VERSION,
-                .want_maxver = DTLS1_VERSION,
-        },
-        {
-                .ssl_method = DTLSv1_method,
-                .minver = DTLS1_VERSION,
-                .maxver = 0,
-                .want_minver = DTLS1_VERSION,
-                .want_maxver = DTLS1_VERSION,
-        },
-        {
-                .ssl_method = DTLSv1_method,
-                .minver = 0,
-                .maxver = DTLS1_VERSION,
-                .want_minver = DTLS1_VERSION,
-                .want_maxver = DTLS1_VERSION,
-        },
-        {
-                .ssl_method = DTLSv1_method,
-                .minver = TLS1_VERSION,
-                .maxver = TLS1_2_VERSION,
-                .want_minver = 0,
-                .want_maxver = 0,
-        },
-};
-
-#define N_MIN_MAX_VERSION_TESTS \
-    (sizeof(min_max_version_tests) / sizeof(*min_max_version_tests))
-
-static int
-test_ssl_min_max_version(void)
-{
-        struct min_max_version_test *mmvt;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failed = 0;
-        size_t i;
-
-        failed = 0;
-
-        for (i = 0; i < N_SHARED_VERSION_TESTS; i++) {
-                mmvt = &min_max_version_tests[i];
-
-                if ((ssl_ctx = SSL_CTX_new(mmvt->ssl_method())) == NULL) { 
-                        fprintf(stderr, "SSL_CTX_new() returned NULL\n");
-                        return 1;
-                }
-
-                if (SSL_CTX_set_min_proto_version(ssl_ctx, mmvt->minver) != 1) {
-                        if (mmvt->want_minver != 0) {
-                                fprintf(stderr, "FAIL: test %zu - failed to set "
-                                    "SSL_CTX min version\n", i);
-                                failed++;
-                        }
-                        goto next;
-                }
-                if (SSL_CTX_set_max_proto_version(ssl_ctx, mmvt->maxver) != 1) {
-                        if (mmvt->want_maxver != 0) {
-                                fprintf(stderr, "FAIL: test %zu - failed to set "
-                                    "SSL_CTX min version\n", i);
-                                failed++;
-                        }
-                        goto next;
-                }
-
-                if (mmvt->want_minver == 0) {
-                        fprintf(stderr, "FAIL: test %zu - successfully set "
-                            "SSL_CTX min version, should have failed\n", i);
-                        goto next;
-                }
-                if (mmvt->want_maxver == 0) {
-                        fprintf(stderr, "FAIL: test %zu - successfully set "
-                            "SSL_CTX max version, should have failed\n", i);
-                        goto next;
-                }
-
-                if (SSL_CTX_get_min_proto_version(ssl_ctx) != mmvt->want_minver) {
-                        fprintf(stderr, "FAIL: test %zu - got SSL_CTX min "
-                            "version 0x%x, want 0x%x\n", i,
-                            SSL_CTX_get_min_proto_version(ssl_ctx), mmvt->want_minver);
-                        goto next;
-                }
-                if (SSL_CTX_get_max_proto_version(ssl_ctx) != mmvt->want_maxver) {
-                        fprintf(stderr, "FAIL: test %zu - got SSL_CTX max "
-                            "version 0x%x, want 0x%x\n", i,
-                            SSL_CTX_get_max_proto_version(ssl_ctx), mmvt->want_maxver);
-                        goto next;
-                }
-
-                if ((ssl = SSL_new(ssl_ctx)) == NULL) {
-                        fprintf(stderr, "SSL_new() returned NULL\n");
-                        return 1;
-                }
-
-                if (SSL_get_min_proto_version(ssl) != mmvt->want_minver) {
-                        fprintf(stderr, "FAIL: test %zu - initial SSL min "
-                            "version 0x%x, want 0x%x\n", i,
-                            SSL_get_min_proto_version(ssl), mmvt->want_minver);
-                        goto next;
-                }
-                if (SSL_get_max_proto_version(ssl) != mmvt->want_maxver) {
-                        fprintf(stderr, "FAIL: test %zu - initial SSL max "
-                            "version 0x%x, want 0x%x\n", i,
-                            SSL_get_max_proto_version(ssl), mmvt->want_maxver);
-                        goto next;
-                }
-
-                if (SSL_set_min_proto_version(ssl, mmvt->minver) != 1) {
-                        if (mmvt->want_minver != 0) {
-                                fprintf(stderr, "FAIL: test %zu - failed to set "
-                                    "SSL min version\n", i);
-                                failed++;
-                        }
-                        goto next;
-                }
-                if (SSL_set_max_proto_version(ssl, mmvt->maxver) != 1) {
-                        if (mmvt->want_maxver != 0) {
-                                fprintf(stderr, "FAIL: test %zu - failed to set "
-                                    "SSL min version\n", i);
-                                failed++;
-                        }
-                        goto next;
-                }
-
-                if (mmvt->want_minver == 0) {
-                        fprintf(stderr, "FAIL: test %zu - successfully set SSL "
-                            "min version, should have failed\n", i);
-                        goto next;
-                }
-                if (mmvt->want_maxver == 0) {
-                        fprintf(stderr, "FAIL: test %zu - successfully set SSL "
-                            "max version, should have failed\n", i);
-                        goto next;
-                }
-
-                if (SSL_get_min_proto_version(ssl) != mmvt->want_minver) {
-                        fprintf(stderr, "FAIL: test %zu - got SSL min "
-                            "version 0x%x, want 0x%x\n", i,
-                            SSL_get_min_proto_version(ssl), mmvt->want_minver);
-                        goto next;
-                }
-                if (SSL_get_max_proto_version(ssl) != mmvt->want_maxver) {
-                        fprintf(stderr, "FAIL: test %zu - got SSL max "
-                            "version 0x%x, want 0x%x\n", i,
-                            SSL_get_max_proto_version(ssl), mmvt->want_maxver);
-                        goto next;
-                }
-
- next:
-                SSL_CTX_free(ssl_ctx);
-                SSL_free(ssl);
-
-                ssl_ctx = NULL;
-                ssl = NULL;
-        }
-
-        return (failed);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-
-        SSL_library_init();
-
-        /* XXX - Test ssl_supported_version_range() */
-
-        failed |= test_ssl_enabled_version_range();
-        failed |= test_ssl_max_shared_version();
-        failed |= test_ssl_min_max_version();
-
-        if (failed == 0)
-                printf("PASS %s\n", __FILE__);
-
-        return (failed);
-}
diff --git a/src/regress/lib/libssl/unit/tests.h b/src/regress/lib/libssl/unit/tests.h
deleted file mode 100644
index 287816946a..0000000000
--- a/src/regress/lib/libssl/unit/tests.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*      $OpenBSD: tests.h,v 1.1 2015/06/27 23:35:52 doug Exp $  */
-/*
- * Copyright (c) 2015 Doug Hogan <doug@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef LIBRESSL_REGRESS_TESTS_H__
-#define LIBRESSL_REGRESS_TESTS_H__ 1
-
-/* Ugly macros that are useful for regression tests. */
-
-#define SKIP(a) do {                                                    \
-        printf("Skipping test in %s [%s:%d]\n", __func__, __FILE__,     \
-            __LINE__);                                                  \
-} while (0)
-
-#define CHECK(a) do {                                                   \
-        if (!(a)) {                                                     \
-                printf("Error in %s [%s:%d]\n", __func__, __FILE__,     \
-                    __LINE__);                                          \
-                return 0;                                               \
-        }                                                               \
-} while (0)
-
-#define CHECK_GOTO(a) do {                                              \
-        if (!(a)) {                                                     \
-                printf("Error in %s [%s:%d]\n", __func__, __FILE__,     \
-                    __LINE__);                                          \
-                goto err;                                               \
-        }                                                               \
-} while (0)
-
-#endif /* LIBRESSL_REGRESS_TESTS_H__ */
diff --git a/src/regress/lib/libssl/unit/tls_ext_alpn.c b/src/regress/lib/libssl/unit/tls_ext_alpn.c
deleted file mode 100644
index 7dec1bfc51..0000000000
--- a/src/regress/lib/libssl/unit/tls_ext_alpn.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*      $OpenBSD: tls_ext_alpn.c,v 1.5 2018/02/08 11:31:00 jsing Exp $  */
-/*
- * Copyright (c) 2015 Doug Hogan <doug@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Test TLS extension Application-Layer Protocol Negotiation (RFC 7301).
- */
-#include <stdio.h>
-#include <openssl/ssl.h>
-
-#include "ssl_locl.h"
-#include "ssl_tlsext.h"
-
-#include "tests.h"
-
-/*
- * In the ProtocolNameList, ProtocolNames must not include empty strings and
- * byte strings must not be truncated.
- *
- * This uses some of the IANA approved protocol names from:
- * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
- */
-
-/* Valid for client and server since it only has one name. */
-static uint8_t proto_single[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0f, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x0b, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x09, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31
-};
-
-/* Valid for client, but NOT server.  Server must have exactly one name. */
-static uint8_t proto_multiple1[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x19, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x15, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x13, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31,
-        /* opaque ProtocolName<1..2^8-1> -- 'stun.nat' */
-        0x09, /* len */
-        0x73, 0x74, 0x75, 0x6e, 0x2e, 0x74, 0x75, 0x72, 0x6e
-};
-
-/* Valid for client, but NOT server.  Server must have exactly one name. */
-static uint8_t proto_multiple2[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x1c, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x18, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x16, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31,
-        /* opaque ProtocolName<1..2^8-1> -- 'h2' */
-        0x02, /* len */
-        0x68, 0x32,
-        /* opaque ProtocolName<1..2^8-1> -- 'stun.nat' */
-        0x09, /* len */
-        0x73, 0x74, 0x75, 0x6e, 0x2e, 0x74, 0x75, 0x72, 0x6e
-};
-
-/* Valid for client, but NOT server.  Server must have exactly one name. */
-static uint8_t proto_multiple3[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x20, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x1c, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x1a, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31,
-        /* opaque ProtocolName<1..2^8-1> -- 'h2' */
-        0x02, /* len */
-        0x68, 0x32,
-        /* opaque ProtocolName<1..2^8-1> -- 'stun.nat' */
-        0x09, /* len */
-        0x73, 0x74, 0x75, 0x6e, 0x2e, 0x74, 0x75, 0x72, 0x6e,
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x03, /* len */
-        0x68, 0x32, 0x63
-};
-
-static uint8_t proto_empty[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions. */
-        0x00, 0x00, /* none present. */
-};
-
-/* Invalid for both client and server.  Length is wrong. */
-static uint8_t proto_invalid_len1[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x06, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x04, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x04, /* XXX len too large */
-        0x68, 0x32, 0x63
-};
-static uint8_t proto_invalid_len2[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x06, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x04, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x02, /* XXX len too small */
-        0x68, 0x32, 0x63
-};
-static uint8_t proto_invalid_len3[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x06, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x03, /* XXX len too small */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x03, /* len */
-        0x68, 0x32, 0x63
-};
-static uint8_t proto_invalid_len4[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x06, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x06, /* XXX len too large */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x03, /* len */
-        0x68, 0x32, 0x63
-};
-static uint8_t proto_invalid_len5[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x01, 0x08, /* XXX len too large */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x04, /* len */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x03, /* len */
-        0x68, 0x32, 0x63
-};
-static uint8_t proto_invalid_len6[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x05, /* XXX len too small */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x04, /* len */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x03, /* len */
-        0x68, 0x32, 0x63
-};
-static uint8_t proto_invalid_len7[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x06, /* XXX len too small */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x06, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x04, /* len */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x03, /* len */
-        0x68, 0x32, 0x63
-};
-static uint8_t proto_invalid_len8[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0b, /* XXX len too large */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x06, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x04, /* len */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        0x03, /* len */
-        0x68, 0x32, 0x63
-};
-
-/* Invalid for client and server since it is missing data. */
-static uint8_t proto_invalid_missing1[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x06, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x04, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'h2c' */
-        /* XXX missing */
-};
-static uint8_t proto_invalid_missing2[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x00, /* XXX missing name list */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-};
-static uint8_t proto_invalid_missing3[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x02, /* XXX size is sufficient but missing data for name list */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-};
-static uint8_t proto_invalid_missing4[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x0a, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        /* XXX missing */
-};
-static uint8_t proto_invalid_missing5[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x1c, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x18, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x16, /* len of all names */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x08, /* len */
-        0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31,
-        /* opaque ProtocolName<1..2^8-1> -- 'h2' */
-        0x02, /* len */
-        0x68, 0x32,
-        /* XXX missing name */
-};
-static uint8_t proto_invalid_missing6[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x07, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x03, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x01, /* XXX len must be at least 2 */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x00, /* XXX len cannot be 0 */
-};
-static uint8_t proto_invalid_missing7[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x07, /* len */
-        /* ExtensionType extension_type */
-        0x00, 0x10, /* ALPN */
-        /* opaque extension_data<0..2^16-1> */
-        0x00, 0x03, /* len */
-        /* ProtocolName protocol_name_list<2..2^16-1> -- ALPN names */
-        0x00, 0x02, /* XXX len is at least 2 but not correct. */
-        /* opaque ProtocolName<1..2^8-1> -- 'http/1.1' */
-        0x00, /* XXX len cannot be 0 */
-};
-static uint8_t proto_invalid_missing8[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x00, 0x01, /* len */
-        /* ExtensionType extension_type */
-        0x00, /* XXX need a 2 byte type */
-};
-static uint8_t proto_invalid_missing9[] = {
-        /* Extension extensions<0..2^16-1> -- All TLS extensions */
-        0x0a, /* XXX need a 2 byte len */
-};
-
-
-#define CHECK_BOTH(c_val, s_val, proto) do {                            \
-        {                                                               \
-                CBS cbs;                                                \
-                int al;                                                 \
-                                                                        \
-                CBS_init(&cbs, proto, sizeof(proto));                   \
-                CHECK(c_val == tlsext_clienthello_parse(s, &cbs, &al)); \
-                CBS_init(&cbs, proto, sizeof(proto));                   \
-                CHECK(s_val == tlsext_serverhello_parse(s, &cbs, &al)); \
-        }                                                               \
-} while (0)
-
-static int dummy_alpn_cb(SSL *ssl, const unsigned char **out,
-    unsigned char *outlen, const unsigned char *in, unsigned int inlen,
-    void *arg);
-
-static int
-check_valid_alpn(SSL *s)
-{
-        const uint8_t str[] = {
-                0x08, /* len */
-                0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31 /* http/1.1 */
-        };
-
-        /* Setup in order to test ALPN. */
-        CHECK(! SSL_set_alpn_protos(s, str, 9));
-        SSL_CTX_set_alpn_select_cb(s->ctx, dummy_alpn_cb, NULL);
-
-        /* Prerequisites to test these. */
-        CHECK(s->internal->alpn_client_proto_list != NULL);
-        CHECK(s->ctx->internal->alpn_select_cb != NULL);
-        //CHECK(s->s3->tmp.finish_md_len == 0);
-
-        CHECK_BOTH(1, 1, proto_single);
-        CHECK_BOTH(1, 1, proto_empty);
-
-        /* Multiple protocol names are only valid for client */
-        CHECK_BOTH(1, 0, proto_multiple1);
-        CHECK_BOTH(1, 0, proto_multiple2);
-        CHECK_BOTH(1, 0, proto_multiple3);
-
-        return 1;
-}
-
-/*
- * Some of the IANA approved IDs from:
- * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
- */
-static int
-check_invalid_alpn(SSL *s)
-{
-        const uint8_t str[] = {
-                0x08, /* len */
-                0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31 /* http/1.1 */
-        };
-
-        /* Setup in order to test ALPN. */
-        CHECK(! SSL_set_alpn_protos(s, str, 9));
-        SSL_CTX_set_alpn_select_cb(s->ctx, dummy_alpn_cb, NULL);
-
-        /* Prerequisites to test these. */
-        CHECK(s->internal->alpn_client_proto_list != NULL);
-        CHECK(s->ctx->internal->alpn_select_cb != NULL);
-        //CHECK(s->s3->tmp.finish_md_len == 0);
-
-        /* None of these are valid for client or server */
-        CHECK_BOTH(0, 0, proto_invalid_len1);
-        CHECK_BOTH(0, 0, proto_invalid_len2);
-        CHECK_BOTH(0, 0, proto_invalid_len3);
-        CHECK_BOTH(0, 0, proto_invalid_len4);
-        CHECK_BOTH(0, 0, proto_invalid_len5);
-        CHECK_BOTH(0, 0, proto_invalid_len6);
-        CHECK_BOTH(0, 0, proto_invalid_len7);
-        CHECK_BOTH(0, 0, proto_invalid_len8);
-        CHECK_BOTH(0, 0, proto_invalid_missing1);
-        CHECK_BOTH(0, 0, proto_invalid_missing2);
-        CHECK_BOTH(0, 0, proto_invalid_missing3);
-        CHECK_BOTH(0, 0, proto_invalid_missing4);
-        CHECK_BOTH(0, 0, proto_invalid_missing5);
-        CHECK_BOTH(0, 0, proto_invalid_missing6);
-        CHECK_BOTH(0, 0, proto_invalid_missing7);
-        CHECK_BOTH(0, 0, proto_invalid_missing8);
-        CHECK_BOTH(0, 0, proto_invalid_missing9);
-
-        return 1;
-}
-
-int
-dummy_alpn_cb(SSL *ssl __attribute__((unused)), const unsigned char **out,
-    unsigned char *outlen, const unsigned char *in, unsigned int inlen,
-    void *arg __attribute__((unused)))
-{
-        *out = in;
-        *outlen = (unsigned char)inlen;
-
-        return 0;
-}
-
-int
-main(void)
-{
-        SSL_CTX *ctx = NULL;
-        SSL *s = NULL;
-        int rv = 1;
-
-        SSL_library_init();
-
-        CHECK_GOTO((ctx = SSL_CTX_new(TLSv1_2_client_method())) != NULL);
-        CHECK_GOTO((s = SSL_new(ctx)) != NULL);
-
-        if (!check_valid_alpn(s))
-                goto err;
-        if (!check_invalid_alpn(s))
-                goto err;
-
-        rv = 0;
-
-err:
-        SSL_CTX_free(ctx);
-        SSL_free(s);
-
-        if (!rv)
-                printf("PASS %s\n", __FILE__);
-        return rv;
-}
diff --git a/src/regress/lib/libssl/unit/tls_prf.c b/src/regress/lib/libssl/unit/tls_prf.c
deleted file mode 100644
index 2eacb12af3..0000000000
--- a/src/regress/lib/libssl/unit/tls_prf.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* $OpenBSD: tls_prf.c,v 1.4 2017/05/06 22:24:58 beck Exp $ */
-/*
- * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-
-#include "ssl_locl.h"
-
-int tls1_PRF(SSL *s, const unsigned char *secret, size_t secret_len,
-    const void *seed1, size_t seed1_len, const void *seed2, size_t seed2_len,
-    const void *seed3, size_t seed3_len, const void *seed4, size_t seed4_len,
-    const void *seed5, size_t seed5_len, unsigned char *out, size_t out_len);
-
-#define TLS_PRF_OUT_LEN 128
-
-struct tls_prf_test {
-        const unsigned char *desc;
-        const SSL_METHOD *(*ssl_method)(void);
-        const uint16_t cipher_value;
-        const unsigned char out[TLS_PRF_OUT_LEN];
-};
-
-static struct tls_prf_test tls_prf_tests[] = {
-        {
-                .desc = "MD5+SHA1",
-                .ssl_method = TLSv1_method,
-                .cipher_value = 0x0033,
-                .out = {
-                        0x03, 0xa1, 0xc1, 0x7d, 0x2c, 0xa5, 0x3d, 0xe8,
-                        0x9d, 0x59, 0x5e, 0x30, 0xf5, 0x71, 0xbb, 0x96,
-                        0xde, 0x5c, 0x8e, 0xdc, 0x25, 0x8a, 0x7c, 0x05,
-                        0x9f, 0x7d, 0x35, 0x29, 0x45, 0xae, 0x56, 0xad,
-                        0x9f, 0x57, 0x15, 0x5c, 0xdb, 0x83, 0x3a, 0xac,
-                        0x19, 0xa8, 0x2b, 0x40, 0x72, 0x38, 0x1e, 0xed,
-                        0xf3, 0x25, 0xde, 0x84, 0x84, 0xd8, 0xd1, 0xfc,
-                        0x31, 0x85, 0x81, 0x12, 0x55, 0x4d, 0x12, 0xb5,
-                        0xed, 0x78, 0x5e, 0xba, 0xc8, 0xec, 0x8d, 0x28,
-                        0xa1, 0x21, 0x1e, 0x6e, 0x07, 0xf1, 0xfc, 0xf5,
-                        0xbf, 0xe4, 0x8e, 0x8e, 0x97, 0x15, 0x93, 0x85,
-                        0x75, 0xdd, 0x87, 0x09, 0xd0, 0x4e, 0xe5, 0xd5,
-                        0x9e, 0x1f, 0xd6, 0x1c, 0x3b, 0xe9, 0xad, 0xba,
-                        0xe0, 0x16, 0x56, 0x62, 0x90, 0xd6, 0x82, 0x84,
-                        0xec, 0x8a, 0x22, 0xbe, 0xdc, 0x6a, 0x5e, 0x05,
-                        0x12, 0x44, 0xec, 0x60, 0x61, 0xd1, 0x8a, 0x66,
-                },
-        },
-        {
-                .desc = "GOST94",
-                .ssl_method = TLSv1_2_method,
-                .cipher_value = 0x0081,
-                .out = {
-                         0xcc, 0xd4, 0x89, 0x5f, 0x52, 0x08, 0x9b, 0xc7,
-                         0xf9, 0xb5, 0x83, 0x58, 0xe8, 0xc7, 0x71, 0x49,
-                         0x39, 0x99, 0x1f, 0x14, 0x8f, 0x85, 0xbe, 0x64,
-                         0xee, 0x40, 0x5c, 0xe7, 0x5f, 0x68, 0xaf, 0xf2,
-                         0xcd, 0x3a, 0x94, 0x52, 0x33, 0x53, 0x46, 0x7d,
-                         0xb6, 0xc5, 0xe1, 0xb8, 0xa4, 0x04, 0x69, 0x91,
-                         0x0a, 0x9c, 0x88, 0x86, 0xd9, 0x60, 0x63, 0xdd,
-                         0xd8, 0xe7, 0x2e, 0xee, 0xce, 0xe2, 0x20, 0xd8,
-                         0x9a, 0xfa, 0x9c, 0x63, 0x0c, 0x9c, 0xa1, 0x76,
-                         0xed, 0x78, 0x9a, 0x84, 0x70, 0xb4, 0xd1, 0x51,
-                         0x1f, 0xde, 0x44, 0xe8, 0x90, 0x21, 0x3f, 0xeb,
-                         0x05, 0xf4, 0x77, 0x59, 0xf3, 0xad, 0xdd, 0x34,
-                         0x3d, 0x3a, 0x7c, 0xd0, 0x59, 0x40, 0xe1, 0x3f,
-                         0x04, 0x4b, 0x8b, 0xd6, 0x95, 0x46, 0xb4, 0x9e,
-                         0x4c, 0x2d, 0xf7, 0xee, 0xbd, 0xbc, 0xcb, 0x5c,
-                         0x3a, 0x36, 0x0c, 0xd0, 0x27, 0xcb, 0x45, 0x06,
-                },
-        },
-        {
-                .desc = "SHA256 (via TLSv1.2)",
-                .ssl_method = TLSv1_2_method,
-                .cipher_value = 0x0033,
-                .out = {
-                         0x37, 0xa7, 0x06, 0x71, 0x6e, 0x19, 0x19, 0xda,
-                         0x23, 0x8c, 0xcc, 0xb4, 0x2f, 0x31, 0x64, 0x9d,
-                         0x05, 0x29, 0x1c, 0x33, 0x7e, 0x09, 0x1b, 0x0c,
-                         0x0e, 0x23, 0xc1, 0xb0, 0x40, 0xcc, 0x31, 0xf7,
-                         0x55, 0x66, 0x68, 0xd9, 0xa8, 0xae, 0x74, 0x75,
-                         0xf3, 0x46, 0xe9, 0x3a, 0x54, 0x9d, 0xe0, 0x8b,
-                         0x7e, 0x6c, 0x63, 0x1c, 0xfa, 0x2f, 0xfd, 0xc9,
-                         0xd3, 0xf1, 0xd3, 0xfe, 0x7b, 0x9e, 0x14, 0x95,
-                         0xb5, 0xd0, 0xad, 0x9b, 0xee, 0x78, 0x8c, 0x83,
-                         0x18, 0x58, 0x7e, 0xa2, 0x23, 0xc1, 0x8b, 0x62,
-                         0x94, 0x12, 0xcb, 0xb6, 0x60, 0x69, 0x32, 0xfe,
-                         0x98, 0x0e, 0x93, 0xb0, 0x8e, 0x5c, 0xfb, 0x6e,
-                         0xdb, 0x9a, 0xc2, 0x9f, 0x8c, 0x5c, 0x43, 0x19,
-                         0xeb, 0x4a, 0x52, 0xad, 0x62, 0x2b, 0xdd, 0x9f,
-                         0xa3, 0x74, 0xa6, 0x96, 0x61, 0x4d, 0x98, 0x40,
-                         0x63, 0xa6, 0xd4, 0xbb, 0x17, 0x11, 0x75, 0xed,
-                },
-        },
-        {
-                .desc = "SHA384",
-                .ssl_method = TLSv1_2_method,
-                .cipher_value = 0x009d,
-                .out = {
-                         0x00, 0x93, 0xc3, 0xfd, 0xa7, 0xbb, 0xdc, 0x5b,
-                         0x13, 0x3a, 0xe6, 0x8b, 0x1b, 0xac, 0xf3, 0xfb,
-                         0x3c, 0x9a, 0x78, 0xf6, 0x19, 0xf0, 0x13, 0x0f,
-                         0x0d, 0x01, 0x9d, 0xdf, 0x0a, 0x28, 0x38, 0xce,
-                         0x1a, 0x9b, 0x43, 0xbe, 0x56, 0x12, 0xa7, 0x16,
-                         0x58, 0xe1, 0x8a, 0xe4, 0xc5, 0xbb, 0x10, 0x4c,
-                         0x3a, 0xf3, 0x7f, 0xd3, 0xdb, 0xe4, 0xe0, 0x3d,
-                         0xcc, 0x83, 0xca, 0xf0, 0xf9, 0x69, 0xcc, 0x70,
-                         0x83, 0x32, 0xf6, 0xfc, 0x81, 0x80, 0x02, 0xe8,
-                         0x31, 0x1e, 0x7c, 0x3b, 0x34, 0xf7, 0x34, 0xd1,
-                         0xcf, 0x2a, 0xc4, 0x36, 0x2f, 0xe9, 0xaa, 0x7f,
-                         0x6d, 0x1f, 0x5e, 0x0e, 0x39, 0x05, 0x15, 0xe1,
-                         0xa2, 0x9a, 0x4d, 0x97, 0x8c, 0x62, 0x46, 0xf1,
-                         0x87, 0x65, 0xd8, 0xe9, 0x14, 0x11, 0xa6, 0x48,
-                         0xd7, 0x0e, 0x6e, 0x70, 0xad, 0xfb, 0x3f, 0x36,
-                         0x05, 0x76, 0x4b, 0xe4, 0x28, 0x50, 0x4a, 0xf2,
-                },
-        },
-        {
-                .desc = "STREEBOG256",
-                .ssl_method = TLSv1_2_method,
-                .cipher_value = 0xff87,
-                .out = {
-                        0x3e, 0x13, 0xb9, 0xeb, 0x85, 0x8c, 0xb4, 0x21,
-                        0x23, 0x40, 0x9b, 0x73, 0x04, 0x56, 0xe2, 0xff,
-                        0xce, 0x52, 0x1f, 0x82, 0x7f, 0x17, 0x5b, 0x80,
-                        0x23, 0x71, 0xca, 0x30, 0xdf, 0xfc, 0xdc, 0x2d,
-                        0xc0, 0xfc, 0x5d, 0x23, 0x5a, 0x54, 0x7f, 0xae,
-                        0xf5, 0x7d, 0x52, 0x1e, 0x86, 0x95, 0xe1, 0x2d,
-                        0x28, 0xe7, 0xbe, 0xd7, 0xd0, 0xbf, 0xa9, 0x96,
-                        0x13, 0xd0, 0x9c, 0x0c, 0x1c, 0x16, 0x05, 0xbb,
-                        0x26, 0xd7, 0x30, 0x39, 0xb9, 0x53, 0x28, 0x98,
-                        0x4f, 0x1b, 0x83, 0xc3, 0xce, 0x1c, 0x7c, 0x34,
-                        0xa2, 0xc4, 0x7a, 0x54, 0x16, 0xc6, 0xa7, 0x9e,
-                        0xed, 0x4b, 0x7b, 0x83, 0xa6, 0xae, 0xe2, 0x5b,
-                        0x96, 0xf5, 0x6c, 0xad, 0x1f, 0xa3, 0x83, 0xb2,
-                        0x84, 0x32, 0xed, 0xe3, 0x2c, 0xf6, 0xd4, 0x73,
-                        0x30, 0xef, 0x9d, 0xbe, 0xe7, 0x23, 0x9a, 0xbf,
-                        0x4d, 0x1c, 0xe7, 0xef, 0x3d, 0xea, 0x46, 0xe2,
-                },
-        },
-};
-
-#define N_TLS_PRF_TESTS \
-    (sizeof(tls_prf_tests) / sizeof(*tls_prf_tests))
-
-#define TLS_PRF_SEED1   "tls prf seed 1"
-#define TLS_PRF_SEED2   "tls prf seed 2"
-#define TLS_PRF_SEED3   "tls prf seed 3"
-#define TLS_PRF_SEED4   "tls prf seed 4"
-#define TLS_PRF_SEED5   "tls prf seed 5"
-#define TLS_PRF_SECRET  "tls prf secretz"
-
-static void
-hexdump(const unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 1; i <= len; i++)
-                fprintf(stderr, " 0x%02hhx,%s", buf[i - 1], i % 8 ? "" : "\n");
-
-        fprintf(stderr, "\n");
-}
-
-static int
-do_tls_prf_test(int test_no, struct tls_prf_test *tpt)
-{
-        unsigned char *out = NULL;
-        const SSL_CIPHER *cipher;
-        SSL_CTX *ssl_ctx = NULL;
-        SSL *ssl = NULL;
-        int failure = 1;
-        int len;
-
-        fprintf(stderr, "Test %i - %s\n", test_no, tpt->desc);
-
-        if ((out = malloc(TLS_PRF_OUT_LEN)) == NULL)
-                errx(1, "failed to allocate out");
-
-        if ((ssl_ctx = SSL_CTX_new(tpt->ssl_method())) == NULL)
-                errx(1, "failed to create SSL context");
-        if ((ssl = SSL_new(ssl_ctx)) == NULL)
-                errx(1, "failed to create SSL context");
-
-        if ((cipher = ssl3_get_cipher_by_value(tpt->cipher_value)) == NULL) {
-                fprintf(stderr, "FAIL: no cipher %hx\n", tpt->cipher_value);
-                goto failure;
-        }
-
-        S3I(ssl)->hs.new_cipher = cipher;
-
-        for (len = 1; len <= TLS_PRF_OUT_LEN; len++) {
-                memset(out, 'A', TLS_PRF_OUT_LEN);
-
-                if (tls1_PRF(ssl, TLS_PRF_SECRET, sizeof(TLS_PRF_SECRET),
-                    TLS_PRF_SEED1, sizeof(TLS_PRF_SEED1), TLS_PRF_SEED2,
-                    sizeof(TLS_PRF_SEED2), TLS_PRF_SEED3, sizeof(TLS_PRF_SEED3),
-                    TLS_PRF_SEED4, sizeof(TLS_PRF_SEED4), TLS_PRF_SEED5,
-                    sizeof(TLS_PRF_SEED5), out, len) != 1) {
-                        fprintf(stderr, "FAIL: tls_PRF failed for len %i\n",
-                            len);
-                        goto failure;
-                }
-
-                if (memcmp(out, tpt->out, len) != 0) {
-                        fprintf(stderr, "FAIL: tls_PRF output differs for "
-                            "len %i\n", len);
-                        fprintf(stderr, "output:\n");
-                        hexdump(out, TLS_PRF_OUT_LEN);
-                        fprintf(stderr, "test data:\n");
-                        hexdump(tpt->out, TLS_PRF_OUT_LEN);
-                        fprintf(stderr, "\n");
-                        goto failure;
-                }
-        }
-
-        failure = 0;
-
- failure:
-        SSL_free(ssl);
-        SSL_CTX_free(ssl_ctx);
-
-        free(out);
-
-        return failure;
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-        size_t i;
-
-        SSL_library_init();
-        SSL_load_error_strings();
-
-        for (i = 0; i < N_TLS_PRF_TESTS; i++)
-                failed |= do_tls_prf_test(i, &tls_prf_tests[i]);
-
-        return failed;
-}
diff --git a/src/regress/lib/libtls/Makefile b/src/regress/lib/libtls/Makefile
deleted file mode 100644
index f522605a90..0000000000
--- a/src/regress/lib/libtls/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#       $OpenBSD: Makefile,v 1.5 2018/02/08 10:06:52 jsing Exp $
-
-SUBDIR= \
-        config \
-        keypair \
-        gotls \
-        tls \
-        verify
-
-install:
-
-.include <bsd.subdir.mk>
diff --git a/src/regress/lib/libtls/Makefile.inc b/src/regress/lib/libtls/Makefile.inc
deleted file mode 100644
index e693da81b4..0000000000
--- a/src/regress/lib/libtls/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Use this variable when the test needs internal symbols from libtls
-TLS_INT=  -Wl,-Bstatic -ltls -Wl,-Bdynamic
diff --git a/src/regress/lib/libtls/config/Makefile b/src/regress/lib/libtls/config/Makefile
deleted file mode 100644
index 02c36c5d93..0000000000
--- a/src/regress/lib/libtls/config/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2018/02/08 10:05:43 jsing Exp $
-
-PROG=   configtest
-LDADD=  -lcrypto -lssl -ltls
-DPADD=  ${LIBCRYPTO} ${LIBSSL} ${LIBTLS}
-
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Wall -Wundef -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libtls/config/configtest.c b/src/regress/lib/libtls/config/configtest.c
deleted file mode 100644
index 61474aa85c..0000000000
--- a/src/regress/lib/libtls/config/configtest.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* $OpenBSD: configtest.c,v 1.1 2017/12/09 16:43:09 jsing Exp $ */
-/*
- * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <tls.h>
-
-struct parse_protocols_test {
-        const char *protostr;
-        int want_return;
-        uint32_t want_protocols;
-};
-
-struct parse_protocols_test parse_protocols_tests[] = {
-        {
-                .protostr = NULL,
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOLS_DEFAULT,
-        },
-        {
-                .protostr = "default",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOLS_DEFAULT,
-        },
-        {
-                .protostr = "secure",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOLS_DEFAULT,
-        },
-        {
-                .protostr = "all",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOLS_ALL,
-        },
-        {
-                .protostr = "tlsv1",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1,
-        },
-        {
-                .protostr = "tlsv1.2",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "",
-                .want_return = -1,
-                .want_protocols = 0,
-        },
-        {
-                .protostr = "tlsv1.0:tlsv1.1:tlsv1.2",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_0 | TLS_PROTOCOL_TLSv1_1 |
-                    TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "tlsv1.0,tlsv1.1,tlsv1.2",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_0 | TLS_PROTOCOL_TLSv1_1 |
-                    TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "tlsv1.1,tlsv1.2,tlsv1.0",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_0 | TLS_PROTOCOL_TLSv1_1 |
-                    TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "tlsv1.1,tlsv1.2,tlsv1.1",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "tlsv1.1,tlsv1.2,!tlsv1.1",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "unknown",
-                .want_return = -1,
-                .want_protocols = 0,
-        },
-        {
-                .protostr = "all,!unknown",
-                .want_return = -1,
-                .want_protocols = 0,
-        },
-        {
-                .protostr = "sslv3,tlsv1.0,tlsv1.1,tlsv1.2",
-                .want_return = -1,
-                .want_protocols = 0,
-        },
-        {
-                .protostr = "all,!tlsv1.0",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "!tlsv1.0",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "!tlsv1.0,!tlsv1.1",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_2,
-        },
-        {
-                .protostr = "!tlsv1.0,!tlsv1.1,tlsv1.2",
-                .want_return = 0,
-                .want_protocols = TLS_PROTOCOL_TLSv1_2,
-        },
-};
-
-#define N_PARSE_PROTOCOLS_TESTS \
-    (sizeof(parse_protocols_tests) / sizeof(*parse_protocols_tests))
-
-static int
-do_parse_protocols_test(int test_no, struct parse_protocols_test *ppt)
-{
-        uint32_t protocols = 0;
-        int failed = 1;
-        int rv;
-
-        rv = tls_config_parse_protocols(&protocols, ppt->protostr);
-        if (rv != ppt->want_return) {
-                fprintf(stderr, "FAIL: test %i - tls_config_parse_protocols() "
-                    "returned %i, want %i\n", test_no, rv, ppt->want_return);
-                goto done;
-        }
-        if (protocols != ppt->want_protocols) {
-                fprintf(stderr, "FAIL: test %i - got protocols 0x%x, "
-                    "want 0x%x\n", test_no, protocols, ppt->want_protocols);
-                goto done;
-        }
-
-        failed = 0;
-
- done:
-        return (failed);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-        size_t i;
-
-        tls_init();
-
-        for (i = 0; i < N_PARSE_PROTOCOLS_TESTS; i++)
-                failed += do_parse_protocols_test(i, &parse_protocols_tests[i]);
-
-        return (failed);
-}
diff --git a/src/regress/lib/libtls/gotls/Makefile b/src/regress/lib/libtls/gotls/Makefile
deleted file mode 100644
index 404aa79caa..0000000000
--- a/src/regress/lib/libtls/gotls/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#       $OpenBSD: Makefile,v 1.2 2016/09/02 21:30:34 bluhm Exp $
-
-GO_VERSION != sh -c "(go version) 2>/dev/null || true"
-
-.if empty(GO_VERSION)
-regress:
-        @echo package go is required for this regress
-        @echo SKIPPED
-.endif
-
-REGRESS_TARGETS=regress-gotls
-
-regress-gotls:
-        cd ${.CURDIR} && go test -test.v .
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libtls/gotls/tls.go b/src/regress/lib/libtls/gotls/tls.go
deleted file mode 100644
index be75e71f4f..0000000000
--- a/src/regress/lib/libtls/gotls/tls.go
+++ /dev/null
@@ -1,341 +0,0 @@
-// Package tls provides a Go interface to the libtls library.
-package tls
-
-/*
-#cgo LDFLAGS: -ltls -lssl -lcrypto
-
-#include <stdlib.h>
-
-#include <tls.h>
-
-typedef void *tls;
-*/
-import "C"
-
-import (
-        "errors"
-        "fmt"
-        "time"
-        "unsafe"
-)
-
-var (
-        errWantPollIn  = errors.New("want poll in")
-        errWantPollOut = errors.New("want poll out")
-)
-
-// ProtocolVersion represents a TLS protocol version.
-type ProtocolVersion uint32
-
-// String returns the string representation of a protocol version.
-func (pv ProtocolVersion) String() string {
-        name, ok := protocolNames[pv]
-        if !ok {
-                return fmt.Sprintf("unknown protocol version %x", uint32(pv))
-        }
-        return name
-}
-
-const (
-        ProtocolTLSv10 ProtocolVersion = C.TLS_PROTOCOL_TLSv1_0
-        ProtocolTLSv11 ProtocolVersion = C.TLS_PROTOCOL_TLSv1_1
-        ProtocolTLSv12 ProtocolVersion = C.TLS_PROTOCOL_TLSv1_2
-        ProtocolsAll   ProtocolVersion = C.TLS_PROTOCOLS_ALL
-)
-
-var protocolNames = map[ProtocolVersion]string{
-        ProtocolTLSv10: "TLSv1",
-        ProtocolTLSv11: "TLSv1.1",
-        ProtocolTLSv12: "TLSv1.2",
-        ProtocolsAll:   "all",
-}
-
-// ProtocolVersionFromString returns the protocol version with the given name.
-func ProtocolVersionFromString(version string) (ProtocolVersion, error) {
-        for proto, name := range protocolNames {
-                if version == name {
-                        return proto, nil
-                }
-        }
-        return 0, fmt.Errorf("unknown protocol version %q", version)
-}
-
-// TLSConfig provides configuration options for a TLS context.
-type TLSConfig struct {
-        tlsCfg *C.struct_tls_config
-}
-
-// TLS encapsulates the TLS context.
-type TLS struct {
-        cfg *TLSConfig
-        ctx *C.struct_tls
-}
-
-// Init initialises the TLS library.
-func Init() error {
-        if C.tls_init() != 0 {
-                return errors.New("initialisation failed")
-        }
-        return nil
-}
-
-// NewConfig returns a new TLS configuration.
-func NewConfig() (*TLSConfig, error) {
-        cfg := C.tls_config_new()
-        if cfg == nil {
-                return nil, errors.New("failed to allocate config")
-        }
-        return &TLSConfig{
-                tlsCfg: cfg,
-        }, nil
-}
-
-// Error returns the error message from the TLS configuration.
-func (c *TLSConfig) Error() error {
-        if msg := C.tls_config_error(c.tlsCfg); msg != nil {
-                return errors.New(C.GoString(msg))
-        }
-        return errors.New("unknown error")
-}
-
-// SetCAFile sets the CA file to be used for connections.
-func (c *TLSConfig) SetCAFile(filename string) error {
-        caFile := C.CString(filename)
-        defer C.free(unsafe.Pointer(caFile))
-        if C.tls_config_set_ca_file(c.tlsCfg, caFile) != 0 {
-                return c.Error()
-        }
-        return nil
-}
-
-// SetCiphers sets the cipher suites enabled for the connection.
-func (c *TLSConfig) SetCiphers(ciphers string) error {
-        cipherStr := C.CString(ciphers)
-        defer C.free(unsafe.Pointer(cipherStr))
-        if C.tls_config_set_ciphers(c.tlsCfg, cipherStr) != 0 {
-                return c.Error()
-        }
-        return nil
-}
-
-// SetProtocols sets the protocol versions enabled for the connection.
-func (c *TLSConfig) SetProtocols(proto ProtocolVersion) error {
-        if C.tls_config_set_protocols(c.tlsCfg, C.uint32_t(proto)) != 0 {
-                return c.Error()
-        }
-        return nil
-}
-
-// InsecureNoVerifyCert disables certificate verification for the connection.
-func (c *TLSConfig) InsecureNoVerifyCert() {
-        C.tls_config_insecure_noverifycert(c.tlsCfg)
-}
-
-// InsecureNoVerifyName disables server name verification for the connection.
-func (c *TLSConfig) InsecureNoVerifyName() {
-        C.tls_config_insecure_noverifyname(c.tlsCfg)
-}
-
-// SetSecure enables verification for the connection.
-func (c *TLSConfig) SetVerify() {
-        C.tls_config_verify(c.tlsCfg)
-}
-
-// Free frees resources associated with the TLS configuration.
-func (c *TLSConfig) Free() {
-        if c.tlsCfg == nil {
-                return
-        }
-        C.tls_config_free(c.tlsCfg)
-        c.tlsCfg = nil
-}
-
-// NewClient returns a new TLS client context, using the optional configuration.
-// If no configuration is specified the default configuration will be used.
-func NewClient(config *TLSConfig) (*TLS, error) {
-        var sslCfg *C.struct_tls_config
-        if config != nil {
-                sslCfg = config.tlsCfg
-        }
-        ctx := C.tls_client()
-        if ctx == nil {
-                return nil, errors.New("tls client failed")
-        }
-        if C.tls_configure(ctx, sslCfg) != 0 {
-                return nil, errors.New("tls configure failed")
-        }
-        return &TLS{
-                cfg: config,
-                ctx: ctx,
-        }, nil
-}
-
-// Error returns the error message from the TLS context.
-func (t *TLS) Error() error {
-        if msg := C.tls_error(t.ctx); msg != nil {
-                return errors.New(C.GoString(msg))
-        }
-        return errors.New("unknown error")
-}
-
-// PeerCertProvided returns whether the peer provided a certificate.
-func (t *TLS) PeerCertProvided() bool {
-        return C.tls_peer_cert_provided(t.ctx) == 1
-}
-
-// PeerCertContainsName checks whether the peer certificate contains
-// the specified name.
-func (t *TLS) PeerCertContainsName(name string) bool {
-        n := C.CString(name)
-        defer C.free(unsafe.Pointer(n))
-        return C.tls_peer_cert_contains_name(t.ctx, n) == 1
-}
-
-// PeerCertIssuer returns the issuer of the peer certificate.
-func (t *TLS) PeerCertIssuer() (string, error) {
-        issuer := C.tls_peer_cert_issuer(t.ctx)
-        if issuer == nil {
-                return "", errors.New("no issuer returned")
-        }
-        return C.GoString(issuer), nil
-}
-
-// PeerCertSubject returns the subject of the peer certificate.
-func (t *TLS) PeerCertSubject() (string, error) {
-        subject := C.tls_peer_cert_subject(t.ctx)
-        if subject == nil {
-                return "", errors.New("no subject returned")
-        }
-        return C.GoString(subject), nil
-}
-
-// PeerCertHash returns a hash of the peer certificate.
-func (t *TLS) PeerCertHash() (string, error) {
-        hash := C.tls_peer_cert_hash(t.ctx)
-        if hash == nil {
-                return "", errors.New("no hash returned")
-        }
-        return C.GoString(hash), nil
-}
-
-// PeerCertNotBefore returns the notBefore time from the peer
-// certificate.
-func (t *TLS) PeerCertNotBefore() (time.Time, error) {
-        notBefore := C.tls_peer_cert_notbefore(t.ctx)
-        if notBefore == -1 {
-                return time.Time{}, errors.New("no notBefore time returned")
-        }
-        return time.Unix(int64(notBefore), 0), nil
-}
-
-// PeerCertNotAfter returns the notAfter time from the peer
-// certificate.
-func (t *TLS) PeerCertNotAfter() (time.Time, error) {
-        notAfter := C.tls_peer_cert_notafter(t.ctx)
-        if notAfter == -1 {
-                return time.Time{}, errors.New("no notAfter time")
-        }
-        return time.Unix(int64(notAfter), 0), nil
-}
-
-// ConnVersion returns the protocol version of the connection.
-func (t *TLS) ConnVersion() (ProtocolVersion, error) {
-        ver := C.tls_conn_version(t.ctx)
-        if ver == nil {
-                return 0, errors.New("no connection version")
-        }
-        return ProtocolVersionFromString(C.GoString(ver))
-}
-
-// ConnCipher returns the cipher suite used for the connection.
-func (t *TLS) ConnCipher() (string, error) {
-        cipher := C.tls_conn_cipher(t.ctx)
-        if cipher == nil {
-                return "", errors.New("no connection cipher")
-        }
-        return C.GoString(cipher), nil
-}
-
-// Connect attempts to establish an TLS connection to the specified host on
-// the given port. The host may optionally contain a colon separated port
-// value if the port string is specified as an empty string.
-func (t *TLS) Connect(host, port string) error {
-        h := C.CString(host)
-        var p *C.char
-        if port != "" {
-                p = C.CString(port)
-        }
-        defer C.free(unsafe.Pointer(h))
-        defer C.free(unsafe.Pointer(p))
-        if C.tls_connect(t.ctx, h, p) != 0 {
-                return t.Error()
-        }
-        return nil
-}
-
-// Handshake attempts to complete the TLS handshake.
-func (t *TLS) Handshake() error {
-        ret := C.tls_handshake(t.ctx)
-        switch {
-        case ret == C.TLS_WANT_POLLIN:
-                return errWantPollIn
-        case ret == C.TLS_WANT_POLLOUT:
-                return errWantPollOut
-        case ret != 0:
-                return t.Error()
-        }
-        return nil
-}
-
-// Read reads data the TLS connection into the given buffer.
-func (t *TLS) Read(buf []byte) (int, error) {
-        ret := C.tls_read(t.ctx, unsafe.Pointer(&buf[0]), C.size_t(len(buf)))
-        switch {
-        case ret == C.TLS_WANT_POLLIN:
-                return -1, errWantPollIn
-        case ret == C.TLS_WANT_POLLOUT:
-                return -1, errWantPollOut
-        case ret < 0:
-                return -1, t.Error()
-        }
-        return int(ret), nil
-}
-
-// Write writes the given data to the TLS connection.
-func (t *TLS) Write(buf []byte) (int, error) {
-        p := C.CString(string(buf))
-        defer C.free(unsafe.Pointer(p))
-        ret := C.tls_write(t.ctx, unsafe.Pointer(p), C.size_t(len(buf)))
-        switch {
-        case ret == C.TLS_WANT_POLLIN:
-                return -1, errWantPollIn
-        case ret == C.TLS_WANT_POLLOUT:
-                return -1, errWantPollOut
-        case ret < 0:
-                return -1, t.Error()
-        }
-        return int(ret), nil
-}
-
-// Close closes the TLS connection.
-func (t *TLS) Close() error {
-        ret := C.tls_close(t.ctx)
-        switch {
-        case ret == C.TLS_WANT_POLLIN:
-                return errWantPollIn
-        case ret == C.TLS_WANT_POLLOUT:
-                return errWantPollOut
-        case ret != 0:
-                return t.Error()
-        }
-        return nil
-}
-
-// Free frees resources associated with the TLS context.
-func (t *TLS) Free() {
-        if t.ctx == nil {
-                return
-        }
-        C.tls_free(t.ctx)
-        t.ctx = nil
-}
diff --git a/src/regress/lib/libtls/gotls/tls_test.go b/src/regress/lib/libtls/gotls/tls_test.go
deleted file mode 100644
index 077dd86e82..0000000000
--- a/src/regress/lib/libtls/gotls/tls_test.go
+++ /dev/null
@@ -1,421 +0,0 @@
-package tls
-
-import (
-        "crypto/tls"
-        "encoding/pem"
-        "fmt"
-        "io/ioutil"
-        "net/http"
-        "net/http/httptest"
-        "net/url"
-        "os"
-        "strings"
-        "testing"
-        "time"
-)
-
-const (
-        httpContent = "Hello, TLS!"
-
-        certHash = "SHA256:448f628a8a65aa18560e53a80c53acb38c51b427df0334082349141147dc9bf6"
-)
-
-var (
-        certNotBefore = time.Unix(0, 0)
-        certNotAfter  = certNotBefore.Add(1000000 * time.Hour)
-)
-
-type handshakeError string
-
-func (he handshakeError) Error() string {
-        return string(he)
-}
-
-// createCAFile writes a PEM encoded version of the certificate out to a
-// temporary file, for use by libtls.
-func createCAFile(cert []byte) (string, error) {
-        f, err := ioutil.TempFile("", "tls")
-        if err != nil {
-                return "", fmt.Errorf("failed to create file: %v", err)
-        }
-        defer f.Close()
-        block := &pem.Block{
-                Type:  "CERTIFICATE",
-                Bytes: cert,
-        }
-        if err := pem.Encode(f, block); err != nil {
-                return "", fmt.Errorf("failed to encode certificate: %v", err)
-        }
-        return f.Name(), nil
-}
-
-func newTestServer(tlsCfg *tls.Config) (*httptest.Server, *url.URL, string, error) {
-        ts := httptest.NewUnstartedServer(
-                http.HandlerFunc(
-                        func(w http.ResponseWriter, r *http.Request) {
-                                fmt.Fprintln(w, httpContent)
-                        },
-                ),
-        )
-        ts.TLS = tlsCfg
-        ts.StartTLS()
-
-        u, err := url.Parse(ts.URL)
-        if err != nil {
-                return nil, nil, "", fmt.Errorf("failed to parse URL %q: %v", ts.URL, err)
-        }
-
-        caFile, err := createCAFile(ts.TLS.Certificates[0].Certificate[0])
-        if err != nil {
-                return nil, nil, "", fmt.Errorf("failed to create CA file: %v", err)
-        }
-
-        return ts, u, caFile, nil
-}
-
-func handshakeVersionTest(tlsCfg *tls.Config) (ProtocolVersion, error) {
-        ts, u, caFile, err := newTestServer(tlsCfg)
-        if err != nil {
-                return 0, fmt.Errorf("failed to start test server: %v", err)
-        }
-        defer os.Remove(caFile)
-        defer ts.Close()
-
-        if err := Init(); err != nil {
-                return 0, err
-        }
-
-        cfg, err := NewConfig()
-        if err != nil {
-                return 0, err
-        }
-        defer cfg.Free()
-        if err := cfg.SetCAFile(caFile); err != nil {
-                return 0, err
-        }
-        if err := cfg.SetCiphers("compat"); err != nil {
-                return 0, err
-        }
-        if err := cfg.SetProtocols(ProtocolsAll); err != nil {
-                return 0, err
-        }
-
-        tls, err := NewClient(cfg)
-        if err != nil {
-                return 0, err
-        }
-        defer tls.Free()
-
-        if err := tls.Connect(u.Host, ""); err != nil {
-                return 0, err
-        }
-        if err := tls.Handshake(); err != nil {
-                return 0, handshakeError(err.Error())
-        }
-        version, err := tls.ConnVersion()
-        if err != nil {
-                return 0, err
-        }
-        if err := tls.Close(); err != nil {
-                return 0, err
-        }
-        return version, nil
-}
-
-func TestTLSBasic(t *testing.T) {
-        ts, u, caFile, err := newTestServer(nil)
-        if err != nil {
-                t.Fatalf("Failed to start test server: %v", err)
-        }
-        defer os.Remove(caFile)
-        defer ts.Close()
-
-        if err := Init(); err != nil {
-                t.Fatal(err)
-        }
-
-        cfg, err := NewConfig()
-        if err != nil {
-                t.Fatal(err)
-        }
-        defer cfg.Free()
-        if err := cfg.SetCAFile(caFile); err != nil {
-                t.Fatal(err)
-        }
-
-        tls, err := NewClient(cfg)
-        if err != nil {
-                t.Fatal(err)
-        }
-        defer tls.Free()
-
-        t.Logf("Connecting to %s", u.Host)
-
-        if err := tls.Connect(u.Host, ""); err != nil {
-                t.Fatal(err)
-        }
-        defer func() {
-                if err := tls.Close(); err != nil {
-                        t.Fatalf("Close failed: %v", err)
-                }
-        }()
-
-        n, err := tls.Write([]byte("GET / HTTP/1.0\n\n"))
-        if err != nil {
-                t.Fatal(err)
-        }
-        t.Logf("Wrote %d bytes...", n)
-
-        buf := make([]byte, 1024)
-        n, err = tls.Read(buf)
-        if err != nil {
-                t.Fatal(err)
-        }
-        t.Logf("Read %d bytes...", n)
-
-        if !strings.Contains(string(buf), httpContent) {
-                t.Errorf("Response does not contain %q", httpContent)
-        }
-}
-
-func TestTLSVersions(t *testing.T) {
-        tests := []struct {
-                minVersion       uint16
-                maxVersion       uint16
-                wantVersion      ProtocolVersion
-                wantHandshakeErr bool
-        }{
-                {tls.VersionSSL30, tls.VersionTLS12, ProtocolTLSv12, false},
-                {tls.VersionTLS10, tls.VersionTLS12, ProtocolTLSv12, false},
-                {tls.VersionTLS11, tls.VersionTLS12, ProtocolTLSv12, false},
-                {tls.VersionSSL30, tls.VersionTLS11, ProtocolTLSv11, false},
-                {tls.VersionSSL30, tls.VersionTLS10, ProtocolTLSv10, false},
-                {tls.VersionSSL30, tls.VersionSSL30, 0, true},
-                {tls.VersionTLS10, tls.VersionTLS10, ProtocolTLSv10, false},
-                {tls.VersionTLS11, tls.VersionTLS11, ProtocolTLSv11, false},
-                {tls.VersionTLS12, tls.VersionTLS12, ProtocolTLSv12, false},
-        }
-        for i, test := range tests {
-                t.Logf("Testing handshake with protocols %x:%x", test.minVersion, test.maxVersion)
-                tlsCfg := &tls.Config{
-                        MinVersion: test.minVersion,
-                        MaxVersion: test.maxVersion,
-                }
-                version, err := handshakeVersionTest(tlsCfg)
-                switch {
-                case test.wantHandshakeErr && err == nil:
-                        t.Errorf("Test %d - handshake %x:%x succeeded, want handshake error",
-                                i, test.minVersion, test.maxVersion)
-                case test.wantHandshakeErr && err != nil:
-                        if _, ok := err.(handshakeError); !ok {
-                                t.Errorf("Test %d - handshake %x:%x; got unknown error, want handshake error: %v",
-                                        i, test.minVersion, test.maxVersion, err)
-                        }
-                case !test.wantHandshakeErr && err != nil:
-                        t.Errorf("Test %d - handshake %x:%x failed: %v", i, test.minVersion, test.maxVersion, err)
-                case !test.wantHandshakeErr && err == nil:
-                        if got, want := version, test.wantVersion; got != want {
-                                t.Errorf("Test %d - handshake %x:%x; got protocol version %v, want %v",
-                                        i, test.minVersion, test.maxVersion, got, want)
-                        }
-                }
-        }
-}
-
-func TestTLSSingleByteReadWrite(t *testing.T) {
-        ts, u, caFile, err := newTestServer(nil)
-        if err != nil {
-                t.Fatalf("Failed to start test server: %v", err)
-        }
-        defer os.Remove(caFile)
-        defer ts.Close()
-
-        if err := Init(); err != nil {
-                t.Fatal(err)
-        }
-
-        cfg, err := NewConfig()
-        if err != nil {
-                t.Fatal(err)
-        }
-        defer cfg.Free()
-        if err := cfg.SetCAFile(caFile); err != nil {
-                t.Fatal(err)
-        }
-
-        tls, err := NewClient(cfg)
-        if err != nil {
-                t.Fatal(err)
-        }
-        defer tls.Free()
-
-        t.Logf("Connecting to %s", u.Host)
-
-        if err := tls.Connect(u.Host, ""); err != nil {
-                t.Fatal(err)
-        }
-        defer func() {
-                if err := tls.Close(); err != nil {
-                        t.Fatalf("Close failed: %v", err)
-                }
-        }()
-
-        for _, b := range []byte("GET / HTTP/1.0\n\n") {
-                n, err := tls.Write([]byte{b})
-                if err != nil {
-                        t.Fatal(err)
-                }
-                if n != 1 {
-                        t.Fatalf("Wrote byte %v, got length %d, want 1", b, n)
-                }
-        }
-
-        var body []byte
-        for {
-                buf := make([]byte, 1)
-                n, err := tls.Read(buf)
-                if err != nil {
-                        t.Fatal(err)
-                }
-                if n == 0 {
-                        break
-                }
-                if n != 1 {
-                        t.Fatalf("Read single byte, got length %d, want 1", n)
-                }
-                body = append(body, buf...)
-        }
-
-        if !strings.Contains(string(body), httpContent) {
-                t.Errorf("Response does not contain %q", httpContent)
-        }
-}
-
-func TestTLSInfo(t *testing.T) {
-        ts, u, caFile, err := newTestServer(nil)
-        if err != nil {
-                t.Fatalf("Failed to start test server: %v", err)
-        }
-        defer os.Remove(caFile)
-        defer ts.Close()
-
-        if err := Init(); err != nil {
-                t.Fatal(err)
-        }
-
-        cfg, err := NewConfig()
-        if err != nil {
-                t.Fatal(err)
-        }
-        defer cfg.Free()
-        if err := cfg.SetCAFile(caFile); err != nil {
-                t.Fatal(err)
-        }
-
-        tls, err := NewClient(cfg)
-        if err != nil {
-                t.Fatal(err)
-        }
-        defer tls.Free()
-
-        t.Logf("Connecting to %s", u.Host)
-
-        if err := tls.Connect(u.Host, ""); err != nil {
-                t.Fatal(err)
-        }
-        defer func() {
-                if err := tls.Close(); err != nil {
-                        t.Fatalf("Close failed: %v", err)
-                }
-        }()
-
-        // All of these should fail since the handshake has not completed.
-        if _, err := tls.ConnVersion(); err == nil {
-                t.Error("ConnVersion() return nil error, want error")
-        }
-        if _, err := tls.ConnCipher(); err == nil {
-                t.Error("ConnCipher() return nil error, want error")
-        }
-
-        if got, want := tls.PeerCertProvided(), false; got != want {
-                t.Errorf("PeerCertProvided() = %v, want %v", got, want)
-        }
-        for _, name := range []string{"127.0.0.1", "::1", "example.com"} {
-                if got, want := tls.PeerCertContainsName(name), false; got != want {
-                        t.Errorf("PeerCertContainsName(%q) = %v, want %v", name, got, want)
-                }
-        }
-
-        if _, err := tls.PeerCertIssuer(); err == nil {
-                t.Error("PeerCertIssuer() returned nil error, want error")
-        }
-        if _, err := tls.PeerCertSubject(); err == nil {
-                t.Error("PeerCertSubject() returned nil error, want error")
-        }
-        if _, err := tls.PeerCertHash(); err == nil {
-                t.Error("PeerCertHash() returned nil error, want error")
-        }
-        if _, err := tls.PeerCertNotBefore(); err == nil {
-                t.Error("PeerCertNotBefore() returned nil error, want error")
-        }
-        if _, err := tls.PeerCertNotAfter(); err == nil {
-                t.Error("PeerCertNotAfter() returned nil error, want error")
-        }
-
-        // Complete the handshake...
-        if err := tls.Handshake(); err != nil {
-                t.Fatalf("Handshake failed: %v", err)
-        }
-
-        if version, err := tls.ConnVersion(); err != nil {
-                t.Errorf("ConnVersion() return error: %v", err)
-        } else {
-                t.Logf("Protocol version: %v", version)
-        }
-        if cipher, err := tls.ConnCipher(); err != nil {
-                t.Errorf("ConnCipher() return error: %v", err)
-        } else {
-                t.Logf("Cipher: %v", cipher)
-        }
-
-        if got, want := tls.PeerCertProvided(), true; got != want {
-                t.Errorf("PeerCertProvided() = %v, want %v", got, want)
-        }
-        for _, name := range []string{"127.0.0.1", "::1", "example.com"} {
-                if got, want := tls.PeerCertContainsName(name), true; got != want {
-                        t.Errorf("PeerCertContainsName(%q) = %v, want %v", name, got, want)
-                }
-        }
-
-        if issuer, err := tls.PeerCertIssuer(); err != nil {
-                t.Errorf("PeerCertIssuer() returned error: %v", err)
-        } else {
-                t.Logf("Issuer: %v", issuer)
-        }
-        if subject, err := tls.PeerCertSubject(); err != nil {
-                t.Errorf("PeerCertSubject() returned error: %v", err)
-        } else {
-                t.Logf("Subject: %v", subject)
-        }
-        if hash, err := tls.PeerCertHash(); err != nil {
-                t.Errorf("PeerCertHash() returned error: %v", err)
-        } else if hash != certHash {
-                t.Errorf("Got cert hash %q, want %q", hash, certHash)
-        } else {
-                t.Logf("Hash: %v", hash)
-        }
-        if notBefore, err := tls.PeerCertNotBefore(); err != nil {
-                t.Errorf("PeerCertNotBefore() returned error: %v", err)
-        } else if !certNotBefore.Equal(notBefore) {
-                t.Errorf("Got cert notBefore %v, want %v", notBefore.UTC(), certNotBefore.UTC())
-        } else {
-                t.Logf("NotBefore: %v", notBefore.UTC())
-        }
-        if notAfter, err := tls.PeerCertNotAfter(); err != nil {
-                t.Errorf("PeerCertNotAfter() returned error: %v", err)
-        } else if !certNotAfter.Equal(notAfter) {
-                t.Errorf("Got cert notAfter %v, want %v", notAfter.UTC(), certNotAfter.UTC())
-        } else {
-                t.Logf("NotAfter: %v", notAfter.UTC())
-        }
-}
diff --git a/src/regress/lib/libtls/keypair/Makefile b/src/regress/lib/libtls/keypair/Makefile
deleted file mode 100644
index d06109a26b..0000000000
--- a/src/regress/lib/libtls/keypair/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#       $OpenBSD: Makefile,v 1.1 2018/02/08 10:06:52 jsing Exp $
-
-PROG=   keypairtest
-LDADD=  -lcrypto -lssl ${TLS_INT}
-DPADD=  ${LIBCRYPTO} ${LIBSSL} ${LIBTLS}
-
-WARNINGS=       Yes
-CFLAGS+=        -DLIBRESSL_INTERNAL -Wall -Wundef -Werror
-CFLAGS+=        -I${.CURDIR}/../../../../lib/libtls
-
-REGRESS_TARGETS= \
-        regress-keypairtest
-
-regress-keypairtest: ${PROG}
-        ./keypairtest \
-            ${.CURDIR}/../../libssl/certs/ca.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libtls/keypair/keypairtest.c b/src/regress/lib/libtls/keypair/keypairtest.c
deleted file mode 100644
index 732464af00..0000000000
--- a/src/regress/lib/libtls/keypair/keypairtest.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/* $OpenBSD: keypairtest.c,v 1.4 2018/04/07 16:42:17 jsing Exp $ */
-/*
- * Copyright (c) 2018 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/stat.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <openssl/x509.h>
-
-#include <tls.h>
-#include <tls_internal.h>
-
-#define PUBKEY_HASH \
-    "SHA256:858d0f94beb0a08eb4f13871ba57bf0a2e081287d0efbaeb3bbac59dd8f1a8e5"
-
-char *cert_file, *key_file, *ocsp_staple_file;
-
-static void
-load_file(const char *filename, const uint8_t **data, size_t *data_len)
-{
-        struct stat sb;
-        uint8_t *buf;
-        size_t len;
-        ssize_t n;
-        int fd;
-
-        if ((fd = open(filename, O_RDONLY)) == -1)
-                err(1, "failed to open '%s'", filename);
-        if ((fstat(fd, &sb)) == -1)
-                err(1, "failed to stat '%s'", filename);
-        if (sb.st_size < 0)
-                err(1, "file size invalid for '%s'", filename);
-        len = (size_t)sb.st_size;
-        if ((buf = malloc(len)) == NULL)
-                err(1, "out of memory");
-        n = read(fd, buf, len);
-        if (n < 0 || (size_t)n != len)
-                err(1, "failed to read '%s'", filename);
-        close(fd);
-
-        *data = buf;
-        *data_len = len;
-}
-
-static int
-compare_mem(char *label, const uint8_t *data1, size_t data1_len,
-    const uint8_t *data2, size_t data2_len)
-{
-        if (data1_len != data2_len) {
-                fprintf(stderr, "FAIL: %s length mismatch (%zu != %zu)\n",
-                    label, data1_len, data2_len);
-                return -1;
-        }
-        if (data1 == data2) {
-                fprintf(stderr, "FAIL: %s comparing same memory (%p == %p)\n",
-                    label, data1, data2);
-                return -1;
-        }
-        if (memcmp(data1, data2, data1_len) != 0) {
-                fprintf(stderr, "FAIL: %s data mismatch\n", label);
-                return -1;
-        }
-        return 0;
-}
-
-static int
-do_keypair_tests(void)
-{
-        size_t cert_len, key_len, ocsp_staple_len;
-        const uint8_t *cert, *key, *ocsp_staple;
-        X509 *x509_cert = NULL;
-        struct tls_keypair *kp;
-        struct tls_error err;
-        char *hash = NULL;
-        int failed = 1;
-
-        load_file(cert_file, &cert, &cert_len);
-        load_file(key_file, &key, &key_len);
-        load_file(ocsp_staple_file, &ocsp_staple, &ocsp_staple_len);
-
-        if ((kp = tls_keypair_new()) == NULL) {
-                fprintf(stderr, "FAIL: failed to create keypair\n");
-                goto done;
-        }
-
-        if (tls_keypair_set_cert_file(kp, &err, cert_file) == -1) {
-                fprintf(stderr, "FAIL: failed to load cert file: %s\n",
-                    err.msg);
-                goto done;
-        }
-        if (tls_keypair_set_key_file(kp, &err, key_file) == -1) {
-                fprintf(stderr, "FAIL: failed to load key file: %s\n", err.msg);
-                goto done;
-        }
-        if (tls_keypair_set_ocsp_staple_file(kp, &err, ocsp_staple_file) == -1) {
-                fprintf(stderr, "FAIL: failed to load ocsp staple file: %s\n",
-                    err.msg);
-                goto done;
-        }
-
-        if (compare_mem("certificate", cert, cert_len, kp->cert_mem,
-            kp->cert_len) == -1)
-                goto done;
-        if (compare_mem("key", key, key_len, kp->key_mem, kp->cert_len) == -1)
-                goto done;
-        if (compare_mem("ocsp staple", ocsp_staple, ocsp_staple_len,
-            kp->ocsp_staple, kp->ocsp_staple_len) == -1)
-                goto done;
-        if (strcmp(kp->pubkey_hash, PUBKEY_HASH) != 0) {
-                fprintf(stderr, "FAIL: got pubkey hash '%s', want '%s'",
-                    hash, PUBKEY_HASH);
-                goto done;
-        }
-
-        tls_keypair_clear_key(kp);
-
-        if (kp->key_mem != NULL || kp->key_len != 0) {
-                fprintf(stderr, "FAIL: key not cleared (mem %p, len %zu)",
-                    kp->key_mem, kp->key_len);
-                goto done;
-        }
-
-        if (tls_keypair_set_cert_mem(kp, &err, cert, cert_len) == -1) {
-                fprintf(stderr, "FAIL: failed to load cert: %s\n", err.msg);
-                goto done;
-        }
-        if (tls_keypair_set_key_mem(kp, &err, key, key_len) == -1) {
-                fprintf(stderr, "FAIL: failed to load key: %s\n", err.msg);
-                goto done;
-        }
-        if (tls_keypair_set_ocsp_staple_mem(kp, &err, ocsp_staple,
-            ocsp_staple_len) == -1) {
-                fprintf(stderr, "FAIL: failed to load ocsp staple: %s\n", err.msg);
-                goto done;
-        }
-        if (compare_mem("certificate", cert, cert_len, kp->cert_mem,
-            kp->cert_len) == -1)
-                goto done;
-        if (compare_mem("key", key, key_len, kp->key_mem, kp->cert_len) == -1)
-                goto done;
-        if (compare_mem("ocsp staple", ocsp_staple, ocsp_staple_len,
-            kp->ocsp_staple, kp->ocsp_staple_len) == -1)
-                goto done;
-        if (strcmp(kp->pubkey_hash, PUBKEY_HASH) != 0) {
-                fprintf(stderr, "FAIL: got pubkey hash '%s', want '%s'",
-                    hash, PUBKEY_HASH);
-                goto done;
-        }
-
-        if (tls_keypair_load_cert(kp, &err, &x509_cert) == -1) {
-                fprintf(stderr, "FAIL: failed to load X509 certificate: %s\n",
-                    err.msg);
-                goto done;
-        }
-
-        tls_keypair_clear_key(kp);
-
-        if (kp->key_mem != NULL || kp->key_len != 0) {
-                fprintf(stderr, "FAIL: key not cleared (mem %p, len %zu)",
-                    kp->key_mem, kp->key_len);
-                goto done;
-        }
-
-        tls_keypair_free(kp);
-
-        failed = 0;
-
- done:
-        X509_free(x509_cert);
-        free(hash);
-
-        return (failed);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failure = 0;
-
-        if (argc != 4) {
-                fprintf(stderr, "usage: %s ocspstaplefile certfile keyfile\n",
-                    argv[0]);
-                return (1);
-        }
-
-        ocsp_staple_file = argv[1];
-        cert_file = argv[2];
-        key_file = argv[3];
-
-        failure |= do_keypair_tests();
-
-        return (failure);
-}
diff --git a/src/regress/lib/libtls/tls/Makefile b/src/regress/lib/libtls/tls/Makefile
deleted file mode 100644
index 0fbd78481b..0000000000
--- a/src/regress/lib/libtls/tls/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2017/05/06 21:56:43 jsing Exp $
-
-PROG=   tlstest
-LDADD=  -lcrypto -lssl -ltls
-DPADD=  ${LIBCRYPTO} ${LIBSSL} ${LIBTLS}
-
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-REGRESS_TARGETS= \
-        regress-tlstest
-
-regress-tlstest: ${PROG}
-        ./tlstest \
-            ${.CURDIR}/../../libssl/certs/ca.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libtls/tls/tlstest.c b/src/regress/lib/libtls/tls/tlstest.c
deleted file mode 100644
index 8a4d5dbb38..0000000000
--- a/src/regress/lib/libtls/tls/tlstest.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/* $OpenBSD: tlstest.c,v 1.10 2018/03/19 16:36:12 jsing Exp $ */
-/*
- * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/socket.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <tls.h>
-
-#define CIRCULAR_BUFFER_SIZE 512
-
-unsigned char client_buffer[CIRCULAR_BUFFER_SIZE];
-unsigned char *client_readptr, *client_writeptr;
-
-unsigned char server_buffer[CIRCULAR_BUFFER_SIZE];
-unsigned char *server_readptr, *server_writeptr;
-
-char *cafile, *certfile, *keyfile;
-
-int debug = 0;
-
-static void
-circular_init(void)
-{
-        client_readptr = client_writeptr = client_buffer;
-        server_readptr = server_writeptr = server_buffer;
-}
-
-static ssize_t
-circular_read(char *name, unsigned char *buf, size_t bufsize,
-    unsigned char **readptr, unsigned char *writeptr,
-    unsigned char *outbuf, size_t outlen)
-{
-        unsigned char *nextptr = *readptr;
-        size_t n = 0;
-
-        while (n < outlen) {
-                if (nextptr == writeptr)
-                        break;
-                *outbuf++ = *nextptr++;
-                if ((size_t)(nextptr - buf) >= bufsize)
-                        nextptr = buf;
-                *readptr = nextptr;
-                n++;
-        }
-
-        if (debug && n > 0)
-                fprintf(stderr, "%s buffer: read %zi bytes\n", name, n);
-
-        return (n > 0 ? (ssize_t)n : TLS_WANT_POLLIN);
-}
-
-static ssize_t
-circular_write(char *name, unsigned char *buf, size_t bufsize,
-    unsigned char *readptr, unsigned char **writeptr,
-    const unsigned char *inbuf, size_t inlen)
-{
-        unsigned char *nextptr = *writeptr;
-        unsigned char *prevptr;
-        size_t n = 0;
-
-        while (n < inlen) {
-                prevptr = nextptr++;
-                if ((size_t)(nextptr - buf) >= bufsize)
-                        nextptr = buf;
-                if (nextptr == readptr)
-                        break;
-                *prevptr = *inbuf++;
-                *writeptr = nextptr;
-                n++;
-        }
-
-        if (debug && n > 0)
-                fprintf(stderr, "%s buffer: wrote %zi bytes\n", name, n);
-
-        return (n > 0 ? (ssize_t)n : TLS_WANT_POLLOUT);
-}
-
-static ssize_t
-client_read(struct tls *ctx, void *buf, size_t buflen, void *cb_arg)
-{
-        return circular_read("client", client_buffer, sizeof(client_buffer),
-            &client_readptr, client_writeptr, buf, buflen);
-}
-
-static ssize_t
-client_write(struct tls *ctx, const void *buf, size_t buflen, void *cb_arg)
-{
-        return circular_write("server", server_buffer, sizeof(server_buffer),
-            server_readptr, &server_writeptr, buf, buflen);
-}
-
-static ssize_t
-server_read(struct tls *ctx, void *buf, size_t buflen, void *cb_arg)
-{
-        return circular_read("server", server_buffer, sizeof(server_buffer),
-            &server_readptr, server_writeptr, buf, buflen);
-}
-
-static ssize_t
-server_write(struct tls *ctx, const void *buf, size_t buflen, void *cb_arg)
-{
-        return circular_write("client", client_buffer, sizeof(client_buffer),
-            client_readptr, &client_writeptr, buf, buflen);
-}
-
-static int
-do_tls_handshake(char *name, struct tls *ctx)
-{
-        int rv;
-
-        rv = tls_handshake(ctx);
-        if (rv == 0)
-                return (1);
-        if (rv == TLS_WANT_POLLIN || rv == TLS_WANT_POLLOUT)
-                return (0);
-
-        errx(1, "%s handshake failed: %s", name, tls_error(ctx));
-}
-
-static int
-do_tls_close(char *name, struct tls *ctx)
-{
-        int rv;
-
-        rv = tls_close(ctx);
-        if (rv == 0)
-                return (1);
-        if (rv == TLS_WANT_POLLIN || rv == TLS_WANT_POLLOUT)
-                return (0);
-
-        errx(1, "%s close failed: %s", name, tls_error(ctx));
-}
-
-static int
-do_client_server_handshake(char *desc, struct tls *client,
-    struct tls *server_cctx)
-{
-        int i, client_done, server_done;
-
-        i = client_done = server_done = 0;
-        do {
-                if (client_done == 0)
-                        client_done = do_tls_handshake("client", client);
-                if (server_done == 0)
-                        server_done = do_tls_handshake("server", server_cctx);
-        } while (i++ < 100 && (client_done == 0 || server_done == 0));
-
-        if (client_done == 0 || server_done == 0) {
-                printf("FAIL: %s TLS handshake did not complete\n", desc);
-                return (1);
-        }
-
-        return (0);
-}
-
-static int
-do_client_server_close(char *desc, struct tls *client, struct tls *server_cctx)
-{
-        int i, client_done, server_done;
-
-        i = client_done = server_done = 0;
-        do {
-                if (client_done == 0)
-                        client_done = do_tls_close("client", client);
-                if (server_done == 0)
-                        server_done = do_tls_close("server", server_cctx);
-        } while (i++ < 100 && (client_done == 0 || server_done == 0));
-
-        if (client_done == 0 || server_done == 0) {
-                printf("FAIL: %s TLS close did not complete\n", desc);
-                return (1);
-        }
-
-        return (0);
-}
-
-static int
-do_client_server_test(char *desc, struct tls *client, struct tls *server_cctx)
-{
-        if (do_client_server_handshake(desc, client, server_cctx) != 0)
-                return (1);
-
-        printf("INFO: %s TLS handshake completed successfully\n", desc);
-
-        /* XXX - Do some reads and writes... */
-
-        if (do_client_server_close(desc, client, server_cctx) != 0)
-                return (1);
-
-        printf("INFO: %s TLS close completed successfully\n", desc);
-
-        return (0);
-}
-
-static int
-test_tls_cbs(struct tls *client, struct tls *server)
-{
-        struct tls *server_cctx;
-        int failure;
-
-        circular_init();
-
-        if (tls_accept_cbs(server, &server_cctx, server_read, server_write,
-            NULL) == -1)
-                errx(1, "failed to accept: %s", tls_error(server));
-
-        if (tls_connect_cbs(client, client_read, client_write, NULL,
-            "test") == -1)
-                errx(1, "failed to connect: %s", tls_error(client));
-
-        failure = do_client_server_test("callback", client, server_cctx);
-
-        tls_free(server_cctx);
-
-        return (failure);
-}
-
-static int
-test_tls_fds(struct tls *client, struct tls *server)
-{
-        struct tls *server_cctx;
-        int cfds[2], sfds[2];
-        int failure;
-
-        if (pipe2(cfds, O_NONBLOCK) == -1)
-                err(1, "failed to create pipe");
-        if (pipe2(sfds, O_NONBLOCK) == -1)
-                err(1, "failed to create pipe");
-
-        if (tls_accept_fds(server, &server_cctx, sfds[0], cfds[1]) == -1)
-                errx(1, "failed to accept: %s", tls_error(server));
-
-        if (tls_connect_fds(client, cfds[0], sfds[1], "test") == -1)
-                errx(1, "failed to connect: %s", tls_error(client));
-
-        failure = do_client_server_test("file descriptor", client, server_cctx);
-
-        tls_free(server_cctx);
-
-        close(cfds[0]);
-        close(cfds[1]);
-        close(sfds[0]);
-        close(sfds[1]);
-
-        return (failure);
-}
-
-static int
-test_tls_socket(struct tls *client, struct tls *server)
-{
-        struct tls *server_cctx;
-        int failure;
-        int sv[2];
-
-        if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, PF_UNSPEC,
-            sv) == -1)
-                err(1, "failed to create socketpair");
-
-        if (tls_accept_socket(server, &server_cctx, sv[0]) == -1)
-                errx(1, "failed to accept: %s", tls_error(server));
-
-        if (tls_connect_socket(client, sv[1], "test") == -1)
-                errx(1, "failed to connect: %s", tls_error(client));
-
-        failure = do_client_server_test("socket", client, server_cctx);
-
-        tls_free(server_cctx);
-
-        close(sv[0]);
-        close(sv[1]);
-
-        return (failure);
-}
-
-static int
-do_tls_tests(void)
-{
-        struct tls_config *client_cfg, *server_cfg;
-        struct tls *client, *server;
-        int failure = 0;
-
-        if ((client = tls_client()) == NULL)
-                errx(1, "failed to create tls client");
-        if ((client_cfg = tls_config_new()) == NULL)
-                errx(1, "failed to create tls client config");
-        tls_config_insecure_noverifyname(client_cfg);
-        if (tls_config_set_ca_file(client_cfg, cafile) == -1)
-                errx(1, "failed to set ca: %s", tls_config_error(client_cfg));
-
-        if ((server = tls_server()) == NULL)
-                errx(1, "failed to create tls server");
-        if ((server_cfg = tls_config_new()) == NULL)
-                errx(1, "failed to create tls server config");
-        if (tls_config_set_keypair_file(server_cfg, certfile, keyfile) == -1)
-                errx(1, "failed to set keypair: %s",
-                    tls_config_error(server_cfg));
-
-        tls_reset(client);
-        if (tls_configure(client, client_cfg) == -1)
-                errx(1, "failed to configure client: %s", tls_error(client));
-        tls_reset(server);
-        if (tls_configure(server, server_cfg) == -1)
-                errx(1, "failed to configure server: %s", tls_error(server));
-
-        failure |= test_tls_cbs(client, server);
-
-        tls_reset(client);
-        if (tls_configure(client, client_cfg) == -1)
-                errx(1, "failed to configure client: %s", tls_error(client));
-        tls_reset(server);
-        if (tls_configure(server, server_cfg) == -1)
-                errx(1, "failed to configure server: %s", tls_error(server));
-
-        failure |= test_tls_fds(client, server);
-
-        tls_reset(client);
-        if (tls_configure(client, client_cfg) == -1)
-                errx(1, "failed to configure client: %s", tls_error(client));
-        tls_reset(server);
-        if (tls_configure(server, server_cfg) == -1)
-                errx(1, "failed to configure server: %s", tls_error(server));
-
-        tls_config_free(client_cfg);
-        tls_config_free(server_cfg);
-
-        failure |= test_tls_socket(client, server);
-
-        tls_free(client);
-        tls_free(server);
-
-        return (failure);
-}
-
-static int
-do_tls_ordering_tests(void)
-{
-        struct tls *client = NULL, *server = NULL, *server_cctx = NULL;
-        struct tls_config *client_cfg, *server_cfg;
-        int failure = 0;
-
-        circular_init();
-
-        if ((client = tls_client()) == NULL)
-                errx(1, "failed to create tls client");
-        if ((client_cfg = tls_config_new()) == NULL)
-                errx(1, "failed to create tls client config");
-        tls_config_insecure_noverifyname(client_cfg);
-        if (tls_config_set_ca_file(client_cfg, cafile) == -1)
-                errx(1, "failed to set ca: %s", tls_config_error(client_cfg));
-
-        if ((server = tls_server()) == NULL)
-                errx(1, "failed to create tls server");
-        if ((server_cfg = tls_config_new()) == NULL)
-                errx(1, "failed to create tls server config");
-        if (tls_config_set_keypair_file(server_cfg, certfile, keyfile) == -1)
-                errx(1, "failed to set keypair: %s",
-                    tls_config_error(server_cfg));
-
-        if (tls_configure(client, client_cfg) == -1)
-                errx(1, "failed to configure client: %s", tls_error(client));
-        if (tls_configure(server, server_cfg) == -1)
-                errx(1, "failed to configure server: %s", tls_error(server));
-
-        tls_config_free(client_cfg);
-        tls_config_free(server_cfg);
-
-        if (tls_handshake(client) != -1) {
-                printf("FAIL: TLS handshake succeeded on unconnnected "
-                    "client context\n");
-                failure = 1;
-                goto done;
-        }
-
-        if (tls_accept_cbs(server, &server_cctx, server_read, server_write,
-            NULL) == -1)
-                errx(1, "failed to accept: %s", tls_error(server));
-
-        if (tls_connect_cbs(client, client_read, client_write, NULL,
-            "test") == -1)
-                errx(1, "failed to connect: %s", tls_error(client));
-
-        if (do_client_server_handshake("ordering", client, server_cctx) != 0) {
-                failure = 1;
-                goto done;
-        }
-
-        if (tls_handshake(client) != -1) {
-                printf("FAIL: TLS handshake succeeded twice\n");
-                failure = 1;
-                goto done;
-        }
-
-        if (tls_handshake(server_cctx) != -1) {
-                printf("FAIL: TLS handshake succeeded twice\n");
-                failure = 1;
-                goto done;
-        }
-
-        if (do_client_server_close("ordering", client, server_cctx) != 0) {
-                failure = 1;
-                goto done;
-        }
-
- done:
-        tls_free(client);
-        tls_free(server);
-        tls_free(server_cctx);
-
-        return (failure);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failure = 0;
-
-        if (argc != 4) {
-                fprintf(stderr, "usage: %s cafile certfile keyfile\n",
-                    argv[0]);
-                return (1);
-        }
-
-        cafile = argv[1];
-        certfile = argv[2];
-        keyfile = argv[3];
-
-        failure |= do_tls_tests();
-        failure |= do_tls_ordering_tests();
-
-        return (failure);
-}
diff --git a/src/regress/lib/libtls/verify/Makefile b/src/regress/lib/libtls/verify/Makefile
deleted file mode 100644
index f8e445b7fc..0000000000
--- a/src/regress/lib/libtls/verify/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#       $OpenBSD: Makefile,v 1.3 2017/01/09 12:34:03 jsing Exp $
-
-PROG=   verifytest
-LDADD=  -lcrypto -lssl ${TLS_INT}
-DPADD=  ${LIBCRYPTO} ${LIBSSL} ${LIBTLS}
-
-WARNINGS=       Yes
-CFLAGS+=        -Werror
-
-.include <bsd.regress.mk>
diff --git a/src/regress/lib/libtls/verify/verifytest.c b/src/regress/lib/libtls/verify/verifytest.c
deleted file mode 100644
index b41b62fcfb..0000000000
--- a/src/regress/lib/libtls/verify/verifytest.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/*      $OpenBSD: verifytest.c,v 1.7 2017/04/30 03:53:31 jsing Exp $    */
-/*
- * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <openssl/x509v3.h>
-#include <tls.h>
-
-extern int tls_check_name(struct tls *ctx, X509 *cert, const char *name,
-    int *match);
-
-struct alt_name {
-        const char name[128];
-        int name_len;
-        int name_type;
-};
-
-struct verify_test {
-        const char common_name[128];
-        int common_name_len;
-        struct alt_name alt_name1;
-        struct alt_name alt_name2;
-        struct alt_name alt_name3;
-        const char name[128];
-        int want_return;
-        int want_match;
-};
-
-struct verify_test verify_tests[] = {
-        {
-                /* CN without SANs - matching. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* Zero length name - non-matching. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .name = "",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN wildcard without SANs - matching. */
-                .common_name = "*.openbsd.org",
-                .common_name_len = -1,
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* CN without SANs - non-matching. */
-                .common_name = "www.openbsdfoundation.org",
-                .common_name_len = -1,
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN wildcard without SANs - invalid CN wildcard. */
-                .common_name = "w*.openbsd.org",
-                .common_name_len = -1,
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN wildcard without SANs - invalid CN wildcard. */
-                .common_name = "www.*.org",
-                .common_name_len = -1,
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN wildcard without SANs - invalid CN wildcard. */
-                .common_name = "www.openbsd.*",
-                .common_name_len = -1,
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN wildcard without SANs - invalid CN wildcard. */
-                .common_name = "*",
-                .common_name_len = -1,
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN wildcard without SANs - invalid CN wildcard. */
-                .common_name = "*.org",
-                .common_name_len = -1,
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN wildcard without SANs - invalid CN wildcard. */
-                .common_name = "*.org",
-                .common_name_len = -1,
-                .name = "openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN IPv4 without SANs - matching. */
-                .common_name = "1.2.3.4",
-                .common_name_len = -1,
-                .name = "1.2.3.4",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* CN IPv4 wildcard without SANS - invalid IP wildcard. */
-                .common_name = "*.2.3.4",
-                .common_name_len = -1,
-                .name = "1.2.3.4",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN IPv6 without SANs - matching. */
-                .common_name = "cafe::beef",
-                .common_name_len = -1,
-                .name = "cafe::beef",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* CN without SANs - error due to embedded NUL in CN. */
-                .common_name = {
-                        0x77, 0x77, 0x77, 0x2e, 0x6f, 0x70, 0x65, 0x6e,
-                        0x62, 0x73, 0x64, 0x2e, 0x6f, 0x72, 0x67, 0x00,
-                        0x6e, 0x61, 0x73, 0x74, 0x79, 0x2e, 0x6f, 0x72,
-                        0x67,
-                },
-                .common_name_len = 25,
-                .name = "www.openbsd.org",
-                .want_return = -1,
-                .want_match = 0,
-        },
-        {
-                /* CN wildcard without SANs - invalid non-matching name. */
-                .common_name = "*.openbsd.org",
-                .common_name_len = -1,
-                .name = ".openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN with SANs - matching on first SAN. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "www.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = "ftp.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* SANs only - matching on first SAN. */
-                .common_name_len = 0,
-                .alt_name1 = {
-                        .name = "www.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = "ftp.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* SANs only - matching on second SAN. */
-                .common_name_len = 0,
-                .alt_name1 = {
-                        .name = "www.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = "ftp.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "ftp.openbsd.org",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* SANs only - non-matching. */
-                .common_name_len = 0,
-                .alt_name1 = {
-                        .name = "www.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = "ftp.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "mail.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN with SANs - matching on second SAN. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "www.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = "ftp.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "ftp.openbsd.org",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* CN with SANs - matching on wildcard second SAN. */
-                .common_name = "www.openbsdfoundation.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "www.openbsdfoundation.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = "*.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* CN with SANs - non-matching invalid wildcard. */
-                .common_name = "www.openbsdfoundation.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "www.openbsdfoundation.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = "*.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN with SANs - non-matching IPv4 due to GEN_DNS SAN. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "www.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = "1.2.3.4",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "1.2.3.4",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN with SANs - matching IPv4 on GEN_IPADD SAN. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "www.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = {0x01, 0x02, 0x03, 0x04},
-                        .name_len = 4,
-                        .name_type = GEN_IPADD,
-                },
-                .name = "1.2.3.4",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* CN with SANs - matching IPv6 on GEN_IPADD SAN. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "www.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = {
-                                0xca, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0xef,
-                        },
-                        .name_len = 16,
-                        .name_type = GEN_IPADD,
-                },
-                .name = "cafe::beef",
-                .want_return = 0,
-                .want_match = 1,
-        },
-        {
-                /* CN with SANs - error due to embedded NUL in GEN_DNS. */
-                .common_name = "www.openbsd.org.nasty.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "www.openbsd.org.nasty.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .alt_name2 = {
-                        .name = {
-                                0x77, 0x77, 0x77, 0x2e, 0x6f, 0x70, 0x65, 0x6e,
-                                0x62, 0x73, 0x64, 0x2e, 0x6f, 0x72, 0x67, 0x00,
-                                0x6e, 0x61, 0x73, 0x74, 0x79, 0x2e, 0x6f, 0x72,
-                                0x67,
-                        },
-                        .name_len = 25,
-                        .name_type = GEN_DNS,
-                },
-                .name = "www.openbsd.org",
-                .want_return = -1,
-                .want_match = 0,
-        },
-        {
-                /* CN with SAN - non-matching due to non-matching SAN. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = "ftp.openbsd.org",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "www.openbsd.org",
-                .want_return = 0,
-                .want_match = 0,
-        },
-        {
-                /* CN with SAN - error due to illegal dNSName. */
-                .common_name = "www.openbsd.org",
-                .common_name_len = -1,
-                .alt_name1 = {
-                        .name = " ",
-                        .name_len = -1,
-                        .name_type = GEN_DNS,
-                },
-                .name = "www.openbsd.org",
-                .want_return = -1,
-                .want_match = 0,
-        },
-};
-
-#define N_VERIFY_TESTS \
-    (sizeof(verify_tests) / sizeof(*verify_tests))
-
-static void
-alt_names_add(STACK_OF(GENERAL_NAME) *alt_name_stack, struct alt_name *alt)
-{
-        ASN1_STRING *alt_name_str;
-        GENERAL_NAME *alt_name;
-
-        if ((alt_name = GENERAL_NAME_new()) == NULL)
-                errx(1, "failed to malloc GENERAL_NAME");
-        alt_name->type = alt->name_type;
-
-        if ((alt_name_str = ASN1_STRING_new()) == NULL)
-                errx(1, "failed to malloc alt name");
-        if (ASN1_STRING_set(alt_name_str, alt->name, alt->name_len) == 0)
-                errx(1, "failed to set alt name");
-
-        switch (alt_name->type) {
-        case GEN_DNS:
-                alt_name->d.dNSName = alt_name_str;
-                break;
-        case GEN_IPADD:
-                alt_name->d.iPAddress = alt_name_str;
-                break;
-        default:
-                errx(1, "unknown alt name type (%i)", alt_name->type);
-        }
-
-        if (sk_GENERAL_NAME_push(alt_name_stack, alt_name) == 0)
-                errx(1, "failed to push alt_name");
-}
-
-static void
-cert_add_alt_names(X509 *cert, struct verify_test *vt)
-{
-        STACK_OF(GENERAL_NAME) *alt_name_stack = NULL;
-
-        if (vt->alt_name1.name_type == 0)
-                return;
-
-        if ((alt_name_stack = sk_GENERAL_NAME_new_null()) == NULL)
-                errx(1, "failed to malloc sk_GENERAL_NAME");
-
-        if (vt->alt_name1.name_type != 0)
-                alt_names_add(alt_name_stack, &vt->alt_name1);
-        if (vt->alt_name2.name_type != 0)
-                alt_names_add(alt_name_stack, &vt->alt_name2);
-        if (vt->alt_name3.name_type != 0)
-                alt_names_add(alt_name_stack, &vt->alt_name3);
-
-        if (X509_add1_ext_i2d(cert, NID_subject_alt_name,
-            alt_name_stack, 0, 0) == 0)
-                errx(1, "failed to set subject alt name");
-
-        sk_GENERAL_NAME_pop_free(alt_name_stack, GENERAL_NAME_free);
-}
-
-static int
-do_verify_test(int test_no, struct verify_test *vt)
-{
-        struct tls *tls;
-        X509_NAME *name;
-        X509 *cert;
-        int failed = 1;
-        int match;
-
-        /* Build certificate structure. */
-        if ((cert = X509_new()) == NULL)
-                errx(1, "failed to malloc X509");
-
-        if (vt->common_name_len != 0) {
-                if ((name = X509_NAME_new()) == NULL)
-                        errx(1, "failed to malloc X509_NAME");
-                if (X509_NAME_add_entry_by_NID(name, NID_commonName,
-                    MBSTRING_ASC, (unsigned char *)vt->common_name,
-                    vt->common_name_len, -1, 0) == 0)
-                        errx(1, "failed to add name entry");
-                if (X509_set_subject_name(cert, name) == 0)
-                        errx(1, "failed to set subject name");
-                X509_NAME_free(name);
-        }
-
-        if ((tls = tls_client()) == NULL)
-                errx(1, "failed to malloc tls_client");
-
-        cert_add_alt_names(cert, vt);
-
-        match = 1;
-
-        if (tls_check_name(tls, cert, vt->name, &match) != vt->want_return) {
-                fprintf(stderr, "FAIL: test %i failed for check name '%s': "
-                    "%s\n", test_no, vt->name, tls_error(tls));
-                goto done;
-        }
-        if (match != vt->want_match) {
-                fprintf(stderr, "FAIL: test %i failed to match name '%s'\n",
-                    test_no, vt->name);
-                goto done;
-        }
-
-        failed = 0;
-
- done:
-        X509_free(cert);
-        tls_free(tls);
-
-        return (failed);
-}
-
-int
-main(int argc, char **argv)
-{
-        int failed = 0;
-        size_t i;
-
-        tls_init();
-
-        for (i = 0; i < N_VERIFY_TESTS; i++)
-                failed += do_verify_test(i, &verify_tests[i]);
-
-        return (failed);
-}