diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-12-21 00:00:28 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-12-21 15:40:19 +1100 |
| commit | d45d69f2a937cea215c7f0424e5a4677b6d8c7fe (patch) | |
| tree | 8808d64b31825f6117237e81f25771ea99ff0c8b /monitor_wrap.c | |
| parent | c5a6cbdb79752f7e761074abdb487953ea6db671 (diff) | |
upstream commit
revert stricter key type / signature type checking in
userauth path; too much software generates inconsistent messages, so we need
a better plan.
OpenBSD-Commit-ID: 4a44ddc991c803c4ecc8f1ad40e0ab4d22e1c519
Diffstat (limited to 'monitor_wrap.c')
| -rw-r--r-- | monitor_wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 502d4168..7471e454 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.96 2017/12/18 02:25:15 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.97 2017/12/21 00:00:28 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -458,7 +458,7 @@ mm_sshkey_verify(const struct sshkey *key, const u_char *sig, size_t siglen, buffer_put_string(&m, blob, len); buffer_put_string(&m, sig, siglen); buffer_put_string(&m, data, datalen); - buffer_put_cstring(&m, sigalg); + buffer_put_cstring(&m, sigalg == NULL ? "" : sigalg); free(blob); mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m); |