[Pkg-shadow-commits] r2402 - in debian/trunk/debian: . patches

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-13 17:52:09 +0000 (Sat, 13 Sep 2008)
New Revision: 2402

Removed:
   debian/trunk/debian/patches/300_SHA_crypt_method
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/series
Log:
    - Remove patches applied upstream:
      + debian/patches/300_SHA_crypt_method


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-09-13 17:50:46 UTC (rev 2401)
+++ debian/trunk/debian/changelog	2008-09-13 17:52:09 UTC (rev 2402)
@@ -8,6 +8,7 @@
       + 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

Deleted: debian/trunk/debian/patches/300_SHA_crypt_method
===================================================================
--- debian/trunk/debian/patches/300_SHA_crypt_method	2008-09-13 17:50:46 UTC (rev 2401)
+++ debian/trunk/debian/patches/300_SHA_crypt_method	2008-09-13 17:52:09 UTC (rev 2402)
@@ -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)

Modified: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series	2008-09-13 17:50:46 UTC (rev 2401)
+++ debian/trunk/debian/patches/series	2008-09-13 17:52:09 UTC (rev 2402)
@@ -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