tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-24 22:35:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
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
This commit is contained in:
djm@openbsd.org 2016-02-17 08:57:34 +00:00 committed by Damien Miller
parent a685ae8d1c
commit 3a13cb543d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssh_config.5
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .Dd $Mdocdate: February 17 2016 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -869,7 +869,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com,
ssh-ed25519-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com,
ssh-rsa-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com,
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa ssh-ed25519,ssh-rsa
.Ed .Ed
.Pp .Pp
The The
@ -892,7 +892,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com,
ssh-ed25519-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com,
ssh-rsa-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com,
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa ssh-ed25519,ssh-rsa
.Ed .Ed
.Pp .Pp
If hostkeys are known for the destination host then this default is modified 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-ed25519-cert-v01@openssh.com,
ssh-rsa-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com,
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa ssh-ed25519,ssh-rsa
.Ed .Ed
.Pp .Pp
The The

8
sshd_config.5
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .Dd $Mdocdate: February 17 2016 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
@ -658,7 +658,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com,
ssh-ed25519-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com,
ssh-rsa-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com,
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa ssh-ed25519,ssh-rsa
.Ed .Ed
.Pp .Pp
The The
@ -750,7 +750,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com,
ssh-ed25519-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com,
ssh-rsa-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com,
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa ssh-ed25519,ssh-rsa
.Ed .Ed
.Pp .Pp
The list of available key types may also be obtained using the 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-ed25519-cert-v01@openssh.com,
ssh-rsa-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com,
ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa ssh-ed25519,ssh-rsa
.Ed .Ed
.Pp .Pp
The The