forked from pool/whois
9f4f7e06b6
- enable use of crypt_gensalt to support all glibc supported algorithms - allow 8bit passwords read from file - support new blowfish $2y algorithm I've sent the patches to Marco d'Itri <md@linux.it>, he said he will include them in the next whois release. OBS-URL: https://build.opensuse.org/request/show/76616 OBS-URL: https://build.opensuse.org/package/show/network:utilities/whois?expand=0&rev=19
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From cda3259facbb37e8775131cfde9822aeb09edf78 Mon Sep 17 00:00:00 2001
|
|
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
|
Date: Thu, 14 Jul 2011 13:31:13 +0200
|
|
Subject: [PATCH whois 6/7] remove obsolete settings
|
|
|
|
According to Solar Designer $2$ never was officially released,
|
|
refers to a pre-version of blowfish crypt. FreeBSD is said to
|
|
support $2a.
|
|
|
|
libxcrypt does not actually support {SHA}
|
|
---
|
|
mkpasswd.c | 8 +-------
|
|
1 files changed, 1 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/mkpasswd.c b/mkpasswd.c
|
|
index ee997ba..7408cbc 100644
|
|
--- a/mkpasswd.c
|
|
+++ b/mkpasswd.c
|
|
@@ -83,10 +83,7 @@ static const struct crypt_method methods[] = {
|
|
{ "des", "", 2, 2, 0,
|
|
N_("standard 56 bit DES-based crypt(3)") },
|
|
{ "md5", "$1$", 8, 8, 0, "MD5" },
|
|
-#if defined FreeBSD
|
|
- { "bf", "$2$", 22, 22, 0, "Blowfish (FreeBSD)" },
|
|
-#endif
|
|
-#if defined OpenBSD || (defined __SVR4 && defined __sun)
|
|
+#if defined OpenBSD || defined FreeBSD || (defined __SVR4 && defined __sun)
|
|
{ "bf", "$2a$", 22, 22, 1, "Blowfish" },
|
|
#endif
|
|
#if defined HAVE_CRYPT_GENSALT
|
|
@@ -111,9 +108,6 @@ static const struct crypt_method methods[] = {
|
|
#if defined __SVR4 && defined __sun
|
|
{ "sunmd5", "$md5$", 8, 8, 1, "SunMD5" },
|
|
#endif
|
|
-#if defined HAVE_XCRYPT
|
|
- { "sha", "{SHA}", 0, 0, 0, "SHA-1" },
|
|
-#endif
|
|
{ NULL, NULL, 0, 0, 0, NULL }
|
|
};
|
|
|
|
--
|
|
1.7.3.4
|
|
|