diff options
| author | NIIBE Yutaka <[email protected]> | 2022-06-28 01:25:03 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2022-06-28 01:25:03 +0000 |
| commit | 39422f1d63e2d9691d8fe4bfceb0d1e43cd914bd (patch) | |
| tree | 2e5e7a7a2941bca4fc411b4b9fbf364878258b21 /agent/findkey.c | |
| parent | agent: Do not consider --min-passphrase-len for the magic wand. (diff) | |
| download | gnupg-39422f1d63e2d9691d8fe4bfceb0d1e43cd914bd.tar.gz gnupg-39422f1d63e2d9691d8fe4bfceb0d1e43cd914bd.zip | |
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 <[email protected]>
Diffstat (limited to 'agent/findkey.c')
| -rw-r--r-- | agent/findkey.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/agent/findkey.c b/agent/findkey.c index b0a941078..e0db5095c 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -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; |