security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

common: Fix confusion of get_pk_algo_from_key.

Browse Source 
* common/ssh-utils.c (ssh_public_key_in_base64): Fix the constants.

--

Fixes-commit: 8e650dbd48fa5fde6d8f08154e6a892d495e9227
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-03-04 10:57:48 +09:00
parent 58e6990eaa
commit 14e13fb712
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/ssh-utils.c
View File

@ -572,7 +572,7 @@ ssh_public_key_in_base64 (gcry_sexp_t key, estream_t stream,
if (algo == 0)
return gpg_error (GPG_ERR_PUBKEY_ALGO);
if (algo == PUBKEY_ALGO_ECDSA || algo == PUBKEY_ALGO_EDDSA)
if (algo == GCRY_PK_ECC || algo == GCRY_PK_EDDSA)
{
curve = gcry_pk_get_curve (key, 0, NULL);
if (!curve)
@ -581,12 +581,12 @@ ssh_public_key_in_base64 (gcry_sexp_t key, estream_t stream,
switch (algo)
{
case PUBKEY_ALGO_RSA:
case GCRY_PK_RSA:
identifier = "ssh-rsa";
pub_elements = "en";
break;
case PUBKEY_ALGO_ECDSA:
case GCRY_PK_ECC:
if (!strcmp (curve, "nistp256"))
identifier = "ecdsa-sha2-nistp256";
else if (!strcmp (curve, "nistp384"))
@ -598,7 +598,7 @@ ssh_public_key_in_base64 (gcry_sexp_t key, estream_t stream,
pub_elements = "q";
break;
case PUBKEY_ALGO_EDDSA:
case GCRY_PK_EDDSA:
is_eddsa_flag = 1;
if (!strcmp (curve, "Ed25519"))
identifier = "ssh-ed25519";