diff options
| author | Werner Koch <[email protected]> | 2022-04-14 10:30:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-04-14 10:30:55 +0000 |
| commit | 46d62d80a2b8b1ba4fc8b8698de7495f79a417cf (patch) | |
| tree | 7d61cc358071f1c18c27128d4fd0a287a4974a08 /agent/command-ssh.c | |
| parent | scd: Renamed a constant in ccid-driver.c (diff) | |
| download | gnupg-46d62d80a2b8b1ba4fc8b8698de7495f79a417cf.tar.gz gnupg-46d62d80a2b8b1ba4fc8b8698de7495f79a417cf.zip | |
ssh: Returned faked response for the new session-bind extension.
* agent/command-ssh.c (SSH_OPT_CONSTRAIN_MAXSIGN): New.
(SSH_OPT_CONSTRAIN_EXTENSION): New.
(ssh_handler_add_identity): Ignore them.
(ssh_handler_extension): Take success for session-bind.
--
OpenSSH 8.9 does not gracefully allow communication with older agent
implementations. Until this new OpenSSH feature has been settled we
return a faked response.
Code has not yet been tested.
GnuPG-bug-id: 5931
Diffstat (limited to 'agent/command-ssh.c')
| -rw-r--r-- | agent/command-ssh.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 46821e3c8..e12e8accc 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -75,6 +75,8 @@ /* Options. */ #define SSH_OPT_CONSTRAIN_LIFETIME 1 #define SSH_OPT_CONSTRAIN_CONFIRM 2 +#define SSH_OPT_CONSTRAIN_MAXSIGN 3 +#define SSH_OPT_CONSTRAIN_EXTENSION 255 /* Response types. */ #define SSH_RESPONSE_SUCCESS 6 @@ -3165,6 +3167,11 @@ ssh_handler_add_identity (ctrl_t ctrl, estream_t request, estream_t response) break; } + case SSH_OPT_CONSTRAIN_MAXSIGN: + case SSH_OPT_CONSTRAIN_EXTENSION: + /* Not yet implemented. */ + break; + default: /* FIXME: log/bad? */ break; @@ -3387,6 +3394,13 @@ ssh_handler_extension (ctrl_t ctrl, estream_t request, estream_t response) (response, session_env_list_stdenvnames (NULL, NULL)); goto finalleave; } + else if (!strcmp (exttype, "[email protected]")) + { + ret_err = stream_write_byte (response, SSH_RESPONSE_SUCCESS); + log_info ("ssh-agent extension '%s' ignored - returning success anyway\n", + exttype); + goto finalleave; + } else { if (opt.verbose) |