Merge lp:~rye/ubuntu/oneiric/gnome-keyring/fix-random-hash-iteration-count into lp:ubuntu/oneiric/gnome-keyring

[Roman Yepishev]

Cherry-pick patch from git: Use g_random_int_range() for pseudo-random hash iteration count.

[lp:~rye/ubuntu/oneiric/gnome-keyring/fix-random-hash-iteration-count]

130. By Roman Yepishev on 2011-11-01

Target to -proposed

[Ken VanDine (ken-vandine)]

Thanks for the patch, I just uploaded 3.2.2 to oneiric-proposed which includes this fix.

[Sebastien Bacher (seb128)]

Could you set the request to merged since that got uploaded? it targetted oneiric rather than oneiric-proposed so that can't be done by somebody else

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-26 08:59:56 +0000
+++ debian/changelog	2011-11-01 14:11:25 +0000
@@ -1,3 +1,11 @@
+gnome-keyring (3.2.0-0ubuntu2) oneiric-proposed; urgency=low
+
+  * debian/patches/05_upstream_fix_random_hash_iteration_count.patch:
+    cherry-pick patch from git: Use g_random_int_range() for pseudo-random
+    hash iteration count. (LP: #874501)
+
+ -- Roman Yepishev <[e-mail]>  Tue, 01 Nov 2011 15:34:14 +0200
+
 gnome-keyring (3.2.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release

=== added file 'debian/patches/05_upstream_fix_random_hash_iteration_count.patch'
--- debian/patches/05_upstream_fix_random_hash_iteration_count.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05_upstream_fix_random_hash_iteration_count.patch	2011-11-01 14:11:25 +0000
@@ -0,0 +1,38 @@
+From 71bdb5dc967ec99b3b2fe9d5994de7996b4142c5 Mon Sep 17 00:00:00 2001
+From: Stef Walter <[e-mail]>
+Date: Mon, 24 Oct 2011 09:18:41 +0000
+Subject: pkcs11: Use g_random_int_range() for pseudo-random hash iteration count
+
+ * Used when hashing passwords into symmetric keys
+ * Previous solution was overflowing
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662025
+---
+diff --git a/pkcs11/gkm/gkm-data-der.c b/pkcs11/gkm/gkm-data-der.c
+index 8e60651..79bde94 100644
+--- a/pkcs11/gkm/gkm-data-der.c
++++ b/pkcs11/gkm/gkm-data-der.c
+@@ -966,7 +966,7 @@ prepare_and_encode_pkcs8_cipher (GNode *asn, const gchar *password,
+ 		g_return_val_if_reached (NULL);
+ 
+ 	/* Randomize some input for the password based secret */
+-	iterations = 1000 + (int) (1000.0 * rand () / (RAND_MAX + 1.0));
++	iterations = g_random_int_range (1000, 4096);
+ 	gcry_create_nonce (salt, sizeof (salt));
+ 
+ 	/* Allocate space for the key and iv */
+diff --git a/pkcs11/secret-store/gkm-secret-binary.c b/pkcs11/secret-store/gkm-secret-binary.c
+index 29cd9cd..9f6569e 100644
+--- a/pkcs11/secret-store/gkm-secret-binary.c
++++ b/pkcs11/secret-store/gkm-secret-binary.c
+@@ -584,7 +584,7 @@ gkm_secret_binary_write (GkmSecretCollection *collection, GkmSecretData *sdata,
+ 	egg_buffer_init_full (&buffer, 256, g_realloc);
+ 
+ 	/* Prepare the keyring for encryption */
+-	hash_iterations = 1000 + (int) (1000.0 * rand() / (RAND_MAX + 1.0));
++	hash_iterations = g_random_int_range (1000, 4096);
+ 	gcry_create_nonce (salt, sizeof (salt));
+ 
+ 	egg_buffer_append (&buffer, (guchar*)KEYRING_FILE_HEADER, KEYRING_FILE_HEADER_LEN);
+--
+cgit v0.9.0.2

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-18 14:58:20 +0000
+++ debian/patches/series	2011-11-01 14:11:25 +0000
@@ -1,2 +1,3 @@
 04_nodisplay_autostart.patch
+05_upstream_fix_random_hash_iteration_count.patch
 99_ltmain_as-needed.patch