From e1fe2af34df9b4d285aeaece057d8cfcb4b576b6 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 30 May 2017 08:49:58 +0000 Subject: [PATCH] remove ssh1 references; ok djm@ --- usr.bin/ssh/auth2-chall.c | 3 +-- usr.bin/ssh/channels.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/usr.bin/ssh/auth2-chall.c b/usr.bin/ssh/auth2-chall.c index 0934da69e2a..94beb26e8fb 100644 --- a/usr.bin/ssh/auth2-chall.c +++ b/usr.bin/ssh/auth2-chall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-chall.c,v 1.44 2016/05/02 08:49:03 djm Exp $ */ +/* $OpenBSD: auth2-chall.c,v 1.45 2017/05/30 08:49:58 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Per Allansson. All rights reserved. @@ -310,6 +310,5 @@ void privsep_challenge_enable(void) { extern KbdintDevice mm_bsdauth_device; - /* As long as SSHv1 has devices[0] hard coded this is fine */ devices[0] = &mm_bsdauth_device; } diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 63b06468fb1..2f43b619d34 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.361 2017/05/26 19:35:50 markus Exp $ */ +/* $OpenBSD: channels.c,v 1.362 2017/05/30 08:49:58 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -3158,7 +3158,7 @@ channel_cancel_lport_listener(struct Forward *fwd, int cport, struct ForwardOpti return channel_cancel_lport_listener_tcpip(fwd->listen_host, fwd->listen_port, cport, fwd_opts); } -/* protocol local port fwd, used by ssh (and sshd in v1) */ +/* protocol local port fwd, used by ssh */ int channel_setup_local_fwd_listener(struct Forward *fwd, struct ForwardOptions *fwd_opts) { -- 2.20.1