Use GNUTLS_PK_ECC instead of GNUTLS_PK_ECDSA for compatibility

Fixes: #76 Signed-off-by: David Woodhouse <dwmw2@infradead.org>
sailfishos-mirror · Oct 3, 2019 · 9b8fa32 · 9b8fa32
1 parent 093de80
commit 9b8fa32
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gnutls_tpm2.c b/gnutls_tpm2.c
@@ -298,7 +298,7 @@ int load_tpm2_key(struct openconnect_info *vpninfo, gnutls_datum_t *fdata,
 #endif
 		break;
 
-	case GNUTLS_PK_ECDSA:
+	case GNUTLS_PK_ECC:
 #if GNUTLS_VERSION_NUMBER >= 0x030600
 		gnutls_privkey_import_ext4(*pkey, vpninfo, NULL, tpm2_ec_sign_hash_fn, NULL, NULL, ec_key_info, 0);
 #elif GNUTLS_VERSION_NUMBER >= 0x030400

diff --git a/gnutls_tpm2_esys.c b/gnutls_tpm2_esys.c
@@ -562,7 +562,7 @@ int install_tpm2_key(struct openconnect_info *vpninfo, gnutls_privkey_t *pkey, g
 
 	switch(vpninfo->tpm2->pub.publicArea.type) {
 	case TPM2_ALG_RSA: return GNUTLS_PK_RSA;
-	case TPM2_ALG_ECC: return GNUTLS_PK_ECDSA;
+	case TPM2_ALG_ECC: return GNUTLS_PK_ECC;
 	}
 
 	vpn_progress(vpninfo, PRG_ERR,

diff --git a/gnutls_tpm2_ibm.c b/gnutls_tpm2_ibm.c
@@ -516,7 +516,7 @@ int install_tpm2_key(struct openconnect_info *vpninfo, gnutls_privkey_t *pkey, g
 
 	switch(vpninfo->tpm2->pub.publicArea.type) {
 	case TPM_ALG_RSA: return GNUTLS_PK_RSA;
-	case TPM_ALG_ECC: return GNUTLS_PK_ECDSA;
+	case TPM_ALG_ECC: return GNUTLS_PK_ECC;
 	}
 
 	vpn_progress(vpninfo, PRG_ERR,