summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2020-08-27 08:15:22 +0200
committerDamien Miller <djm@mindrot.org>2020-08-27 11:47:35 +0200
commit744df42a129d7d7db26947b7561be32edac89f88 (patch)
tree82580626c3b338f5b26fe02a480205119e4f66c7
parentupstream: adapt to API changes (diff)
downloadopenssh-744df42a129d7d7db26947b7561be32edac89f88.tar.xz
openssh-744df42a129d7d7db26947b7561be32edac89f88.zip
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 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.207 2020/08/27 01:08:45 djm Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.208 2020/08/27 06:15:22 jmc Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -516,7 +516,7 @@ for the same application name.
.It Cm verify-required
Indicate that this private key should require user verification for
each signature.
-Not all FIDO tokens support support this option.
+Not all FIDO tokens support this option.
Currently PIN authentication is the only supported verification method,
but other methods may be supported in the future.
.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 @@
.\" (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.313 2020/08/27 01:07:10 djm Exp $
+.\" $OpenBSD: sshd_config.5,v 1.314 2020/08/27 06:15:22 jmc Exp $
.Dd $Mdocdate: August 27 2020 $
.Dt SSHD_CONFIG 5
.Os
@@ -1501,14 +1501,14 @@ flag disables this override.
.Pp
The
.Cm verify-required
-option requires a FIDO key signature attest that verified the user, e.g.
-via a PIN.
+option requires a FIDO key signature attest that verified the user,
+e.g. via a PIN.
.Pp
Neither the
.Cm touch-required
or
.Cm verify-required
-options have any effect for other, non-FIDO public key types.
+options have any effect for other, non-FIDO, public key types.
.It Cm PubkeyAuthentication
Specifies whether public key authentication is allowed.
The default is