From adfcf08588e6031be837602dc4d1f8d6d14d795b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 7 Apr 2020 13:29:27 +0800 Subject: [PATCH] test/rgw/rgw_multi: pass bytes to hmac.new() in Python3, `key` passed to `hmac.new()` should be bytes or bytearray Signed-off-by: Kefu Chai --- src/test/rgw/rgw_multi/zone_ps.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/rgw/rgw_multi/zone_ps.py b/src/test/rgw/rgw_multi/zone_ps.py index 0ee4e3958232c..9b706d2b150f9 100644 --- a/src/test/rgw/rgw_multi/zone_ps.py +++ b/src/test/rgw/rgw_multi/zone_ps.py @@ -82,7 +82,7 @@ def make_request(conn, method, resource, parameters=None, sign_parameters=False, string_to_sign = method + '\n\n\n' + string_date + '\n' + resource if sign_parameters: string_to_sign += url_params - signature = base64.b64encode(hmac.new(conn.aws_secret_access_key, + signature = base64.b64encode(hmac.new(conn.aws_secret_access_key.encode('utf-8'), string_to_sign.encode('utf-8'), hashlib.sha1).digest()).decode('ascii') headers = {'Authorization': 'AWS '+conn.aws_access_key_id+':'+signature, @@ -219,7 +219,7 @@ class PSTopicS3: method = 'POST' string_to_sign = method + '\n\n' + content_type + '\n' + string_date + '\n' + resource log.debug('StringTosign: %s', string_to_sign) - signature = base64.b64encode(hmac.new(self.conn.aws_secret_access_key, + signature = base64.b64encode(hmac.new(self.conn.aws_secret_access_key.encode('utf-8'), string_to_sign.encode('utf-8'), hashlib.sha1).digest()).decode('ascii') headers = {'Authorization': 'AWS '+self.conn.aws_access_key_id+':'+signature, @@ -261,7 +261,7 @@ class PSTopicS3: method = 'POST' string_to_sign = method + '\n\n' + content_type + '\n' + string_date + '\n' + resource log.debug('StringTosign: %s', string_to_sign) - signature = base64.b64encode(hmac.new(self.conn.aws_secret_access_key, + signature = base64.b64encode(hmac.new(self.conn.aws_secret_access_key.encode('utf-8'), string_to_sign.encode('utf-8'), hashlib.sha1).digest()).decode('ascii') headers = {'Authorization': 'AWS '+self.conn.aws_access_key_id+':'+signature, -- 2.39.5