Import openssh_7.6p1.orig.tar.gz

1 files changed, 13 insertions, 19 deletions

diff --git a/ssh-add.0 b/ssh-add.0
index 706bfe661..2ef6c3da2 100644
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -4,18 +4,18 @@ NAME
      ssh-add M-bM-^@M-^S adds private key identities to the authentication agent
 
 SYNOPSIS
-     ssh-add [-cDdkLlXx] [-E fingerprint_hash] [-t life] [file ...]
+     ssh-add [-cDdkLlqXx] [-E fingerprint_hash] [-t life] [file ...]
      ssh-add -s pkcs11
      ssh-add -e pkcs11
 
 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, ~/.ssh/id_ed25519 and
-     ~/.ssh/identity.  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, 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.
 
      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
@@ -60,6 +60,8 @@ DESCRIPTION
      -l      Lists fingerprints of all identities currently represented by the
              agent.
 
+     -q      Be quiet after a successful operation.
+
      -s pkcs11
              Add keys provided by the PKCS#11 shared library pkcs11.
 
@@ -89,25 +91,17 @@ ENVIRONMENT
              with the agent.
 
 FILES
-     ~/.ssh/identity
-             Contains the protocol version 1 RSA authentication identity of
-             the user.
-
      ~/.ssh/id_dsa
-             Contains the protocol version 2 DSA authentication identity of
-             the user.
+             Contains the DSA authentication identity of the user.
 
      ~/.ssh/id_ecdsa
-             Contains the protocol version 2 ECDSA authentication identity of
-             the user.
+             Contains the ECDSA authentication identity of the user.
 
      ~/.ssh/id_ed25519
-             Contains the protocol version 2 Ed25519 authentication identity
-             of the user.
+             Contains the Ed25519 authentication identity of the user.
 
      ~/.ssh/id_rsa
-             Contains the protocol version 2 RSA authentication identity of
-             the user.
+             Contains the 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.
@@ -126,4 +120,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 6.0                     March 30, 2015                     OpenBSD 6.0
+OpenBSD 6.2                     August 29, 2017                    OpenBSD 6.2