From 2e04d6cc9d7976f476a18a1e002d07c31d67c15c Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Wed, 14 Sep 2016 04:07:04 +0200
Subject: [PATCH] Document the new SHA256 and SHA512 password generation
 options

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 CHANGES             | 5 +++++
 doc/apps/passwd.pod | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGES b/CHANGES
index b233c23335..38b025a599 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
   *)
 
+  *) 'openssl passwd' can now produce SHA256 and SHA512 based output,
+     using the algorithm defined in
+     https://www.akkadia.org/drepper/SHA-crypt.txt
+     [Richard Levitte]
+
  Changes between 1.0.2h and 1.1.0  [25 Aug 2016]
 
   *) Windows command-line tool supports UTF-8 opt-in option for arguments
diff --git a/doc/apps/passwd.pod b/doc/apps/passwd.pod
index 87dd8d868c..fa11f630cf 100644
--- a/doc/apps/passwd.pod
+++ b/doc/apps/passwd.pod
@@ -11,6 +11,8 @@ B<openssl passwd>
 [B<-crypt>]
 [B<-1>]
 [B<-apr1>]
+[B<-5>]
+[B<-6>]
 [B<-salt> I<string>]
 [B<-in> I<file>]
 [B<-stdin>]
@@ -48,6 +50,13 @@ Use the MD5 based BSD password algorithm B<1>.
 
 Use the B<apr1> algorithm (Apache variant of the BSD algorithm).
 
+=item B<-5>
+
+=item B<-6>
+
+Use the B<SHA256> / B<SHA512> based algorithms defined by Ulrich Drepper.
+See L<https://www.akkadia.org/drepper/SHA-crypt.txt>.
+
 =item B<-salt> I<string>
 
 Use the specified salt.
-- 
2.40.0