Some notable changes, from upstream's release notes: - sshd(8): Remove support for obsolete "host/port" syntax. - ssh(1): When prompting whether to record a new host key, accept the key fingerprint as a synonym for "yes". - ssh-keygen(1): when acting as a CA and signing certificates with an RSA key, default to using the rsa-sha2-512 signature algorithm. - ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa" (RSA/SHA1) algorithm from those accepted for certificate signatures. - ssh-sk-helper(8): this is a new binary. It is used by the FIDO/U2F support to provide address-space isolation for token middleware libraries (including the internal one). - ssh(1): this release enables UpdateHostkeys by default subject to some conservative preconditions. - scp(1): this release changes the behaviour of remote to remote copies (e.g. "scp host-a:/path host-b:") to transfer through the local host by default. - scp(1): experimental support for transfers using the SFTP protocol as a replacement for the venerable SCP/RCP protocol that it has traditionally used. Additional integration work is needed to support FIDO/U2F in the base system. Deprecation Notice ------------------ OpenSSH will disable the ssh-rsa signature scheme by default in the next release. Reviewed by: imp MFC after: 1 month Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29985
118 lines
3.7 KiB
C
118 lines
3.7 KiB
C
/* $OpenBSD: myproposal.h,v 1.68 2020/10/03 04:15:06 djm Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#define KEX_SERVER_KEX \
|
|
"curve25519-sha256," \
|
|
"curve25519-sha256@libssh.org," \
|
|
"ecdh-sha2-nistp256," \
|
|
"ecdh-sha2-nistp384," \
|
|
"ecdh-sha2-nistp521," \
|
|
"diffie-hellman-group-exchange-sha256," \
|
|
"diffie-hellman-group16-sha512," \
|
|
"diffie-hellman-group18-sha512," \
|
|
"diffie-hellman-group14-sha256"
|
|
|
|
#define KEX_CLIENT_KEX KEX_SERVER_KEX
|
|
|
|
#define KEX_DEFAULT_PK_ALG \
|
|
"ssh-ed25519-cert-v01@openssh.com," \
|
|
"ecdsa-sha2-nistp256-cert-v01@openssh.com," \
|
|
"ecdsa-sha2-nistp384-cert-v01@openssh.com," \
|
|
"ecdsa-sha2-nistp521-cert-v01@openssh.com," \
|
|
"sk-ssh-ed25519-cert-v01@openssh.com," \
|
|
"sk-ecdsa-sha2-nistp256-cert-v01@openssh.com," \
|
|
"rsa-sha2-512-cert-v01@openssh.com," \
|
|
"rsa-sha2-256-cert-v01@openssh.com," \
|
|
"ssh-rsa-cert-v01@openssh.com," \
|
|
"ssh-ed25519," \
|
|
"ecdsa-sha2-nistp256," \
|
|
"ecdsa-sha2-nistp384," \
|
|
"ecdsa-sha2-nistp521," \
|
|
"sk-ssh-ed25519@openssh.com," \
|
|
"sk-ecdsa-sha2-nistp256@openssh.com," \
|
|
"rsa-sha2-512," \
|
|
"rsa-sha2-256," \
|
|
"ssh-rsa"
|
|
|
|
#define KEX_SERVER_ENCRYPT \
|
|
"chacha20-poly1305@openssh.com," \
|
|
"aes128-ctr,aes192-ctr,aes256-ctr," \
|
|
"aes128-gcm@openssh.com,aes256-gcm@openssh.com"
|
|
|
|
#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT
|
|
|
|
#define KEX_SERVER_MAC \
|
|
"umac-64-etm@openssh.com," \
|
|
"umac-128-etm@openssh.com," \
|
|
"hmac-sha2-256-etm@openssh.com," \
|
|
"hmac-sha2-512-etm@openssh.com," \
|
|
"hmac-sha1-etm@openssh.com," \
|
|
"umac-64@openssh.com," \
|
|
"umac-128@openssh.com," \
|
|
"hmac-sha2-256," \
|
|
"hmac-sha2-512," \
|
|
"hmac-sha1"
|
|
|
|
#define KEX_CLIENT_MAC KEX_SERVER_MAC
|
|
|
|
/* Not a KEX value, but here so all the algorithm defaults are together */
|
|
#define SSH_ALLOWED_CA_SIGALGS \
|
|
"ssh-ed25519," \
|
|
"ecdsa-sha2-nistp256," \
|
|
"ecdsa-sha2-nistp384," \
|
|
"ecdsa-sha2-nistp521," \
|
|
"sk-ssh-ed25519@openssh.com," \
|
|
"sk-ecdsa-sha2-nistp256@openssh.com," \
|
|
"rsa-sha2-512," \
|
|
"rsa-sha2-256"
|
|
|
|
#define KEX_DEFAULT_COMP "none,zlib@openssh.com"
|
|
#define KEX_DEFAULT_LANG ""
|
|
|
|
#define KEX_CLIENT \
|
|
KEX_CLIENT_KEX, \
|
|
KEX_DEFAULT_PK_ALG, \
|
|
KEX_CLIENT_ENCRYPT, \
|
|
KEX_CLIENT_ENCRYPT, \
|
|
KEX_CLIENT_MAC, \
|
|
KEX_CLIENT_MAC, \
|
|
KEX_DEFAULT_COMP, \
|
|
KEX_DEFAULT_COMP, \
|
|
KEX_DEFAULT_LANG, \
|
|
KEX_DEFAULT_LANG
|
|
|
|
#define KEX_SERVER \
|
|
KEX_SERVER_KEX, \
|
|
KEX_DEFAULT_PK_ALG, \
|
|
KEX_SERVER_ENCRYPT, \
|
|
KEX_SERVER_ENCRYPT, \
|
|
KEX_SERVER_MAC, \
|
|
KEX_SERVER_MAC, \
|
|
KEX_DEFAULT_COMP, \
|
|
KEX_DEFAULT_COMP, \
|
|
KEX_DEFAULT_LANG, \
|
|
KEX_DEFAULT_LANG
|