diff options
author | Stef Walter <stefw@collabora.co.uk> | 2011-11-21 11:40:11 +0100 |
---|---|---|
committer | Stef Walter <stefw@collabora.co.uk> | 2011-11-21 11:40:11 +0100 |
commit | d2128ffc09d4c9b4aa6b5a0ed2d81819a0a2af1d (patch) | |
tree | 3954b9214c8bacb58542daf7726a3a9aa561acf0 /pkcs11/gkm | |
parent | 01d4e6de0c827d3c2644b589fdc0f18a0a991887 (diff) | |
parent | 81f51c700996c770c1743340baa39c4108757f9f (diff) | |
download | gnome-keyring-d2128ffc09d4c9b4aa6b5a0ed2d81819a0a2af1d.tar.gz |
Merge branch 'gnome-3-2'
Diffstat (limited to 'pkcs11/gkm')
-rw-r--r-- | pkcs11/gkm/gkm-data-der.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkcs11/gkm/gkm-data-der.c b/pkcs11/gkm/gkm-data-der.c index 06372022..d9a50019 100644 --- a/pkcs11/gkm/gkm-data-der.c +++ b/pkcs11/gkm/gkm-data-der.c @@ -968,7 +968,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 */ |