Import openssh_8.2p1.orig.tar.gz

1 files changed, 26 insertions, 15 deletions

diff --git a/ssh-add.0 b/ssh-add.0
index 0c4358253..36a7ac6ab 100644
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -1,10 +1,11 @@
 SSH-ADD(1)                  General Commands Manual                 SSH-ADD(1)
 
 NAME
-     ssh-add M-bM-^@M-^S adds private key identities to the authentication agent
+     ssh-add M-bM-^@M-^S adds private key identities to the OpenSSH authentication agent
 
 SYNOPSIS
-     ssh-add [-cDdkLlqvXx] [-E fingerprint_hash] [-t life] [file ...]
+     ssh-add [-cDdKkLlqvXx] [-E fingerprint_hash] [-S provider] [-t life]
+             [file ...]
      ssh-add -s pkcs11
      ssh-add -e pkcs11
      ssh-add -T pubkey ...
@@ -12,11 +13,11 @@ SYNOPSIS
 DESCRIPTION
      ssh-add adds private key identities to the authentication agent,
      ssh-agent(1).  When run without arguments, it adds the files
-     ~/.ssh/id_rsa, ~/.ssh/id_dsa, ~/.ssh/id_ecdsa, and ~/.ssh/id_ed25519.
-     After loading a private key, ssh-add will try to load corresponding
-     certificate information from the filename obtained by appending -cert.pub
-     to the name of the private key file.  Alternative file names can be given
-     on the command line.
+     ~/.ssh/id_rsa, ~/.ssh/id_dsa, ~/.ssh/id_ecdsa, ~/.ssh/id_ecdsa_sk,
+     ~/.ssh/id_ed25519, and ~/.ssh/id_ed25519_sk.  After loading a private
+     key, ssh-add will try to load corresponding certificate information from
+     the filename obtained by appending -cert.pub to the name of the private
+     key file.  Alternative file names can be given on the command line.
 
      If any file requires a passphrase, ssh-add asks for the passphrase from
      the user.  The passphrase is read from the user's tty.  ssh-add retries
@@ -52,6 +53,8 @@ DESCRIPTION
      -e pkcs11
              Remove keys provided by the PKCS#11 shared library pkcs11.
 
+     -K      Load resident keys from a FIDO authenticator.
+
      -k      When loading keys into or deleting keys from the agent, process
              plain private keys only and skip certificates.
 
@@ -63,6 +66,11 @@ DESCRIPTION
 
      -q      Be quiet after a successful operation.
 
+     -S provider
+             Specifies a path to a library that will be used when adding FIDO
+             authenticator-hosted keys, overriding the default of using the
+             internal USB HID support.
+
      -s pkcs11
              Add keys provided by the PKCS#11 shared library pkcs11.
 
@@ -100,18 +108,21 @@ ENVIRONMENT
              Identifies the path of a UNIX-domain socket used to communicate
              with the agent.
 
+     SSH_SK_PROVIDER
+             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.
+
 FILES
      ~/.ssh/id_dsa
-             Contains the DSA authentication identity of the user.
-
      ~/.ssh/id_ecdsa
-             Contains the ECDSA authentication identity of the user.
-
+     ~/.ssh/id_ecdsa_sk
      ~/.ssh/id_ed25519
-             Contains the Ed25519 authentication identity of the user.
-
+     ~/.ssh/id_ed25519_sk
      ~/.ssh/id_rsa
-             Contains the RSA authentication identity of the user.
+             Contains the DSA, ECDSA, authenticator-hosted ECDSA, Ed25519,
+             authenticator-hosted Ed25519 or RSA authentication identity of
+             the user.
 
      Identity files should not be readable by anyone but the user.  Note that
      ssh-add ignores identity files if they are accessible by others.
@@ -130,4 +141,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 6.6                    January 21, 2019                    OpenBSD 6.6
+OpenBSD 6.6                    February 7, 2020                    OpenBSD 6.6