From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 13 Oct 2018 03:34:59 +0000 (-0700)
Subject: Fall back to tpm2tss engine
X-Git-Tag: v8.00~39
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3453c36ab9fa785917d0e6ca3d1633d30be5a087;p=users%2Fdwmw2%2Fopenconnect.git

Fall back to tpm2tss engine

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/openssl.c b/openssl.c
index e4a28b21..fce02674 100644
--- a/openssl.c
+++ b/openssl.c
@@ -592,6 +592,10 @@ static int load_tpm_certificate(struct openconnect_info *vpninfo,
 	ENGINE_load_builtin_engines();
 
 	e = ENGINE_by_id(engine);
+	if (!e && !strcmp(engine, "tpm2")) {
+		ERR_clear_error();
+		e = ENGINE_by_id("tpm2tss");
+	}
 	if (!e) {
 		vpn_progress(vpninfo, PRG_ERR, _("Can't load TPM engine.\n"));
 		openconnect_report_ssl_errors(vpninfo);