Document the new SHA256 and SHA512 password generation options

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/CHANGES b/CHANGES
index b233c23335313bdcb49408b311a87a3132cdafc1..38b025a599bab180a208d8acb8e585d972ae411f 100644 (file)
--- 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
  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 87dd8d868c5261294cfef7e1bd58b9fd831eba9d..fa11f630cf5f50a4a358ed952088f177b297ee9e 100644 (file)
--- a/doc/apps/passwd.pod
+++ b/doc/apps/passwd.pod
@@ -11,6 +11,8 @@ B<openssl passwd>
 [B<-crypt>]
 [B<-1>]
 [B<-apr1>]
 [B<-crypt>]
 [B<-1>]
 [B<-apr1>]

+[B<-5>]
+[B<-6>]

 [B<-salt> I<string>]
 [B<-in> I<file>]
 [B<-stdin>]
 [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).
 
 
 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.
 =item B<-salt> I<string>
 
 Use the specified salt.