diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-04-15 14:41:08 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2022-04-15 14:41:08 +0000 |
| commit | 87c1498d1a7473ff983e5c0456f30608f3f1e601 (patch) | |
| tree | 3ed1840d45c074e4d86037c24ccacce8cc35b2e7 /crypto/openssh/scp.c | |
| parent | 10aa36702cdb1112ac368c449d60ee4e8eb832d0 (diff) | |
| parent | 7f9f5c27f6f623a2081f2b436692418fd962b903 (diff) | |
| download | src-87c1498d1a7473ff983e5c0456f30608f3f1e601.tar.gz src-87c1498d1a7473ff983e5c0456f30608f3f1e601.zip | |
ssh: update to OpenSSH v9.0p1
Release notes are available at https://www.openssh.com/txt/release-9.0
Some highlights:
* ssh(1), sshd(8): use the hybrid Streamlined NTRU Prime + x25519 key
exchange method by default ("sntrup761x25519-sha512@openssh.com").
The NTRU algorithm is believed to resist attacks enabled by future
quantum computers and is paired with the X25519 ECDH key exchange
(the previous default) as a backstop against any weaknesses in
NTRU Prime that may be discovered in the future. The combination
ensures that the hybrid exchange offers at least as good security
as the status quo.
* sftp-server(8): support the "copy-data" extension to allow server-
side copying of files/data, following the design in
draft-ietf-secsh-filexfer-extensions-00. bz2948
* sftp(1): add a "cp" command to allow the sftp client to perform
server-side file copies.
This commit excludes the scp(1) change to use the SFTP protocol by
default; that change will immediately follow.
MFC after: 1 month
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'crypto/openssh/scp.c')
| -rw-r--r-- | crypto/openssh/scp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/scp.c b/crypto/openssh/scp.c index 519bffa1be1e..7a3851c5fdd1 100644 --- a/crypto/openssh/scp.c +++ b/crypto/openssh/scp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.245 2022/02/10 04:12:38 djm Exp $ */ +/* $OpenBSD: scp.c,v 1.247 2022/03/20 08:52:17 djm Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -968,7 +968,7 @@ do_sftp_connect(char *host, char *user, int port, char *sftp_direct, return NULL; } else { - args.list = NULL; + freeargs(&args); addargs(&args, "sftp-server"); if (do_cmd(sftp_direct, host, NULL, -1, 0, "sftp", reminp, remoutp, pidp) < 0) |