diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-02-17 09:57:34 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-02-17 23:24:41 +0100 |
| commit | 3a13cb543df9919aec2fc6b75f3dd3802facaeca (patch) | |
| tree | 0b13bcbee3acbbee658451a71b6676c7528f3da8 /ssh_config.5 | |
| parent | upstream commit (diff) | |
| download | openssh-3a13cb543df9919aec2fc6b75f3dd3802facaeca.tar.xz openssh-3a13cb543df9919aec2fc6b75f3dd3802facaeca.zip | |
upstream commit
rsa-sha2-512,rsa-sha2-256 cannot be selected explicitly
in *KeyTypes options yet. Remove them from the lists of algorithms for now.
committing on behalf of markus@ ok djm@
Upstream-ID: c6e8820eb8e610ac21551832c0c89684a9a51bb7
Diffstat (limited to 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index fcd538066..58125dd14 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,7 +33,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.226 2016/02/17 07:38:19 jmc Exp $ +.\" $OpenBSD: ssh_config.5,v 1.227 2016/02/17 08:57:34 djm Exp $ .Dd $Mdocdate: February 17 2016 $ .Dt SSH_CONFIG 5 .Os @@ -869,7 +869,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, -ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa +ssh-ed25519,ssh-rsa .Ed .Pp The @@ -892,7 +892,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, -ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa +ssh-ed25519,ssh-rsa .Ed .Pp If hostkeys are known for the destination host then this default is modified @@ -1330,7 +1330,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, -ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa +ssh-ed25519,ssh-rsa .Ed .Pp The |