Update Keystone code from official Github repository with branch Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

1 files changed, 12 insertions, 3 deletions

diff --git a/keystone-moon/keystone/contrib/s3/core.py b/keystone-moon/keystone/contrib/s3/core.py
index 34095bf4..d3e06acc 100644
--- a/keystone-moon/keystone/contrib/s3/core.py
+++ b/keystone-moon/keystone/contrib/s3/core.py
@@ -25,6 +25,8 @@ import base64
 import hashlib
 import hmac
 
+import six
+
 from keystone.common import extension
 from keystone.common import json_home
 from keystone.common import utils
@@ -32,6 +34,7 @@ from keystone.common import wsgi
 from keystone.contrib.ec2 import controllers
 from keystone import exception
 
+
 EXTENSION_DATA = {
     'name': 'OpenStack S3 API',
     'namespace': 'http://docs.openstack.org/identity/api/ext/'
@@ -65,9 +68,15 @@ class S3Extension(wsgi.V3ExtensionRouter):
 class S3Controller(controllers.Ec2Controller):
     def check_signature(self, creds_ref, credentials):
         msg = base64.urlsafe_b64decode(str(credentials['token']))
-        key = str(creds_ref['secret'])
-        signed = base64.encodestring(
-            hmac.new(key, msg, hashlib.sha1).digest()).strip()
+        key = str(creds_ref['secret']).encode('utf-8')
+
+        if six.PY2:
+            b64_encode = base64.encodestring
+        else:
+            b64_encode = base64.encodebytes
+
+        signed = b64_encode(
+            hmac.new(key, msg, hashlib.sha1).digest()).decode('utf-8').strip()
 
         if not utils.auth_str_equal(credentials['signature'], signed):
             raise exception.Unauthorized('Credential signature mismatch')