diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-02-17 08:57:34 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-02-18 09:24:41 +1100 |
| commit | 3a13cb543df9919aec2fc6b75f3dd3802facaeca (patch) | |
| tree | 0b13bcbee3acbbee658451a71b6676c7528f3da8 | |
| parent | a685ae8d1c24fb7c712c55a4f3280ee76f5f1e4b (diff) | |
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
| -rw-r--r-- | ssh_config.5 | 8 | ||||
| -rw-r--r-- | sshd_config.5 | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index fcd53806..58125dd1 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 diff --git a/sshd_config.5 b/sshd_config.5 index ef919056..a37a3aca 100644 --- a/sshd_config.5 +++ b/sshd_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: sshd_config.5,v 1.219 2016/02/17 07:38:19 jmc Exp $ +.\" $OpenBSD: sshd_config.5,v 1.220 2016/02/17 08:57:34 djm Exp $ .Dd $Mdocdate: February 17 2016 $ .Dt SSHD_CONFIG 5 .Os @@ -658,7 +658,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 @@ -750,7 +750,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 list of available key types may also be obtained using the @@ -1358,7 +1358,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 |