Additonal removals of engine references in tests/*

Spotted by @andrewkdinh, some extra notes about/useages of engines that
are now vestigial.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28525)

diff --git a/test/README-dev.md b/test/README-dev.md
index d8922de000800f0c6590d39f539d64b978968916..3b855d8519a49ee99d32a34e123d5f77158c11bb 100644 (file)
--- a/test/README-dev.md
+++ b/test/README-dev.md
@@ -29,7 +29,7 @@ The number `{nn}` is (somewhat loosely) grouped as follows:
     15-19  individual asymmetric cipher algorithms
     20-24  openssl commands (some otherwise not tested)
     25-29  certificate forms, generation and verification
-    30-35  engine and evp
+    30-35  evp
     60-79  APIs:
        60  X509 subsystem
        61  BIO subsystem

diff --git a/test/helpers/ssltestlib.c b/test/helpers/ssltestlib.c
index f25e63662cc45aabc2ba0cc3c9e2a0756b92ac4d..b7429778fbb22898d5355c9fbe135ebb372b4e23 100644 (file)
--- a/test/helpers/ssltestlib.c
+++ b/test/helpers/ssltestlib.c
@@ -9,7 +9,6 @@
 
 #include <string.h>
 
-#include <openssl/engine.h>
 #include "internal/e_os.h"
 #include "internal/nelem.h"
 #include "ssltestlib.h"

diff --git a/test/run_tests.pl b/test/run_tests.pl
index 7b1c8deecbea6ce058d6c47760cab26e7835eaca..38d38bdb5cb7b5e9a9f78d67463ab3f476e436a6 100644 (file)
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -70,7 +70,6 @@ if (!defined($jobs)) {
 $ENV{OPENSSL_CONF} = rel2abs(catfile($srctop, "apps", "openssl.cnf"));
 $ENV{OPENSSL_CONF_INCLUDE} = rel2abs(catdir($bldtop, "test"));
 $ENV{OPENSSL_MODULES} = rel2abs(catdir($bldtop, "providers"));
-$ENV{OPENSSL_ENGINES} = rel2abs(catdir($bldtop, "engines"));
 $ENV{CTLOG_FILE} = rel2abs(catfile($srctop, "test", "ct", "log_list.cnf"));
 
 # On platforms that support this, this will ensure malloc returns data that is

diff --git a/test/sslbuffertest.c b/test/sslbuffertest.c
index 78705f78051c717f88e8a55ce9403dd970d46ccf..caa048b278ed2d7ff13e7b312fc1d4892cbdc1ab 100644 (file)
--- a/test/sslbuffertest.c
+++ b/test/sslbuffertest.c
@@ -8,14 +8,6 @@
  * or in the file LICENSE in the source distribution.
  */
 
-/*
- * We need access to the deprecated low level Engine APIs for legacy purposes
- * when the deprecated calls are not hidden
- */
-#ifndef OPENSSL_NO_DEPRECATED_3_0
-# define OPENSSL_SUPPRESS_DEPRECATED
-#endif
-
 #include <string.h>
 #include <openssl/ssl.h>
 #include <openssl/bio.h>