|
 |
3fd438 |
From 4e76af1fe276a3b9b1392c97ef427a1ecfa42759 Mon Sep 17 00:00:00 2001
|
|
|
3fd438 |
From: Fraser Tweedale <ftweedal@redhat.com>
|
|
|
3fd438 |
Date: Mon, 28 Aug 2017 14:43:55 +1000
|
|
|
3fd438 |
Subject: [PATCH] KeyClient: fix json encoding in Python 3
|
|
|
3fd438 |
|
|
|
3fd438 |
Fixes: https://pagure.io/dogtagpki/issue/2746
|
|
|
3fd438 |
Change-Id: Iec2912bb90192fec403ac94006ff5927d3526533
|
|
|
3fd438 |
(cherry picked from commit b654e60f20b9e83833313ab89006db8f063bff1f)
|
|
|
3fd438 |
---
|
|
|
3fd438 |
base/common/python/pki/key.py | 12 ++++++------
|
|
|
3fd438 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
3fd438 |
|
|
|
3fd438 |
diff --git a/base/common/python/pki/key.py b/base/common/python/pki/key.py
|
|
|
3fd438 |
index d2b82970e..a5fc7928c 100644
|
|
|
3fd438 |
--- a/base/common/python/pki/key.py
|
|
|
3fd438 |
+++ b/base/common/python/pki/key.py
|
|
|
3fd438 |
@@ -668,7 +668,7 @@ class KeyClient(object):
|
|
|
3fd438 |
raise TypeError("Must specify Client Key ID")
|
|
|
3fd438 |
|
|
|
3fd438 |
if trans_wrapped_session_key is not None:
|
|
|
3fd438 |
- twsk = base64.b64encode(trans_wrapped_session_key)
|
|
|
3fd438 |
+ twsk = base64.b64encode(trans_wrapped_session_key).decode('ascii')
|
|
|
3fd438 |
# noinspection PyUnusedLocal
|
|
|
3fd438 |
request = SymKeyGenerationRequest(
|
|
|
3fd438 |
client_key_id=client_key_id,
|
|
|
3fd438 |
@@ -861,9 +861,9 @@ class KeyClient(object):
|
|
|
3fd438 |
if not nonce_iv:
|
|
|
3fd438 |
raise TypeError('Missing nonce IV')
|
|
|
3fd438 |
|
|
|
3fd438 |
- data = base64.b64encode(encrypted_data)
|
|
|
3fd438 |
- twsk = base64.b64encode(wrapped_session_key)
|
|
|
3fd438 |
- symkey_params = base64.b64encode(nonce_iv)
|
|
|
3fd438 |
+ data = base64.b64encode(encrypted_data).decode('ascii')
|
|
|
3fd438 |
+ twsk = base64.b64encode(wrapped_session_key).decode('ascii')
|
|
|
3fd438 |
+ symkey_params = base64.b64encode(nonce_iv).decode('ascii')
|
|
|
3fd438 |
|
|
|
3fd438 |
request = KeyArchivalRequest(client_key_id=client_key_id,
|
|
|
3fd438 |
data_type=data_type,
|
|
|
3fd438 |
@@ -904,7 +904,7 @@ class KeyClient(object):
|
|
|
3fd438 |
if pki_archive_options is None:
|
|
|
3fd438 |
raise TypeError("No data provided to be archived")
|
|
|
3fd438 |
|
|
|
3fd438 |
- data = base64.b64encode(pki_archive_options)
|
|
|
3fd438 |
+ data = base64.b64encode(pki_archive_options).decode('ascii')
|
|
|
3fd438 |
request = KeyArchivalRequest(client_key_id=client_key_id,
|
|
|
3fd438 |
data_type=data_type,
|
|
|
3fd438 |
pki_archive_options=data,
|
|
|
3fd438 |
@@ -1022,7 +1022,7 @@ class KeyClient(object):
|
|
|
3fd438 |
key_id=key_id,
|
|
|
3fd438 |
request_id=request_id,
|
|
|
3fd438 |
trans_wrapped_session_key=base64.b64encode(
|
|
|
3fd438 |
- trans_wrapped_session_key),
|
|
|
3fd438 |
+ trans_wrapped_session_key).decode('ascii'),
|
|
|
3fd438 |
payload_encryption_oid=self.encrypt_alg_oid,
|
|
|
3fd438 |
payload_wrapping_name=self.wrap_name
|
|
|
3fd438 |
)
|
|
|
3fd438 |
--
|
|
|
3fd438 |
2.13.5
|
|
|
3fd438 |
|