e_tpm2: fix spurious error on successful operation

When the engine successfully performs an operation with an older key,
we still end up with an apparent error (which can be displayed to the
user) about a failed load.  This comes from the initial failed attempt
to load the new key format and can be fixed by clearing all openssl
errors if the old key format load succeeds.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/e_tpm2.c b/e_tpm2.c
index 84af5e5..532db0e 100644
--- a/e_tpm2.c
+++ b/e_tpm2.c
@@ -373,6 +373,8 @@ static int tpm2_engine_load_key_core(ENGINE *e, EVP_PKEY **ppkey,
 		BIO_seek(bf, 0);
 		tssl = PEM_read_bio_TSSLOADABLE(bf, NULL, NULL, NULL);
 		if (tssl) {
+			/* have error from failed TSSPRIVKEY load */
+			ERR_clear_error();
 			type = tssl->type;
 			empty_auth = tssl->emptyAuth;
 			parent = tssl->parent;