Remove patches that aren't applicable on master.

Change-Id: Ia1829637824ca1b18cf12739a9e4d12267e22699
This commit is contained in:
Joshua Harlow 2013-06-30 18:02:28 -07:00
parent 72dd8e0089
commit 32759689e1
4 changed files with 0 additions and 96 deletions

View File

@ -1,39 +0,0 @@
Crypto.Random was added in python-crypto-2.1.0 to replace
the problematic randpool in 2.0.1: http://www.pycrypto.org/randpool-broken
However on Linux os.urandom() should be fine to set IV.
I'm not sure it's necessary to pad with random bytes,
but I'm leaving that as is for now:
http://www.codekoala.com/blog/2009/aes-encryption-python-using-pycrypto/#comment-25921785
http://eli.thegreenplace.net/2010/06/25/aes-encryption-of-files-in-python-with-pycrypto/
diff -Naur glance-2012.1.orig/glance/common/crypt.py glance-2012.1/glance/common/crypt.py
--- glance-2012.1.orig/glance/common/crypt.py 2012-03-30 13:12:40.000000000 +0000
+++ glance-2012.1/glance/common/crypt.py 2012-04-09 01:46:38.244937150 +0000
@@ -21,10 +21,7 @@
"""
import base64
-
from Crypto.Cipher import AES
-from Crypto import Random
-from Crypto.Random import random
def urlsafe_encrypt(key, plaintext, blocksize=16):
@@ -41,13 +38,12 @@
Pads text to be encrypted
"""
pad_length = (blocksize - len(text) % blocksize)
- sr = random.StrongRandom()
- pad = ''.join(chr(sr.randint(1, 0xFF)) for i in range(pad_length - 1))
+ pad = os.urandom(pad_length - 1)
# We use chr(0) as a delimiter between text and padding
return text + chr(0) + pad
# random initial 16 bytes for CBC
- init_vector = Random.get_random_bytes(16)
+ init_vector = os.urandom(16)
cypher = AES.new(key, AES.MODE_CBC, init_vector)
padded = cypher.encrypt(pad(str(plaintext)))
return base64.urlsafe_b64encode(init_vector + padded)

View File

@ -1,22 +0,0 @@
Subject: [PATCH] Fix tag version for keystone-client
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 82ca730..939a8a6 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ tests_require = setup.parse_requirements(['tools/test-requires'])
setuptools.setup(
name="python-keystoneclient",
- version=setup.get_post_version('keystoneclient'),
+ version=setup.get_post_version('keystoneclient').splitlines()[-1].strip(),
description="Client library for OpenStack Identity API (Keystone)",
long_description=read('README.rst'),
url='https://github.com/openstack/python-keystoneclient',
--
1.7.12

View File

@ -1,22 +0,0 @@
Subject: [PATCH] Patch to grab only the last version
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index c3d851c..ad69bf6 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ from quantumclient.openstack.common import setup
Name = 'python-quantumclient'
Url = "https://launchpad.net/quantum"
-Version = setup.get_post_version('quantumclient')
+Version = setup.get_post_version('quantumclient').splitlines()[-1].strip()
License = 'Apache License 2.0'
Author = 'OpenStack Quantum Project'
AuthorEmail = 'openstack-dev@lists.launchpad.net'
--
1.7.12

View File

@ -1,13 +0,0 @@
diff --git a/tools/pip-requires b/tools/pip-requires
index 7ed4a43..bd47095 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -8,7 +8,7 @@ eventlet>=0.9.17
greenlet>=0.3.1
httplib2
iso8601>=0.1.4
-kombu==1.0.4
+kombu>=1.0.4
netaddr
python-quantumclient>=2.2.0,<3.0.0
pyudev