summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2020-08-27 06:15:22 +0000
committerDamien Miller <djm@mindrot.org>2020-08-27 19:47:35 +1000
commit744df42a129d7d7db26947b7561be32edac89f88 (patch)
tree82580626c3b338f5b26fe02a480205119e4f66c7
parente32479645ce649b444ba5c6e7151304306a09654 (diff)
upstream: tweak previous;
OpenBSD-Commit-ID: 92714b6531e244e4da401b2defaa376374e24be7
-rw-r--r--ssh-keygen.14
-rw-r--r--sshd_config.58
2 files changed, 6 insertions, 6 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index e18fcde01..c51a0d9c8 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.207 2020/08/27 01:08:45 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.208 2020/08/27 06:15:22 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -516,7 +516,7 @@ for the same application name.
516.It Cm verify-required 516.It Cm verify-required
517Indicate that this private key should require user verification for 517Indicate that this private key should require user verification for
518each signature. 518each signature.
519Not all FIDO tokens support support this option. 519Not all FIDO tokens support this option.
520Currently PIN authentication is the only supported verification method, 520Currently PIN authentication is the only supported verification method,
521but other methods may be supported in the future. 521but other methods may be supported in the future.
522.It Cm write-attestation Ns = Ns Ar path 522.It Cm write-attestation Ns = Ns Ar path
diff --git a/sshd_config.5 b/sshd_config.5
index a1898baae..186bce4fc 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,7 +33,7 @@
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.313 2020/08/27 01:07:10 djm Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.314 2020/08/27 06:15:22 jmc Exp $
37.Dd $Mdocdate: August 27 2020 $ 37.Dd $Mdocdate: August 27 2020 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
@@ -1501,14 +1501,14 @@ flag disables this override.
1501.Pp 1501.Pp
1502The 1502The
1503.Cm verify-required 1503.Cm verify-required
1504option requires a FIDO key signature attest that verified the user, e.g. 1504option requires a FIDO key signature attest that verified the user,
1505via a PIN. 1505e.g. via a PIN.
1506.Pp 1506.Pp
1507Neither the 1507Neither the
1508.Cm touch-required 1508.Cm touch-required
1509or 1509or
1510.Cm verify-required 1510.Cm verify-required
1511options have any effect for other, non-FIDO public key types. 1511options have any effect for other, non-FIDO, public key types.
1512.It Cm PubkeyAuthentication 1512.It Cm PubkeyAuthentication
1513Specifies whether public key authentication is allowed. 1513Specifies whether public key authentication is allowed.
1514The default is 1514The default is