diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-06-26 04:02:36 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-06-26 04:03:25 +0200 |
| commit | 84623e0037628f9992839063151f7a9f5f13099a (patch) | |
| tree | 9a2466f078d14801a08a254fb333d9d5a1e2e0c6 | |
| parent | upstream: fix NULL dereference in open_listen_match_tcpip() (diff) | |
| download | openssh-84623e0037628f9992839063151f7a9f5f13099a.tar.xz openssh-84623e0037628f9992839063151f7a9f5f13099a.zip | |
upstream: whitespace
OpenBSD-Commit-ID: 9276951caf4daf555f6d262e95720e7f79244572
Diffstat (limited to '')
| -rw-r--r-- | clientloop.c | 8 | ||||
| -rw-r--r-- | sshconnect2.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/clientloop.c b/clientloop.c index 247b83979..9a5865b2a 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.313 2018/06/09 03:01:12 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.314 2018/06/26 02:02:36 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -921,7 +921,7 @@ print_escape_help(Buffer *b, int escape_char, int mux_client, int using_stderr) buffer_append(b, string, strlen(string)); } -/* +/* * Process the characters one by one. */ static int @@ -940,7 +940,7 @@ process_escapes(struct ssh *ssh, Channel *c, if (c->filter_ctx == NULL) return 0; - + if (len <= 0) return (0); @@ -1746,7 +1746,7 @@ struct hostkeys_update_ctx { */ struct sshkey **keys; int *keys_seen; - size_t nkeys, nnew; + size_t nkeys, nnew; /* * Keys that are in known_hosts, but were not present in the update diff --git a/sshconnect2.c b/sshconnect2.c index 1f4a74cf4..d8ae6eb3a 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.270 2018/03/24 19:28:43 markus Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.271 2018/06/26 02:02:36 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -654,7 +654,7 @@ userauth_gssapi(Authctxt *authctxt) while (mech < gss_supported->count && !ok) { /* My DER encoding requires length<128 */ if (gss_supported->elements[mech].length < 128 && - ssh_gssapi_check_mechanism(&gssctxt, + ssh_gssapi_check_mechanism(&gssctxt, &gss_supported->elements[mech], authctxt->host)) { ok = 1; /* Mechanism works */ } else { |