pubkey: Move sexp parsing for gcry_pk_verify to the modules.

* cipher/rsa.c (rsa_verify): Revamp.
* cipher/dsa.c (dsa_verify): Revamp.
* cipher/elgamal.c (elg_verify): Revamp.
* cipher/ecc.c (ecc_verify): Revamp.
* cipher/pubkey.c (sexp_to_sig): Remove.
(pss_verify_cmp): Move to pubkey-util.c
(sexp_data_to_mpi): Ditto.
(init_encoding_ctx): Ditto.
(gcry_pk_verify): Simplify.
* cipher/pubkey-util.c (_gcry_pk_util_init_encoding_ctx): Add. Take
from pubkey.c
(get_hash_algo): Ditto.
(_gcry_pk_util_data_to_mpi): Ditto.
(pss_verify_cmp): Ditto.
(_gcry_pk_util_extract_mpis): New.
(_gcry_pk_util_preparse_sigval): New.
(_gcry_pk_util_free_encoding_ctx): New.
* cipher/ecc-curves.c (_gcry_ecc_fill_in_curve): Make curve init
optional.

* src/g10lib.h (GCC_ATTR_SENTINEL): New.

* tests/basic.c (check_pubkey_sign): Print the algo name.
(main): Add option --pubkey.

Signed-off-by: Werner Koch <wk@gnupg.org>

1 files changed, 20 insertions, 9 deletions

diff --git a/cipher/ecc-curves.c b/cipher/ecc-curves.c
index 449a168e..971dd322 100644
--- a/cipher/ecc-curves.c
+++ b/cipher/ecc-curves.c
@@ -308,7 +308,9 @@ scanval (const char *string)
    parameters of the named curve or those of a suitable curve.  If
    R_NBITS is not NULL, the chosen number of bits is stored there.
    NULL may be given for R_CURVE, if the value is not required and for
-   example only a quick test for availability is desired.  */
+   example only a quick test for availability is desired.  Note that
+   the curve fields should be initialized to zero because fields which
+   are not NULL are skipped.  */
 gpg_err_code_t
 _gcry_ecc_fill_in_curve (unsigned int nbits, const char *name,
                          elliptic_curve_t *curve, unsigned int *r_nbits)
@@ -378,14 +380,22 @@ _gcry_ecc_fill_in_curve (unsigned int nbits, const char *name,
     {
       curve->model = domain_parms[idx].model;
       curve->dialect = domain_parms[idx].dialect;
-      curve->p = scanval (domain_parms[idx].p);
-      curve->a = scanval (domain_parms[idx].a);
-      curve->b = scanval (domain_parms[idx].b);
-      curve->n = scanval (domain_parms[idx].n);
-      curve->G.x = scanval (domain_parms[idx].g_x);
-      curve->G.y = scanval (domain_parms[idx].g_y);
-      curve->G.z = mpi_alloc_set_ui (1);
-      curve->name = resname;
+      if (!curve->p)
+        curve->p = scanval (domain_parms[idx].p);
+      if (!curve->a)
+        curve->a = scanval (domain_parms[idx].a);
+      if (!curve->b)
+        curve->b = scanval (domain_parms[idx].b);
+      if (!curve->n)
+        curve->n = scanval (domain_parms[idx].n);
+      if (!curve->G.x)
+        curve->G.x = scanval (domain_parms[idx].g_x);
+      if (!curve->G.y)
+        curve->G.y = scanval (domain_parms[idx].g_y);
+      if (!curve->G.z)
+        curve->G.z = mpi_alloc_set_ui (1);
+      if (!curve->name)
+        curve->name = resname;
     }
 
   return 0;
@@ -764,6 +774,7 @@ _gcry_ecc_get_param (const char *name, gcry_mpi_t *pkey)
   mpi_ec_t ctx;
   gcry_mpi_t g_x, g_y;
 
+  memset (&E, 0, sizeof E);
   err = _gcry_ecc_fill_in_curve (0, name, &E, &nbits);
   if (err)
     return err;