diff options
author | djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> | 2017-11-15 00:13:40 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-11-15 11:14:28 +1100 |
commit | 93c68a8f3da8e5e6acdc3396f54d73919165e242 (patch) | |
tree | 6b4c60dd9a8adf152a41e52258c1d44c6dbd864b /ssh-agent.c | |
parent | 548d3a66feb64c405733932a6b1abeaf7198fa71 (diff) |
upstream commit
fix regression in 7.6: failure to parse a signature request
message shouldn't be fatal to the process, just the request. Reported by Ron
Frederick
OpenBSD-Commit-ID: e5d01b3819caa1a2ad51fc57d6ded43f48bbcc05
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 0c6c36592..a25f60a42 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.224 2017/07/24 04:34:28 djm Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.225 2017/11/15 00:13:40 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -287,8 +287,11 @@ process_sign_request2(SocketEntry *e) | |||
287 | fatal("%s: sshbuf_new failed", __func__); | 287 | fatal("%s: sshbuf_new failed", __func__); |
288 | if ((r = sshkey_froms(e->request, &key)) != 0 || | 288 | if ((r = sshkey_froms(e->request, &key)) != 0 || |
289 | (r = sshbuf_get_string_direct(e->request, &data, &dlen)) != 0 || | 289 | (r = sshbuf_get_string_direct(e->request, &data, &dlen)) != 0 || |
290 | (r = sshbuf_get_u32(e->request, &flags)) != 0) | 290 | (r = sshbuf_get_u32(e->request, &flags)) != 0) { |
291 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | 291 | error("%s: couldn't parse request: %s", __func__, ssh_err(r)); |
292 | goto send; | ||
293 | } | ||
294 | |||
292 | if (flags & SSH_AGENT_OLD_SIGNATURE) | 295 | if (flags & SSH_AGENT_OLD_SIGNATURE) |
293 | compat = SSH_BUG_SIGBLOB; | 296 | compat = SSH_BUG_SIGBLOB; |
294 | if ((id = lookup_identity(key)) == NULL) { | 297 | if ((id = lookup_identity(key)) == NULL) { |