diff options
Diffstat (limited to 'share/security/patches/EN-14:11/crypt.patch')
| -rw-r--r-- | share/security/patches/EN-14:11/crypt.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/share/security/patches/EN-14:11/crypt.patch b/share/security/patches/EN-14:11/crypt.patch deleted file mode 100644 index 0a5355f90b..0000000000 --- a/share/security/patches/EN-14:11/crypt.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: lib/libcrypt/crypt.c -=================================================================== ---- lib/libcrypt/crypt.c (revision 273303) -+++ lib/libcrypt/crypt.c (working copy) -@@ -37,8 +37,13 @@ __FBSDID("$FreeBSD$"); - #include "crypt.h" - - /* -- * List of supported crypt(3) formats. The first element in the list will -- * be the default. -+ * List of supported crypt(3) formats. -+ * -+ * The default algorithm is the last entry in the list (second-to-last -+ * array element since the last is a sentinel). The reason for placing -+ * the default last rather than first is that DES needs to be at the -+ * bottom for the algorithm guessing logic in crypt(3) to work correctly, -+ * and it needs to be the default for backward compatibility. - */ - static const struct crypt_format { - const char *const name; -@@ -45,10 +50,6 @@ static const struct crypt_format { - char *(*const func)(const char *, const char *); - const char *const magic; - } crypt_formats[] = { -- /* default format */ -- { "sha512", crypt_sha512, "$6$" }, -- -- /* other supported formats */ - { "md5", crypt_md5, "$1$" }, - #ifdef HAS_BLOWFISH - { "blf", crypt_blowfish, "$2" }, -@@ -55,6 +56,7 @@ static const struct crypt_format { - #endif - { "nth", crypt_nthash, "$3$" }, - { "sha256", crypt_sha256, "$5$" }, -+ { "sha512", crypt_sha512, "$6$" }, - #ifdef HAS_DES - { "des", crypt_des, "_" }, - #endif -@@ -63,7 +65,8 @@ static const struct crypt_format { - { NULL, NULL, NULL } - }; - --static const struct crypt_format *crypt_format = &crypt_formats[0]; -+static const struct crypt_format *crypt_format = -+ &crypt_formats[(sizeof crypt_formats / sizeof *crypt_formats) - 2]; - - #define DES_SALT_ALPHABET \ - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" |