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