components/openstack/glance/patches/01-nopycrypto.patch
branchs11u2-sru
changeset 4156 4b1def16fe9b
parent 3178 77584387a894
child 5405 66fd59fecd68
--- a/components/openstack/glance/patches/01-nopycrypto.patch	Thu Apr 16 01:36:32 2015 -0700
+++ b/components/openstack/glance/patches/01-nopycrypto.patch	Mon Apr 20 12:35:51 2015 -0700
@@ -4,10 +4,10 @@
 Convert urlsafe_encrypt() and urlsafe_decrypt() to use M2Crypto instead
 of PyCrypto.
 
---- glance-2013.2.3/glance/common/crypt.py.orig	2014-04-03 11:43:55.000000000 -0700
-+++ glance-2013.2.3/glance/common/crypt.py	2014-05-19 03:47:07.005226253 -0700
-@@ -4,6 +4,8 @@
- # Copyright 2011 OpenStack LLC.
+--- glance-2014.2.2/glance/common/crypt.py.~1~	2014-08-07 12:01:58.000000000 -0700
++++ glance-2014.2.2/glance/common/crypt.py	2014-08-09 21:36:53.351345980 -0700
+@@ -3,6 +3,8 @@
+ # Copyright 2011 OpenStack Foundation
  # All Rights Reserved.
  #
 +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -15,7 +15,7 @@
  #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
-@@ -21,10 +23,26 @@
+@@ -20,10 +22,26 @@
  """
  
  import base64
@@ -45,7 +45,7 @@
  
  
  def urlsafe_encrypt(key, plaintext, blocksize=16):
-@@ -36,20 +54,12 @@
+@@ -35,20 +53,12 @@
  
      :returns : Resulting ciphertext
      """
@@ -70,7 +70,7 @@
      return base64.urlsafe_b64encode(init_vector + padded)
  
  
-@@ -63,6 +73,7 @@
+@@ -62,6 +72,7 @@
      """
      # Cast from unicode
      ciphertext = base64.urlsafe_b64decode(str(ciphertext))