diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-02-07 04:57:31 +0100 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-02-07 05:03:20 +0100 |
commit | 963d71851e727ffdd2a97fe0898fad61d4a70ba1 (patch) | |
tree | d7d87effac31f12a20fe93194547fcde4359b693 | |
parent | upstream: Add ssh -Q key-sig for all key and signature types. (diff) | |
download | openssh-963d71851e727ffdd2a97fe0898fad61d4a70ba1.tar.xz openssh-963d71851e727ffdd2a97fe0898fad61d4a70ba1.zip |
upstream: sync the description of the $SSH_SK_PROVIDER environment
variable with that of the SecurityKeyProvider ssh/sshd_config(5) directive,
as the latter was more descriptive.
OpenBSD-Commit-ID: 0488f09530524a7e53afca6b6e1780598022552f
-rw-r--r-- | ssh-add.1 | 8 | ||||
-rw-r--r-- | ssh-keygen.1 | 8 |
2 files changed, 10 insertions, 6 deletions
@@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-add.1,v 1.78 2020/01/17 20:13:47 naddy Exp $ +.\" $OpenBSD: ssh-add.1,v 1.79 2020/02/07 03:57:31 djm Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -35,7 +35,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. .\" -.Dd $Mdocdate: January 17 2020 $ +.Dd $Mdocdate: February 7 2020 $ .Dt SSH-ADD 1 .Os .Sh NAME @@ -199,7 +199,9 @@ Identifies the path of a .Ux Ns -domain socket used to communicate with the agent. .It Ev SSH_SK_PROVIDER -Specifies the path to a library used to interact with FIDO authenticators. +Specifies a path to a library that will be used when loading any +FIDO authenticator-hosted keys, overriding the default of using +the built-in USB HID support. .El .Sh FILES .Bl -tag -width Ds -compact diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 51aee21aa..7af564297 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.200 2020/02/04 09:58:04 djm Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.201 2020/02/07 03:57:31 djm Exp $ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -35,7 +35,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. .\" -.Dd $Mdocdate: February 4 2020 $ +.Dd $Mdocdate: February 7 2020 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -1116,7 +1116,9 @@ user2@example.com namespaces="file" ssh-ed25519 AAA41... .Sh ENVIRONMENT .Bl -tag -width Ds .It Ev SSH_SK_PROVIDER -Specifies the path to a library used to interact with FIDO authenticators. +Specifies a path to a library that will be used when loading any +FIDO authenticator-hosted keys, overriding the default of using +the built-in USB HID support. .El .Sh FILES .Bl -tag -width Ds -compact |