File whois-5.0.11-mkpasswd-remove-obsolete-settings.... of Package whois

Overview Repositories Revisions Requests Users Attributes Meta

File whois-5.0.11-mkpasswd-remove-obsolete-settings.diff of Package whois (Revision 596ce00a8efed8a39175c42228a07905)

Currently displaying revision 596ce00a8efed8a39175c42228a07905 , Show latest

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

Places

File whois-5.0.11-mkpasswd-remove-obsolete-settings.diff of Package whois (Revision 596ce00a8efed8a39175c42228a07905)

Places