Reworked the ECC changes to better fit into the Libgcrypt API.

See ChangeLog for details.  Key generation, signing and verification works.
Encryption does not yet work.  Requires latest Libgcrypt changes.

1 files changed, 12 insertions, 9 deletions

diff --git a/g10/keyid.c b/g10/keyid.c
index 0405b8b2f..6571a51c0 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -724,17 +724,20 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array)
 
     case PUBKEY_ALGO_ECDSA:
     case PUBKEY_ALGO_ECDH:
-      err = gcry_sexp_build (&s_pkey, NULL,
-                             "(public-key(ecc(c%m)(q%m)))",
-                             pk->pkey[0], pk->pkey[1]);
+      {
+        char *curve = openpgp_oid_to_str (pk->pkey[0]);
+        if (!curve)
+          err = gpg_error_from_syserror ();
+        else
+          {
+            err = gcry_sexp_build (&s_pkey, NULL,
+                                   "(public-key(ecc(curve%s)(q%m)))",
+                                   curve, pk->pkey[1]);
+            xfree (curve);
+          }
+      }
       break;
 
-   /* case PUBKEY_ALGO_ECDH: */
-   /*    err = gcry_sexp_build (&s_pkey, NULL, */
-   /*                           "(public-key(ecdh(c%m)(q%m)(p%m)))", */
-   /*                           pk->pkey[0], pk->pkey[1], pk->pkey[2]); */
-   /*    break; */
-
     default:
       err = gpg_error (GPG_ERR_PUBKEY_ALGO);
       break;