From 11a07153d68580c60fba2f2fb84aed5faca7f0ab Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 20 Sep 2002 17:12:58 +0000 Subject: [PATCH] Add some clarification as to what hash algorithms are used with each password-hash scheme. --- doc/man/man5/slapd.conf.5 | 21 +++++++++++++++++---- doc/man/man8/slappasswd.8 | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 41b0e8429c..4b815958ce 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -439,13 +439,26 @@ and .BR {CLEARTEXT} . The default is .BR {SSHA} . - -Note that +.TP +.B {SHA} +and +.B {SSHA} +use the SHA-1 algorithm (FIPS 160-1), the latter with a seed. +.TP +.B {MD5} +and +.B {SMD5} +use the MD5 algorithm (RFC 1321), the latter with a seed. +.TP +.B {CRYPT} +uses the +.BR crypt (3). +.TP .B {CLEARTEXT} indicates that the new password should be added to userPassword as clear text. - -Also, note that this option does not alter the normal user applications +.TP +Note that this option does not alter the normal user applications handling of userPassword during LDAP Add, Modify, or other LDAP operations. .TP .B password\-crypt\-salt\-format diff --git a/doc/man/man8/slappasswd.8 b/doc/man/man8/slappasswd.8 index 4b34bc060e..d8a504e75b 100644 --- a/doc/man/man8/slappasswd.8 +++ b/doc/man/man8/slappasswd.8 @@ -48,6 +48,24 @@ be specified: The default is .IR {SSHA} . .TP +.B {SHA} +and +.B {SSHA} +use the SHA-1 algorithm (FIPS 160-1), the latter with a seed. +.TP +.B {MD5} +and +.B {SMD5} +use the MD5 algorithm (RFC 1321), the latter with a seed. +.TP +.B {CRYPT} +uses the +.BR crypt (3). +.TP +.B {CLEARTEXT} +indicates that the new password should be added to userPassword as +clear text. +.TP .BI \-c " crypt-salt-format" Specify the format of the salt passed to .BR crypt (3) -- 2.39.5