From 73bb7a23a4b3c488d494fc3c2b8d9b5e84020669 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Mar 2015 20:14:44 +0200 Subject: Use RC4 for generating jusnk Suggested-by: Rob Kendrick --- genbackupdatalib/generator.py | 44 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/genbackupdatalib/generator.py b/genbackupdatalib/generator.py index 8cf349c..227b6a4 100644 --- a/genbackupdatalib/generator.py +++ b/genbackupdatalib/generator.py @@ -14,49 +14,31 @@ # along with this program. If not, see . -import random import struct +import Crypto.Cipher.ARC4 + class DataGenerator(object): '''Generate random binary data.''' - # We generate data by using a blob of suitable size. The output - # sequence repeats the blob, where each repetition is preceded by - # a 64-bit counter. - # - # We need to be relatively prime with obnam's chunk size, which - # defaults to 64 KiB (65536 bytes). This is so that obnam does not - # notice a lot of duplicated data, resulting in unrealistically - # high amounts of compression in the backup store. - # - # Ideally, we would not generate any repeating data, but the random - # number generator is not fast enough for that. We need to generate - # data about as fast as the disk can write it, and the random number - # generator is orders of magnitude slower than that. - - _blob_size = 65521 - _blob_size = 1021 + _data = 'x' * 1024**2 def __init__(self, seed): - self._random = random.Random(seed) - self._blob = self._generate_blob() - self._counter = 0 + key = struct.pack('!Q', seed) + self._arc4 = Crypto.Cipher.ARC4.new(key) self._buffer = '' - def _generate_blob(self): - return ''.join(chr(self._random.randint(0, 255)) - for i in range(self._blob_size)) - def generate(self, size): - while size > len(self._buffer): - self._buffer += self._generate_more_data() + while len(self._buffer) < size: + self._buffer += self._generate_junk() + return self._split_off_data(size) + + def _generate_junk(self): + return self._arc4.encrypt(self._data) + + def _split_off_data(self, size): data = self._buffer[:size] self._buffer = self._buffer[size:] return data - - def _generate_more_data(self): - self._counter += 1 - return struct.pack('!Q', self._counter) + self._blob - -- cgit v1.2.1