[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 5bd0d68bf5e37ad6feeed35ec0ce0d75b6c29047
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed Apr 17 13:41:16 2013 -0700

    Attempt #1 at fixing TOOLS-300

diff --git a/euca2ools/commands/bundle/bundle.py b/euca2ools/commands/bundle/bundle.py
index 77656a6..d6c94de 100644
--- a/euca2ools/commands/bundle/bundle.py
+++ b/euca2ools/commands/bundle/bundle.py
@@ -51,8 +51,8 @@ class Bundle(object):
         self.digest = None
         self.digest_algorithm = 'SHA1'
         self.enc_algorithm = 'AES-128-CBC'
-        self.enc_key = None
-        self.enc_iv = None
+        self.enc_key = None  # a hex string
+        self.enc_iv = None  # a hex string
         self.image_filename = None
         self.image_size = None
         self.parts = None
@@ -120,8 +120,8 @@ class Bundle(object):
 
         # gzip --> openssl
         srand = random.SystemRandom()
-        enc_key = format(srand.getrandbits(128), 'x')
-        enc_iv = format(srand.getrandbits(128), 'x')
+        enc_key = '{0:0>32x}'.format(srand.getrandbits(128))
+        enc_iv = '{0:0>32x}'.format(srand.getrandbits(128))
         with self._lock:
             self.enc_key = enc_key
             self.enc_iv = enc_iv

-- 
managing cloud instances for Eucalyptus