From 4eccb9d87b793ad2b6e1532ef4c89ab9d2bb3a90 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Fri, 28 Dec 2012 16:37:46 -0500 Subject: Add random number functions to QUtil --- libqpdf/Pl_AES_PDF.cc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'libqpdf/Pl_AES_PDF.cc') diff --git a/libqpdf/Pl_AES_PDF.cc b/libqpdf/Pl_AES_PDF.cc index 09c975d6..52876101 100644 --- a/libqpdf/Pl_AES_PDF.cc +++ b/libqpdf/Pl_AES_PDF.cc @@ -6,11 +6,6 @@ #include #include #include -#include -#ifndef HAVE_RANDOM -# define random rand -# define srandom srand -#endif bool Pl_AES_PDF::use_static_iv = false; @@ -155,15 +150,6 @@ Pl_AES_PDF::finish() void Pl_AES_PDF::initializeVector() { - static bool seeded_random = false; - if (! seeded_random) - { - // Seed the random number generator with something simple, but - // just to be interesting, don't use the unmodified current - // time.... - srandom((int)QUtil::get_current_time() ^ 0xcccc); - seeded_random = true; - } if (use_zero_iv) { for (unsigned int i = 0; i < this->buf_size; ++i) @@ -184,10 +170,7 @@ Pl_AES_PDF::initializeVector() } else { - for (unsigned int i = 0; i < this->buf_size; ++i) - { - this->cbc_block[i] = (unsigned char)((random() & 0xff0) >> 4); - } + QUtil::initializeWithRandomBytes(this->cbc_block, this->buf_size); } } -- cgit v1.2.3-54-g00ecf