mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
agent: Don't assume "OPENPGP.3" key means "Use-for-ssh:".
* 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:
parent
ae2f1f0785
commit
39422f1d63
2 changed files with 3 additions and 17 deletions
|
@ -1458,8 +1458,7 @@ public_key_from_file (ctrl_t ctrl, const unsigned char *grip,
|
|||
|
||||
if (for_ssh)
|
||||
{
|
||||
/* Use-for-ssh: yes */
|
||||
/* Token: <SERIALNO> <IDSTR> */
|
||||
/* Use-for-ssh: yes */
|
||||
const char *p;
|
||||
int is_ssh = 0;
|
||||
|
||||
|
@ -1470,19 +1469,6 @@ public_key_from_file (ctrl_t ctrl, const unsigned char *grip,
|
|||
&& !strcmp (p, "yes"))
|
||||
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);
|
||||
keymeta = NULL;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue