aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-08-31 10:06:01 +0200
committerHans Nilsson <[email protected]>2018-08-31 10:06:01 +0200
commit860ee1974caac4447dcbd7f9d7c27a252170d7a3 (patch)
tree00f70c698f1870eb9d4d6d766c0d959bf1e81770
parent583b7add1d66616e61c332ded0658c684c39c8c6 (diff)
parent734ca41ae58ea5cf6d73cccb6ec6e37868991642 (diff)
downloadotp-860ee1974caac4447dcbd7f9d7c27a252170d7a3.tar.gz
otp-860ee1974caac4447dcbd7f9d7c27a252170d7a3.tar.bz2
otp-860ee1974caac4447dcbd7f9d7c27a252170d7a3.zip
Merge branch 'hans/crypto/init_test_engine_fix' into maint
* hans/crypto/init_test_engine_fix: crypto: Let otp_test_engine only add what is needed OpenSSL_add_all_algorithms hangs on some test machines
-rw-r--r--lib/crypto/c_src/otp_test_engine.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/crypto/c_src/otp_test_engine.c b/lib/crypto/c_src/otp_test_engine.c
index b6c9067964..34c825059f 100644
--- a/lib/crypto/c_src/otp_test_engine.c
+++ b/lib/crypto/c_src/otp_test_engine.c
@@ -64,7 +64,8 @@ static int test_init(ENGINE *e) {
printf("OTP Test Engine Initializatzion!\r\n");
/* Load all digest and cipher algorithms. Needed for password protected private keys */
- OpenSSL_add_all_algorithms();
+ OpenSSL_add_all_ciphers();
+ OpenSSL_add_all_digests();
return 111;
}