diff options
Diffstat (limited to 'src/regress/lib/libcrypto/pbkdf2/pbkdf2.c')
| -rw-r--r-- | src/regress/lib/libcrypto/pbkdf2/pbkdf2.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/regress/lib/libcrypto/pbkdf2/pbkdf2.c b/src/regress/lib/libcrypto/pbkdf2/pbkdf2.c index 9cbc031821..33b683f0a0 100644 --- a/src/regress/lib/libcrypto/pbkdf2/pbkdf2.c +++ b/src/regress/lib/libcrypto/pbkdf2/pbkdf2.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pbkdf2.c,v 1.2 2018/07/17 17:06:49 tb Exp $ */ | 1 | /* $OpenBSD: pbkdf2.c,v 1.3 2023/11/19 13:11:06 tb Exp $ */ |
| 2 | /* Written by Christian Heimes, 2013 */ | 2 | /* Written by Christian Heimes, 2013 */ |
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2013 The OpenSSL Project. All rights reserved. | 4 | * Copyright (c) 2013 The OpenSSL Project. All rights reserved. |
| @@ -56,9 +56,6 @@ | |||
| 56 | 56 | ||
| 57 | #include <openssl/opensslconf.h> | 57 | #include <openssl/opensslconf.h> |
| 58 | #include <openssl/evp.h> | 58 | #include <openssl/evp.h> |
| 59 | #ifndef OPENSSL_NO_ENGINE | ||
| 60 | #include <openssl/engine.h> | ||
| 61 | #endif | ||
| 62 | #include <openssl/err.h> | 59 | #include <openssl/err.h> |
| 63 | #include <openssl/conf.h> | 60 | #include <openssl/conf.h> |
| 64 | 61 | ||
| @@ -192,10 +189,6 @@ main(int argc,char **argv) | |||
| 192 | const testdata *test = test_cases; | 189 | const testdata *test = test_cases; |
| 193 | 190 | ||
| 194 | OpenSSL_add_all_digests(); | 191 | OpenSSL_add_all_digests(); |
| 195 | #ifndef OPENSSL_NO_ENGINE | ||
| 196 | ENGINE_load_builtin_engines(); | ||
| 197 | ENGINE_register_all_digests(); | ||
| 198 | #endif | ||
| 199 | 192 | ||
| 200 | for (n = 0; test->pass != NULL; n++, test++) { | 193 | for (n = 0; test->pass != NULL; n++, test++) { |
| 201 | test_p5_pbkdf2(n, "sha1", test, sha1_results[n]); | 194 | test_p5_pbkdf2(n, "sha1", test, sha1_results[n]); |
| @@ -203,9 +196,6 @@ main(int argc,char **argv) | |||
| 203 | test_p5_pbkdf2(n, "sha512", test, sha512_results[n]); | 196 | test_p5_pbkdf2(n, "sha512", test, sha512_results[n]); |
| 204 | } | 197 | } |
| 205 | 198 | ||
| 206 | #ifndef OPENSSL_NO_ENGINE | ||
| 207 | ENGINE_cleanup(); | ||
| 208 | #endif | ||
| 209 | EVP_cleanup(); | 199 | EVP_cleanup(); |
| 210 | CRYPTO_cleanup_all_ex_data(); | 200 | CRYPTO_cleanup_all_ex_data(); |
| 211 | ERR_remove_thread_state(NULL); | 201 | ERR_remove_thread_state(NULL); |
