components/openstack/cinder/patches/02-nopycrypto.patch
author Laszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:41 -0700
changeset 6849 f9a2279efa0d
parent 5405 66fd59fecd68
permissions -rw-r--r--
24465600 Update Cinder for the Mitaka release

In-house removal of PyCrypto dependency in Cinder. This patch is
Solaris-specific and not suitable for upstream.

--- cinder-8.0.0/cinder/volume/utils.py.~1~	2016-04-07 00:30:48.000000000 -0700
+++ cinder-8.0.0/cinder/volume/utils.py	2016-06-10 14:42:17.155596130 -0700
@@ -21,7 +21,7 @@ import re
 import time
 import uuid
 
-from Crypto.Random import random
+from random import SystemRandom
 import eventlet
 from eventlet import tpool
 from oslo_concurrency import processutils
@@ -551,6 +551,7 @@ def generate_password(length=16, symbolg
     # NOTE(jerdfelt): Some password policies require at least one character
     # from each group of symbols, so start off with one random character
     # from each symbol group
+    random = SystemRandom()
     password = [random.choice(s) for s in symbolgroups]
     # If length < len(symbolgroups), the leading characters will only
     # be from the first length groups. Try our best to not be predictable