Import openssh_7.9p1.orig.tar.gz

1 files changed, 13 insertions, 2 deletions

diff --git a/ssh-keygen.0 b/ssh-keygen.0
index f8cc3c3e2..906a338c4 100644
--- a/ssh-keygen.0
+++ b/ssh-keygen.0
@@ -518,7 +518,18 @@ KEY REVOCATION LISTS
              is revoked as a plain public key.
 
      sha1: public_key
-             Revokes the specified key by its SHA1 hash.
+             Revokes the specified key by including its SHA1 hash in the KRL.
+
+     sha256: public_key
+             Revokes the specified key by including its SHA256 hash in the
+             KRL.  KRLs that revoke keys by SHA256 hash are not supported by
+             OpenSSH versions prior to 7.9.
+
+     hash: fingerprint
+             Revokes a key using a fingerprint hash, as obtained from a
+             sshd(8) authentication log message or the ssh-keygen -l flag.
+             Only SHA256 fingerprints are supported here and resultant KRLs
+             are not supported by OpenSSH versions prior to 7.9.
 
      KRLs may be updated using the -u flag in addition to -k.  When this
      option is specified, keys listed via the command line are merged into the
@@ -571,4 +582,4 @@ AUTHORS
      created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 6.4                     August 8, 2018                     OpenBSD 6.4
+OpenBSD 6.4                   September 12, 2018                   OpenBSD 6.4