aboutsummaryrefslogtreecommitdiffstats
path: root/sm/certreqgen.c
diff options
context:
space:
mode:
authorDamien Goutte-Gattat via Gnupg-devel <[email protected]>2019-02-17 17:40:51 +0000
committerNIIBE Yutaka <[email protected]>2019-02-18 02:33:20 +0000
commit3cbdf896e6919333b5423001ab58c01a04363386 (patch)
tree7d434971ab3021c5931e0c58e0fa1e33272ea2d8 /sm/certreqgen.c
parentsm: Support generation of card-based ECDSA CSR. (diff)
downloadgnupg-3cbdf896e6919333b5423001ab58c01a04363386.tar.gz
gnupg-3cbdf896e6919333b5423001ab58c01a04363386.zip
sm: Support generation of card-based ed25519 CSR.
* sm/call-agent.c (gpgsm_scd_pksign): Allow SHA512. Create proper S-expression for EdDSA signature. * sm/certreqgen.c (create_request): Force use of SHA512 when using a ed25519 key. * sm/misc.c (transform_sigval): Insert OID for ed25519. -- GnuPG-bug-id: 4013 Signed-off-by: Damien Goutte-Gattat <[email protected]>
Diffstat (limited to 'sm/certreqgen.c')
-rw-r--r--sm/certreqgen.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 1d610c1bb..01fba30f5 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -807,8 +807,10 @@ create_request (ctrl_t ctrl,
if (err)
return err;
- string = get_parameter_value (para, pHASHALGO, 0);
- if (string)
+ len = gcry_sexp_canon_len (public, 0, NULL, NULL);
+ if (get_pk_algo_from_canon_sexp (public, len) == GCRY_PK_EDDSA)
+ mdalgo = GCRY_MD_SHA512;
+ else if ((string = get_parameter_value (para, pHASHALGO, 0)))
mdalgo = gcry_md_map_name (string);
else
mdalgo = GCRY_MD_SHA256;