From fb1118fbee181ebbe9e392e154b296f14bcd5354 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sun, 19 Nov 2023 13:11:06 +0000 Subject: Unifdef OPENSSL_NO_ENGINE in libcrypto regress --- src/regress/lib/libcrypto/evp/evptest.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'src/regress/lib/libcrypto/evp') diff --git a/src/regress/lib/libcrypto/evp/evptest.c b/src/regress/lib/libcrypto/evp/evptest.c index 6f677dd959..0b9436a83f 100644 --- a/src/regress/lib/libcrypto/evp/evptest.c +++ b/src/regress/lib/libcrypto/evp/evptest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evptest.c,v 1.12 2023/03/02 20:24:51 tb Exp $ */ +/* $OpenBSD: evptest.c,v 1.13 2023/11/19 13:11:06 tb Exp $ */ /* Written by Ben Laurie, 2001 */ /* * Copyright (c) 2001 The OpenSSL Project. All rights reserved. @@ -53,9 +53,6 @@ #include #include -#ifndef OPENSSL_NO_ENGINE -#include -#endif #include #include @@ -350,23 +347,6 @@ main(int argc, char **argv) /* 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[8 * 1024]; @@ -457,9 +437,6 @@ main(int argc, char **argv) } fclose(f); -#ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); -#endif EVP_cleanup(); CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); -- cgit v1.2.3-55-g6feb