external/openssh: update to 6.8p1.
In preparation for some updates to external/openssh to make it work with
BoringSSL, this change updates the code to a recent version. The current
version (5.9p1) is coming up on four years old now.
* Confirmed that f5c67b478bef9992de9e9ec91ce10af4f6205e0d matches
OpenSSH 5.9p1 exactly (save for the removal of the scard
subdirectory).
* Downloaded openssh-6.8p1.tar.gz (SHA256:
3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e)
and verified with PGP signature. (I've verified Damien's key in
person previously.)
* Applied changes between f5c67b478bef9992de9e9ec91ce10af4f6205e0d and
OpenSSH 5.9p1 to 6.8p1 and updated the build as best I can. The
ugliest change is probably the duplication of umac.c to umac128.c
because Android conditionally compiles that file twice. See the
comment in those files.
Change-Id: I63cb07a8118afb5a377f116087a0882914cea486
diff --git a/scp.0 b/scp.0
index a4fad8a..3f309fe 100644
--- a/scp.0
+++ b/scp.0
@@ -1,7 +1,7 @@
-SCP(1) OpenBSD Reference Manual SCP(1)
+SCP(1) General Commands Manual SCP(1)
NAME
- scp - secure copy (remote file copy program)
+ scp M-bM-^@M-^S secure copy (remote file copy program)
SYNOPSIS
scp [-12346BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]
@@ -11,13 +11,13 @@
DESCRIPTION
scp copies files between hosts on a network. It uses ssh(1) for data
transfer, and uses the same authentication and provides the same security
- as ssh(1). Unlike rcp(1), scp will ask for passwords or passphrases if
- they are needed for authentication.
+ as ssh(1). scp will ask for passwords or passphrases if they are needed
+ for authentication.
File names may contain a user and host specification to indicate that the
file is to be copied to/from that host. Local file names can be made
explicit using absolute or relative pathnames to avoid scp treating file
- names containing `:' as host specifiers. Copies between two remote hosts
+ names containing M-bM-^@M-^X:M-bM-^@M-^Y as host specifiers. Copies between two remote hosts
are also permitted.
The options are as follows:
@@ -67,6 +67,11 @@
AddressFamily
BatchMode
BindAddress
+ CanonicalDomains
+ CanonicalizeFallbackLocal
+ CanonicalizeHostname
+ CanonicalizeMaxDots
+ CanonicalizePermittedCNAMEs
ChallengeResponseAuthentication
CheckHostIP
Cipher
@@ -77,18 +82,21 @@
ConnectTimeout
ControlMaster
ControlPath
+ ControlPersist
GlobalKnownHostsFile
GSSAPIAuthentication
GSSAPIDelegateCredentials
HashKnownHosts
Host
HostbasedAuthentication
+ HostbasedKeyTypes
HostKeyAlgorithms
HostKeyAlias
HostName
IdentityFile
IdentitiesOnly
IPQoS
+ KbdInteractiveAuthentication
KbdInteractiveDevices
KexAlgorithms
LogLevel
@@ -110,6 +118,7 @@
ServerAliveCountMax
StrictHostKeyChecking
TCPKeepAlive
+ UpdateHostKeys
UsePrivilegedPort
User
UserKnownHostsFile
@@ -117,9 +126,8 @@
-P port
Specifies the port to connect to on the remote host. Note that
- this option is written with a capital `P', because -p is already
- reserved for preserving the times and modes of the file in
- rcp(1).
+ this option is written with a capital M-bM-^@M-^XPM-bM-^@M-^Y, because -p is already
+ reserved for preserving the times and modes of the file.
-p Preserves modification times, access times, and modes from the
original file.
@@ -139,18 +147,18 @@
authentication, and configuration problems.
EXIT STATUS
- The scp utility exits 0 on success, and >0 if an error occurs.
+ The scp utility exitsM-BM- 0 on success, andM-BM- >0 if an error occurs.
SEE ALSO
- rcp(1), sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1),
- ssh_config(5), sshd(8)
+ sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssh_config(5),
+ sshd(8)
HISTORY
- scp is based on the rcp(1) program in BSD source code from the Regents of
+ scp is based on the rcp program in BSD source code from the Regents of
the University of California.
AUTHORS
Timo Rinne <tri@iki.fi>
Tatu Ylonen <ylo@cs.hut.fi>
-OpenBSD 5.0 December 9, 2010 OpenBSD 5.0
+OpenBSD 5.7 January 30, 2015 OpenBSD 5.7