Merge lp:~gl-az/percona-xtrabackup/bug1255300-2.2 into lp:percona-xtrabackup/2.2

[George Ormond Lorch III]

Simple fix for bug 1255300 - weak random numbers used for IV encryption.
Changed over to using libgcrypt gcry_create_nonce to create IV.

[George Ormond Lorch III (gl-az)]

BT-23557
jenkins http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/61/

[Alexey Kopytov (akopytov)]

If xb_crypt_init_iv() is now a no-op, what's the reason to preserve it?

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

Same comment as 2.1 and new jenkins http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.2-param/64/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/src/ds_encrypt.c'
--- storage/innobase/xtrabackup/src/ds_encrypt.c	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/src/ds_encrypt.c	2013-11-27 19:18:55 +0000
@@ -183,8 +183,6 @@
 	xb_a(encrypt_iv_len > 0);
 	xb_a(encrypt_iv_len <= sizeof(encrypt_iv));
 
-	xb_crypt_init_iv();
-
 	/* Now set up the key */
 	if (xtrabackup_encrypt_key == NULL &&
 	    xtrabackup_encrypt_key_file == NULL) {
 
=== modified file 'storage/innobase/xtrabackup/src/xbcrypt.c'
--- storage/innobase/xtrabackup/src/xbcrypt.c	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/src/xbcrypt.c	2013-11-27 19:18:55 +0000
@@ -503,8 +503,6 @@
 
 	ivbuf = my_malloc(encrypt_iv_len, MYF(MY_FAE));
 
-	xb_crypt_init_iv();
-
 	/* now read in data in chunk size, encrypt and write out */
 	chunkbuflen = opt_encrypt_chunk_size;
 	chunkbuf = my_malloc(chunkbuflen, MYF(MY_FAE));
 
=== modified file 'storage/innobase/xtrabackup/src/xbcrypt.h'
--- storage/innobase/xtrabackup/src/xbcrypt.h	2013-10-17 01:00:57 +0000
+++ storage/innobase/xtrabackup/src/xbcrypt.h	2013-11-27 19:18:55 +0000
@@ -76,7 +76,5 @@
 my_bool xb_crypt_read_key_file(const char *filename,
 			       void** key, uint *keylength);
 
-void xb_crypt_init_iv();
-
 void xb_crypt_create_iv(void* ivbuf, size_t ivlen);
 #endif
 
=== modified file 'storage/innobase/xtrabackup/src/xbcrypt_common.c'
--- storage/innobase/xtrabackup/src/xbcrypt_common.c	2013-11-26 10:44:44 +0000
+++ storage/innobase/xtrabackup/src/xbcrypt_common.c	2013-11-27 19:18:55 +0000
@@ -53,24 +53,8 @@
 	return TRUE;
 }
 
-
-void 
-xb_crypt_init_iv()
-{
-	uint seed = time(NULL);
-	srandom(seed);
-}
-
 void
 xb_crypt_create_iv(void* ivbuf, size_t ivlen)
 {
-	size_t i;
-	ulong rndval;
-
-	for (i = 0; i < ivlen; i++) {
-		if (i % 4 == 0) {
-			rndval = (ulong) random();
-		}
-		((uchar*)ivbuf)[i] = ((uchar*)&rndval)[i % 4];
-	}
+	gcry_create_nonce(ivbuf, ivlen);
 }