RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: whitespace 

OpenBSD-Commit-ID: 9276951caf4daf555f6d262e95720e7f79244572
This commit is contained in:
djm@openbsd.org 2018-06-26 02:02:36 +00:00 committed by Damien Miller
parent 90e51d6727
commit 84623e0037
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clientloop.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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)); buffer_append(b, string, strlen(string));
} }
/* /*
* Process the characters one by one. * Process the characters one by one.
*/ */
static int static int
@ -940,7 +940,7 @@ process_escapes(struct ssh *ssh, Channel *c,
if (c->filter_ctx == NULL) if (c->filter_ctx == NULL)
return 0; return 0;
if (len <= 0) if (len <= 0)
return (0); return (0);
@ -1746,7 +1746,7 @@ struct hostkeys_update_ctx {
*/ */
struct sshkey **keys; struct sshkey **keys;
int *keys_seen; int *keys_seen;
size_t nkeys, nnew; size_t nkeys, nnew;
/* /*
* Keys that are in known_hosts, but were not present in the update * Keys that are in known_hosts, but were not present in the update

4
sshconnect2.c
View File

@ -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) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. 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) { while (mech < gss_supported->count && !ok) {
/* My DER encoding requires length<128 */ /* My DER encoding requires length<128 */
if (gss_supported->elements[mech].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)) { &gss_supported->elements[mech], authctxt->host)) {
ok = 1; /* Mechanism works */ ok = 1; /* Mechanism works */
} else { } else {