diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-11-18 04:55:02 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-18 15:57:18 +1100 |
commit | e2e1283404e06a22ac6135d057199e70dcadb8dd (patch) | |
tree | 0bd92c67b22ba4c23578270ca59933d920235c3c /sshd_config.5 | |
parent | 97dc5d1d82865a7d20f1eb193b5c62ce684024e5 (diff) |
upstream: mention ed25519-sk key/cert types here too; prompted by
jmc@
OpenBSD-Commit-ID: e281977e4a4f121f3470517cbd5e483eee37b818
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index f4caa162d..5052ca200 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.291 2019/11/07 08:38:38 naddy Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.292 2019/11/18 04:55:02 djm Exp $ |
37 | .Dd $Mdocdate: November 7 2019 $ | 37 | .Dd $Mdocdate: November 18 2019 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1431,12 +1431,14 @@ sk-ecdsa-sha2-nistp256-cert-v01@openssh.com, | |||
1431 | ecdsa-sha2-nistp256-cert-v01@openssh.com, | 1431 | ecdsa-sha2-nistp256-cert-v01@openssh.com, |
1432 | ecdsa-sha2-nistp384-cert-v01@openssh.com, | 1432 | ecdsa-sha2-nistp384-cert-v01@openssh.com, |
1433 | ecdsa-sha2-nistp521-cert-v01@openssh.com, | 1433 | ecdsa-sha2-nistp521-cert-v01@openssh.com, |
1434 | sk-ssh-ed25519-cert-v01@openssh.com, | ||
1434 | ssh-ed25519-cert-v01@openssh.com, | 1435 | ssh-ed25519-cert-v01@openssh.com, |
1435 | rsa-sha2-512-cert-v01@openssh.com, | 1436 | rsa-sha2-512-cert-v01@openssh.com, |
1436 | rsa-sha2-256-cert-v01@openssh.com, | 1437 | rsa-sha2-256-cert-v01@openssh.com, |
1437 | ssh-rsa-cert-v01@openssh.com, | 1438 | ssh-rsa-cert-v01@openssh.com, |
1438 | sk-ecdsa-sha2-nistp256@openssh.com, | 1439 | sk-ecdsa-sha2-nistp256@openssh.com, |
1439 | ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, | 1440 | ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, |
1441 | sk-ssh-ed25519@openssh.com, | ||
1440 | ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa | 1442 | ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa |
1441 | .Ed | 1443 | .Ed |
1442 | .Pp | 1444 | .Pp |