transports started

2017-02-19 13:26:22 +03:00
parent 8014c386ac
commit 0343e318fb
4 changed files with 24 additions and 4 deletions
--- a/pbincli/sjcl_gcm.py
+++ b/pbincli/sjcl_gcm.py
@@ -133,11 +133,11 @@ class SJCL(object):
        ciphertext = ciphertext + mac

        return {
-            "salt": base64.b64encode(salt),
+            "salt": base64.b64encode(salt).decode('UTF-8'),
            "iter": count,
            "ks": dkLen*8,
-            "ct": base64.b64encode(ciphertext),
-            "iv": base64.b64encode(iv),
+            "ct": base64.b64encode(ciphertext).decode('UTF-8'),
+            "iv": base64.b64encode(iv).decode('UTF-8'),
            "cipher": "aes",
            "mode": "gcm",
            "adata": "",