Bytes/string issues with encryption/decryption

Finding a few more places where bytes were leaking out of some methods
and strings were leaking into to others. This makes many more python3
tests pass.

Author: SpamapS

src/saml2/sigver.py

@@ -828,7 +828,7 @@ def decrypt(self, enctext, key_file):
         (_stdout, _stderr, output) = self._run_xmlsec(com_list, [fil],
                                                       exception=DecryptError,
                                                       validate_output=False)
-        return output
+        return output.decode('utf-8')
 
     def sign_statement(self, statement, node_name, key_file, node_id,
                        id_attr):

tests/test_50_server.py

@@ -706,7 +706,7 @@ def test_encrypted_signed_response_4(self):
 
         assert valid
 
-        _, key_file = make_temp("%s" % cert_key_str, decode=False)
+        _, key_file = make_temp(cert_key_str, decode=False)
 
         decr_text = self.server.sec.decrypt(decr_text, key_file)
 
@@ -749,7 +749,7 @@ def test_encrypted_response_1(self):
 
         assert sresponse.signature is None
 
-        _, key_file = make_temp("%s" % cert_key_str_advice, decode=False)
+        _, key_file = make_temp(cert_key_str_advice, decode=False)
 
         decr_text = self.server.sec.decrypt(_resp, key_file)
 
@@ -781,7 +781,7 @@ def test_encrypted_response_2(self):
 
         decr_text_1 = self.server.sec.decrypt(_resp, self.client.config.key_file)
 
-        _, key_file = make_temp("%s" % cert_key_str_advice, decode=False)
+        _, key_file = make_temp(cert_key_str_advice, decode=False)
 
         decr_text_2 = self.server.sec.decrypt(decr_text_1, key_file)
 
@@ -812,7 +812,7 @@ def test_encrypted_response_3(self):
 
         assert sresponse.signature is None
 
-        _, key_file = make_temp("%s" % cert_key_str_assertion, decode=False)
+        _, key_file = make_temp(cert_key_str_assertion, decode=False)
 
         decr_text = self.server.sec.decrypt(_resp, key_file)
 
@@ -904,11 +904,11 @@ def test_encrypted_response_6(self):
 
         assert sresponse.signature is None
 
-        _, key_file = make_temp("%s" % cert_key_str_assertion, decode=False)
+        _, key_file = make_temp(cert_key_str_assertion, decode=False)
 
         decr_text_1 = _server.sec.decrypt(_resp, key_file)
 
-        _, key_file = make_temp("%s" % cert_key_str_advice, decode=False)
+        _, key_file = make_temp(cert_key_str_advice, decode=False)
 
         decr_text_2 = _server.sec.decrypt(decr_text_1, key_file)
 

tests/test_60_sp.py

@@ -64,7 +64,7 @@ def test_identify(self):
             "urn:mace:example.com:saml:roland:sp", trans_name_policy,
             "[email protected]", authn=AUTHN)
 
-        resp_str = base64.encodestring(resp_str)
+        resp_str = base64.encodestring(resp_str.encode('utf-8'))
         self.sp.outstanding_queries = {"id1": "http://www.example.com/service"}
         session_info = self.sp._eval_authn_response(
             {}, {"SAMLResponse": [resp_str]})