security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

agent: Don't assume "OPENPGP.3" key means "Use-for-ssh:".

Browse Source 
* agent/command-ssh.c: Fix comments.
* agent/findkey.c (public_key_from_file): Remove "OPENPGP.3" check.

--

GnuPG-bug-id: 5996
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-06-28 10:25:03 +09:00
parent ae2f1f0785
commit 39422f1d63
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/command-ssh.c
View File

@ -2495,11 +2495,11 @@ ssh_send_available_keys (ctrl_t ctrl, estream_t key_blobs, u32 *key_counter_p)
if (err) if (err)
return err; return err;
/* First, get information keys available on card(s). */ /* First, get information keys available on cards on-line. */
keyinfo_on_cards = get_ssh_keyinfo_on_cards (ctrl); keyinfo_on_cards = get_ssh_keyinfo_on_cards (ctrl);
/* Then, look at all keys with "OPENPGP.3" idstring. */
/* Look at all the registered and non-disabled keys, in sshcontrol. */ /* Look at all the registered and non-disabled keys, in sshcontrol. */
/* And, look at all keys with "Use-for-ssh:" flag. */
dirname = make_filename_try (gnupg_homedir (), dirname = make_filename_try (gnupg_homedir (),
GNUPG_PRIVATE_KEYS_DIR, NULL); GNUPG_PRIVATE_KEYS_DIR, NULL);
if (!dirname) if (!dirname)

16
agent/findkey.c
View File

@ -1458,8 +1458,7 @@ public_key_from_file (ctrl_t ctrl, const unsigned char *grip,
if (for_ssh) if (for_ssh)
{ {
/* Use-for-ssh: yes */ /* Use-for-ssh: yes */
/* Token: <SERIALNO> <IDSTR> */
const char *p; const char *p;
int is_ssh = 0; int is_ssh = 0;
@ -1470,19 +1469,6 @@ public_key_from_file (ctrl_t ctrl, const unsigned char *grip,
&& !strcmp (p, "yes")) && !strcmp (p, "yes"))
is_ssh = 1; is_ssh = 1;
if ((p = nvc_get_string (keymeta, "Token:")))
{
while (*p && !spacep (p))
p++;
if (*p)
{
p++;
if (!strcmp (p, "OPENPGP.3"))
is_ssh = 1;
}
}
nvc_release (keymeta); nvc_release (keymeta);
keymeta = NULL; keymeta = NULL;