From 1c142ff073f0470cd21809c83f5740aa309c4117 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 13 Sep 2008 17:52:09 +0000 Subject: [PATCH] - Remove patches applied upstream: + debian/patches/300_SHA_crypt_method --- debian/changelog | 1 + debian/patches/300_SHA_crypt_method | 36 ----------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 debian/patches/300_SHA_crypt_method diff --git a/debian/changelog b/debian/changelog index 382c0a28..07bf86fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ shadow (1:4.1.2-1) experimental; urgency=low + debian/patches/487_passwd_chauthtok_failed_message + debian/patches/406_vipw_resume_properly + debian/patches/414_remove-unwise-advices + + debian/patches/300_SHA_crypt_method - Updated patches: + debian/patches/431_su_uid_0_not_root + debian/patches/463_login_delay_obeys_to_PAM diff --git a/debian/patches/300_SHA_crypt_method b/debian/patches/300_SHA_crypt_method deleted file mode 100644 index f2fa93b0..00000000 --- a/debian/patches/300_SHA_crypt_method +++ /dev/null @@ -1,36 +0,0 @@ -Goal: Fix bugs in the SHA encryption method that force the salt to have 8 - bytes (instead of a random length between 8 and 16 bytes), and force - the number of SHA rounds to be equal to the lowest limit (at least - 1000 SHA rounds). - -Status wrt upstream: Already applied upstream. - -Index: shadow-4.1.1/libmisc/salt.c -=================================================================== ---- shadow-4.1.1.orig/libmisc/salt.c 2008-02-03 18:23:31.000000000 +0100 -+++ shadow-4.1.1/libmisc/salt.c 2008-05-21 22:24:32.734281067 +0200 -@@ -90,9 +90,10 @@ - */ - static unsigned int SHA_salt_size (void) - { -- double rand_rounds = 9 * random (); -- rand_rounds /= RAND_MAX; -- return 8 + rand_rounds; -+ double rand_size; -+ seedRNG (); -+ rand_size = (double) 9.0 * random () / RAND_MAX; -+ return 8 + rand_size; - } - - /* ! Arguments evaluated twice ! */ -@@ -131,8 +132,8 @@ - if (min_rounds > max_rounds) - max_rounds = min_rounds; - -- srand (time (NULL)); -- rand_rounds = (max_rounds-min_rounds+1) * random (); -+ seedRNG (); -+ rand_rounds = (double) (max_rounds-min_rounds+1.0) * random (); - rand_rounds /= RAND_MAX; - rounds = min_rounds + rand_rounds; - } else if (0 == *prefered_rounds) diff --git a/debian/patches/series b/debian/patches/series index 52cd414b..1b3d2f27 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,7 +26,6 @@ 508_nologin_in_usr_sbin 505_useradd_recommend_adduser 415_login_put-echoctl-back -300_SHA_crypt_method 301_manpages_missing_options 302_vim_selinux_support 200_Czech_binary_translation