summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scp.114
-rw-r--r--scp.c6
-rw-r--r--ssh.h4
3 files changed, 10 insertions, 14 deletions
diff --git a/scp.1 b/scp.1
index 4ae877753..0431c7807 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
8.\" 8.\"
9.\" Created: Sun May 7 00:14:37 1995 ylo 9.\" Created: Sun May 7 00:14:37 1995 ylo
10.\" 10.\"
11.\" $OpenBSD: scp.1,v 1.71 2016/07/16 06:57:55 jmc Exp $ 11.\" $OpenBSD: scp.1,v 1.72 2017/04/30 23:28:12 djm Exp $
12.\" 12.\"
13.Dd $Mdocdate: July 16 2016 $ 13.Dd $Mdocdate: April 30 2017 $
14.Dt SCP 1 14.Dt SCP 1
15.Os 15.Os
16.Sh NAME 16.Sh NAME
@@ -19,7 +19,7 @@
19.Sh SYNOPSIS 19.Sh SYNOPSIS
20.Nm scp 20.Nm scp
21.Bk -words 21.Bk -words
22.Op Fl 12346BCpqrv 22.Op Fl 346BCpqrv
23.Op Fl c Ar cipher 23.Op Fl c Ar cipher
24.Op Fl F Ar ssh_config 24.Op Fl F Ar ssh_config
25.Op Fl i Ar identity_file 25.Op Fl i Ar identity_file
@@ -65,14 +65,6 @@ Copies between two remote hosts are also permitted.
65.Pp 65.Pp
66The options are as follows: 66The options are as follows:
67.Bl -tag -width Ds 67.Bl -tag -width Ds
68.It Fl 1
69Forces
70.Nm
71to use protocol 1.
72.It Fl 2
73Forces
74.Nm
75to use protocol 2.
76.It Fl 3 68.It Fl 3
77Copies between two remote hosts are transferred through the local host. 69Copies between two remote hosts are transferred through the local host.
78Without this option the data is copied directly between the two remote 70Without this option the data is copied directly between the two remote
diff --git a/scp.c b/scp.c
index 3de743e3a..3a651c664 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: scp.c,v 1.189 2017/04/28 03:21:12 millert Exp $ */ 1/* $OpenBSD: scp.c,v 1.190 2017/04/30 23:28:12 djm Exp $ */
2/* 2/*
3 * scp - secure remote copy. This is basically patched BSD rcp which 3 * scp - secure remote copy. This is basically patched BSD rcp which
4 * uses ssh to do the data transfer (instead of using rcmd). 4 * uses ssh to do the data transfer (instead of using rcmd).
@@ -404,7 +404,11 @@ main(int argc, char **argv)
404 switch (ch) { 404 switch (ch) {
405 /* User-visible flags. */ 405 /* User-visible flags. */
406 case '1': 406 case '1':
407 fatal("SSH protocol v.1 is no longer supported");
408 break;
407 case '2': 409 case '2':
410 /* Ignored */
411 break;
408 case '4': 412 case '4':
409 case '6': 413 case '6':
410 case 'C': 414 case 'C':
diff --git a/ssh.h b/ssh.h
index 6e27672df..882768c5f 100644
--- a/ssh.h
+++ b/ssh.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.h,v 1.84 2017/04/30 23:18:44 djm Exp $ */ 1/* $OpenBSD: ssh.h,v 1.85 2017/04/30 23:28:12 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -47,7 +47,7 @@
47#define PROTOCOL_MAJOR_1 1 47#define PROTOCOL_MAJOR_1 1
48#define PROTOCOL_MINOR_1 5 48#define PROTOCOL_MINOR_1 5
49 49
50/* We support both SSH1 and SSH2 */ 50/* We support both SSH2 */
51#define PROTOCOL_MAJOR_2 2 51#define PROTOCOL_MAJOR_2 2
52#define PROTOCOL_MINOR_2 0 52#define PROTOCOL_MINOR_2 0
53 53