Use GNUTLS_PK_ECC instead of GNUTLS_PK_ECDSA for compatibility

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

diff --git a/gnutls_tpm2.c b/gnutls_tpm2.c
index 8c2d462e24aa5a7411ea00b1cc84381c1c7db0d6..698a9e2edb497045e7f052fba242bcab15661aec 100644 (file)
--- 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
index 7088a3eb957b342e6c271ba1bc681a27ddc6d297..ddf617cedac377b037f4c12224feb9c36e478a39 100644 (file)
--- 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
index 223fd5afae31284aecdac3c05a0feef48db2e19c..3fe33b6c70efe7b81a0e9bd7bafb3d6ad2fdaea6 100644 (file)
--- 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,