diff options
Diffstat (limited to 'src/regress/lib/libcrypto/evp/evptest.c')
| -rw-r--r-- | src/regress/lib/libcrypto/evp/evptest.c | 25 |
1 files changed, 1 insertions, 24 deletions
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 @@ | |||
| 1 | /* $OpenBSD: evptest.c,v 1.12 2023/03/02 20:24:51 tb Exp $ */ | 1 | /* $OpenBSD: evptest.c,v 1.13 2023/11/19 13:11:06 tb Exp $ */ |
| 2 | /* Written by Ben Laurie, 2001 */ | 2 | /* Written by Ben Laurie, 2001 */ |
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2001 The OpenSSL Project. All rights reserved. | 4 | * Copyright (c) 2001 The OpenSSL Project. All rights reserved. |
| @@ -53,9 +53,6 @@ | |||
| 53 | 53 | ||
| 54 | #include <openssl/opensslconf.h> | 54 | #include <openssl/opensslconf.h> |
| 55 | #include <openssl/evp.h> | 55 | #include <openssl/evp.h> |
| 56 | #ifndef OPENSSL_NO_ENGINE | ||
| 57 | #include <openssl/engine.h> | ||
| 58 | #endif | ||
| 59 | #include <openssl/err.h> | 56 | #include <openssl/err.h> |
| 60 | #include <openssl/conf.h> | 57 | #include <openssl/conf.h> |
| 61 | 58 | ||
| @@ -350,23 +347,6 @@ main(int argc, char **argv) | |||
| 350 | /* Load up the software EVP_CIPHER and EVP_MD definitions */ | 347 | /* Load up the software EVP_CIPHER and EVP_MD definitions */ |
| 351 | OpenSSL_add_all_ciphers(); | 348 | OpenSSL_add_all_ciphers(); |
| 352 | OpenSSL_add_all_digests(); | 349 | OpenSSL_add_all_digests(); |
| 353 | #ifndef OPENSSL_NO_ENGINE | ||
| 354 | /* Load all compiled-in ENGINEs */ | ||
| 355 | ENGINE_load_builtin_engines(); | ||
| 356 | #endif | ||
| 357 | #if 0 | ||
| 358 | OPENSSL_config(); | ||
| 359 | #endif | ||
| 360 | #ifndef OPENSSL_NO_ENGINE | ||
| 361 | /* Register all available ENGINE implementations of ciphers and digests. | ||
| 362 | * This could perhaps be changed to "ENGINE_register_all_complete()"? */ | ||
| 363 | ENGINE_register_all_ciphers(); | ||
| 364 | ENGINE_register_all_digests(); | ||
| 365 | /* If we add command-line options, this statement should be switchable. | ||
| 366 | * It'll prevent ENGINEs being ENGINE_init()ialised for cipher/digest use if | ||
| 367 | * they weren't already initialised. */ | ||
| 368 | /* ENGINE_set_cipher_flags(ENGINE_CIPHER_FLAG_NOINIT); */ | ||
| 369 | #endif | ||
| 370 | 350 | ||
| 371 | for (;;) { | 351 | for (;;) { |
| 372 | char line[8 * 1024]; | 352 | char line[8 * 1024]; |
| @@ -457,9 +437,6 @@ main(int argc, char **argv) | |||
| 457 | } | 437 | } |
| 458 | fclose(f); | 438 | fclose(f); |
| 459 | 439 | ||
| 460 | #ifndef OPENSSL_NO_ENGINE | ||
| 461 | ENGINE_cleanup(); | ||
| 462 | #endif | ||
| 463 | EVP_cleanup(); | 440 | EVP_cleanup(); |
| 464 | CRYPTO_cleanup_all_ex_data(); | 441 | CRYPTO_cleanup_all_ex_data(); |
| 465 | ERR_remove_thread_state(NULL); | 442 | ERR_remove_thread_state(NULL); |
