From 8c1968a1e52c3d45a96509e9eba753357ad377c9 Mon Sep 17 00:00:00 2001 From: Petr Gotthard Date: Sat, 7 Aug 2021 11:45:14 +0200 Subject: [PATCH 05/17] openssl: Remove functions that have no effect in OpenSSL >= 1.1.0 This will work with OpenSSL 1.1.0 through 3.0.0. Signed-off-by: Petr Gotthard --- lib/tpm2_convert.c | 1 - tools/tpm2_tool.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/lib/tpm2_convert.c b/lib/tpm2_convert.c index 27a0effe..cc1c18ab 100644 --- a/lib/tpm2_convert.c +++ b/lib/tpm2_convert.c @@ -262,7 +262,6 @@ static bool tpm2_convert_pubkey_bio(TPMT_PUBLIC *public, "Unsupported key type for requested output format. Only RSA is supported."); } - ERR_free_strings(); return result; } diff --git a/tools/tpm2_tool.c b/tools/tpm2_tool.c index f4865266..edd04c83 100644 --- a/tools/tpm2_tool.c +++ b/tools/tpm2_tool.c @@ -230,14 +230,6 @@ int main(int argc, char **argv) { tpm2_errata_init(ctx.ectx); } - /* - * Load the openssl error strings and algorithms - * so library routines work as expected. - */ - OpenSSL_add_all_algorithms(); - OpenSSL_add_all_ciphers(); - ERR_load_crypto_strings(); - /* * Call the specific tool, all tools implement this function instead of * 'main'. -- 2.31.1