Remove engine regress.

Engines are no longer a thing.

Discussed with tb@

3 files changed, 1 insertions, 264 deletions

diff --git a/regress/lib/libcrypto/Makefile b/regress/lib/libcrypto/Makefile
index 01ffd292273..0e279cca1db 100644
--- a/regress/lib/libcrypto/Makefile
+++ b/regress/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.52 2023/04/25 15:18:59 tb Exp $
+#	$OpenBSD: Makefile,v 1.53 2023/12/27 12:26:17 jsing Exp $
 
 SUBDIR += aead
 SUBDIR += aes
@@ -22,7 +22,6 @@ SUBDIR += dsa
 SUBDIR += ec
 SUBDIR += ecdh
 SUBDIR += ecdsa
-SUBDIR += engine
 SUBDIR += evp
 SUBDIR += free
 SUBDIR += gcm128
diff --git a/regress/lib/libcrypto/engine/Makefile b/regress/lib/libcrypto/engine/Makefile
deleted file mode 100644
index 7f11b0d3822..00000000000
--- a/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/regress/lib/libcrypto/engine/enginetest.c b/regress/lib/libcrypto/engine/enginetest.c
deleted file mode 100644
index 9afae39190a..00000000000
--- a/regress/lib/libcrypto/engine/enginetest.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*	$OpenBSD: enginetest.c,v 1.10 2023/06/19 18:52:29 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>
-#ifndef OPENSSL_NO_ENGINE
-#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 %d, 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%d", loop) == -1)
-			goto end;
-		if (asprintf(&name, "Fake engine type %d", 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 %d, (%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;
-}
-#else
-int
-main(void)
-{
-	printf("ENGINE support is disabled\n");
-	return 0;
-}
-#endif