111 files changed, 0 insertions, 21379 deletions
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