summaryrefslogtreecommitdiffstats
path: root/apps/passwd.c
diff options
context:
space:
mode:
authorTim Hudson <tjh@openssl.org>2014-12-28 12:48:40 +1000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:23:04 +0000
commit6977c7e2baf291278aee7632f1a68581b7c4d1f9 (patch)
treeae6c4def1c5f7f4a3c4cb9bb7e63ec0ebf27b7f7 /apps/passwd.c
parent43257b9f51de749262258668c77c2f0f99d7a15b (diff)
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments (cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960) Conflicts: crypto/bn/bn_lcl.h crypto/bn/bn_prime.c crypto/engine/eng_all.c crypto/rc4/rc4_utl.c crypto/sha/sha.h ssl/kssl.c ssl/t1_lib.c Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps/passwd.c')
-rw-r--r--apps/passwd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/passwd.c b/apps/passwd.c
index 9ca25dd1da..8e65ed7cbb 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -43,7 +43,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
char *passwd, BIO *out, int quiet, int table, int reverse,
size_t pw_maxlen, int usecrypt, int use1, int useapr1);
-/* -crypt - standard Unix password algorithm (default)
+/*-
+ * -crypt - standard Unix password algorithm (default)
* -1 - MD5-based password algorithm
* -apr1 - MD5-based password algorithm, Apache variant
* -salt string - salt