security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

agent: Remove duplicated code for EdDSA. 

* agent/command-ssh.c (ssh_receive_key): Curve is "Ed25519".
Use sexp_key_construct always.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-06-05 09:13:52 +09:00
parent 4c0b12f817
commit 2e988546c5
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
agent/command-ssh.c
View File

@ -2123,6 +2123,10 @@ ssh_receive_key (estream_t stream, gcry_sexp_t *key_new, int secret,
* we only want the real 32 byte private key - Libgcrypt expects
* this.
*/
/* For now, it's only Ed25519. In future, Ed448 will come. */
curve_name = "Ed25519";
mpi_list = xtrycalloc (3, sizeof *mpi_list);
if (!mpi_list)
{
@ -2229,38 +2233,14 @@ ssh_receive_key (estream_t stream, gcry_sexp_t *key_new, int secret,
goto out;
}
if ((spec.flags & SPEC_FLAG_IS_EdDSA))
err = sexp_key_construct (&key, spec, secret, curve_name, mpi_list,
comment? comment:"");
if (!err)
{
if (secret)
{
err = gcry_sexp_build (&key, NULL,
"(private-key(ecc(curve \"Ed25519\")"
"(flags eddsa)(q %m)(d %m))"
"(comment%s))",
mpi_list[0], mpi_list[1],
comment? comment:"");
}
else
{
err = gcry_sexp_build (&key, NULL,
"(public-key(ecc(curve \"Ed25519\")"
"(flags eddsa)(q %m))"
"(comment%s))",
mpi_list[0],
comment? comment:"");
}
if (key_spec)
*key_spec = spec;
*key_new = key;
}
else
{
err = sexp_key_construct (&key, spec, secret, curve_name, mpi_list,
comment? comment:"");
if (err)
goto out;
}
if (key_spec)
*key_spec = spec;
*key_new = key;
out:
es_fclose (cert);