RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-16 13:56:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
exterminate the -1 flag from scp

ok markus@

Upstream-ID: 26d247f7065da15056b209cef5f594ff591b89db
This commit is contained in:
djm@openbsd.org 2017-04-30 23:28:12 +00:00 committed by Damien Miller
parent aebd0abfaa
commit a3710d5d52
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scp.1
View File

@ -8,9 +8,9 @@
.\" .\"
.\" Created: Sun May 7 00:14:37 1995 ylo .\" Created: Sun May 7 00:14:37 1995 ylo
.\" .\"
.\" $OpenBSD: scp.1,v 1.71 2016/07/16 06:57:55 jmc Exp $ .\" $OpenBSD: scp.1,v 1.72 2017/04/30 23:28:12 djm Exp $
.\" .\"
.Dd $Mdocdate: July 16 2016 $ .Dd $Mdocdate: April 30 2017 $
.Dt SCP 1 .Dt SCP 1
.Os .Os
.Sh NAME .Sh NAME
@ -19,7 +19,7 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm scp .Nm scp
.Bk -words .Bk -words
.Op Fl 12346BCpqrv .Op Fl 346BCpqrv
.Op Fl c Ar cipher .Op Fl c Ar cipher
.Op Fl F Ar ssh_config .Op Fl F Ar ssh_config
.Op Fl i Ar identity_file .Op Fl i Ar identity_file
@ -65,14 +65,6 @@ Copies between two remote hosts are also permitted.
.Pp .Pp
The options are as follows: The options are as follows:
.Bl -tag -width Ds .Bl -tag -width Ds
.It Fl 1
Forces
.Nm
to use protocol 1.
.It Fl 2
Forces
.Nm
to use protocol 2.
.It Fl 3 .It Fl 3
Copies between two remote hosts are transferred through the local host. Copies between two remote hosts are transferred through the local host.
Without this option the data is copied directly between the two remote Without this option the data is copied directly between the two remote

6
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.189 2017/04/28 03:21:12 millert Exp $ */ /* $OpenBSD: scp.c,v 1.190 2017/04/30 23:28:12 djm Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -404,7 +404,11 @@ main(int argc, char **argv)
switch (ch) { switch (ch) {
/* User-visible flags. */ /* User-visible flags. */
case '1': case '1':
fatal("SSH protocol v.1 is no longer supported");
break;
case '2': case '2':
/* Ignored */
break;
case '4': case '4':
case '6': case '6':
case 'C': case 'C':

4
ssh.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.h,v 1.84 2017/04/30 23:18:44 djm Exp $ */ /* $OpenBSD: ssh.h,v 1.85 2017/04/30 23:28:12 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -47,7 +47,7 @@
#define PROTOCOL_MAJOR_1 1 #define PROTOCOL_MAJOR_1 1
#define PROTOCOL_MINOR_1 5 #define PROTOCOL_MINOR_1 5
/* We support both SSH1 and SSH2 */ /* We support both SSH2 */
#define PROTOCOL_MAJOR_2 2 #define PROTOCOL_MAJOR_2 2
#define PROTOCOL_MINOR_2 0 #define PROTOCOL_MINOR_2 0