summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--clientloop.c8
-rw-r--r--sshconnect2.c4
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 @@
1/* $OpenBSD: clientloop.c,v 1.313 2018/06/09 03:01:12 djm Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.314 2018/06/26 02:02:36 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
@@ -921,7 +921,7 @@ print_escape_help(Buffer *b, int escape_char, int mux_client, int using_stderr)
921 buffer_append(b, string, strlen(string)); 921 buffer_append(b, string, strlen(string));
922} 922}
923 923
924/* 924/*
925 * Process the characters one by one. 925 * Process the characters one by one.
926 */ 926 */
927static int 927static int
@@ -940,7 +940,7 @@ process_escapes(struct ssh *ssh, Channel *c,
940 940
941 if (c->filter_ctx == NULL) 941 if (c->filter_ctx == NULL)
942 return 0; 942 return 0;
943 943
944 if (len <= 0) 944 if (len <= 0)
945 return (0); 945 return (0);
946 946
@@ -1746,7 +1746,7 @@ struct hostkeys_update_ctx {
1746 */ 1746 */
1747 struct sshkey **keys; 1747 struct sshkey **keys;
1748 int *keys_seen; 1748 int *keys_seen;
1749 size_t nkeys, nnew; 1749 size_t nkeys, nnew;
1750 1750
1751 /* 1751 /*
1752 * Keys that are in known_hosts, but were not present in the update 1752 * 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 @@
1/* $OpenBSD: sshconnect2.c,v 1.270 2018/03/24 19:28:43 markus Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.271 2018/06/26 02:02:36 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -654,7 +654,7 @@ userauth_gssapi(Authctxt *authctxt)
654 while (mech < gss_supported->count && !ok) { 654 while (mech < gss_supported->count && !ok) {
655 /* My DER encoding requires length<128 */ 655 /* My DER encoding requires length<128 */
656 if (gss_supported->elements[mech].length < 128 && 656 if (gss_supported->elements[mech].length < 128 &&
657 ssh_gssapi_check_mechanism(&gssctxt, 657 ssh_gssapi_check_mechanism(&gssctxt,
658 &gss_supported->elements[mech], authctxt->host)) { 658 &gss_supported->elements[mech], authctxt->host)) {
659 ok = 1; /* Mechanism works */ 659 ok = 1; /* Mechanism works */
660 } else { 660 } else {