From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 11 Apr 2013 15:31:53 +0000 (+0200)
Subject: uses os.urandom instead of Crypto.Random for backward compatibility
X-Git-Tag: 2014.1~713^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5a3e5b2cd22cb567203f06d337cf9a457f59915b;p=openstack-build%2Fheat-build.git

uses os.urandom instead of Crypto.Random for backward compatibility

Crypto.Random has been introduced by pycrypto 2.1 but in RHEL6 and
derivates you will only find pycrypto 2.0.1

Change-Id: Ib601981b0b8fcb5b3e8fc8761ee05adf7f6574fa
---

diff --git a/heat/common/crypt.py b/heat/common/crypt.py
index 28c11f53..81b4c92b 100644
--- a/heat/common/crypt.py
+++ b/heat/common/crypt.py
@@ -15,7 +15,7 @@
 
 import base64
 from Crypto.Cipher import AES
-from Crypto import Random
+from os import urandom
 
 from oslo.config import cfg
 
@@ -36,7 +36,7 @@ logger = logging.getLogger(__name__)
 def encrypt(auth_info):
     if auth_info is None:
         return None
-    iv = Random.new().read(AES.block_size)
+    iv = urandom(AES.block_size)
     cipher = AES.new(cfg.CONF.auth_encryption_key[:32], AES.MODE_CFB, iv)
     res = base64.b64encode(iv + cipher.encrypt(auth_info))
     return res