From 74a79bed4ba68f43cd02fcf6e0fca5cb5a98b645 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 4 Jun 2020 18:50:37 +0900 Subject: ecc-sos,gpg: More fixes for SOS. Signed-off-by: NIIBE Yutaka --- g10/sign.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'g10/sign.c') diff --git a/g10/sign.c b/g10/sign.c index 90466e9bc..6b69851f7 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -505,10 +505,11 @@ do_sign (ctrl_t ctrl, PKT_public_key *pksk, PKT_signature *sig, else if (pksk->pubkey_algo == GCRY_PK_RSA || pksk->pubkey_algo == GCRY_PK_RSA_S) sig->data[0] = get_mpi_from_sexp (s_sigval, "s", GCRYMPI_FMT_USG); - else if (openpgp_oid_is_ed25519 (pksk->pkey[0])) + else if (pksk->pubkey_algo == PUBKEY_ALGO_ECDSA + || pksk->pubkey_algo == PUBKEY_ALGO_EDDSA) { - sig->data[0] = get_mpi_from_sexp (s_sigval, "r", GCRYMPI_FMT_OPAQUE); - sig->data[1] = get_mpi_from_sexp (s_sigval, "s", GCRYMPI_FMT_OPAQUE); + sig->data[0] = get_sos_from_sexp (s_sigval, "r"); + sig->data[1] = get_sos_from_sexp (s_sigval, "s"); } else { -- cgit v1.2.3