Fix assertion test failures in python3

More strings/bytes problems causing issues with hashing. This further
cements that all data coming into pysaml2 will need to be utf-8, or the
API will need to have more places to specify alternative encodings.

Author: SpamapS

src/saml2/assertion.py

@@ -767,7 +767,7 @@ def apply_policy(self, sp_entity_id, policy, metadata=None):
         policy.acs = self.acs
         ava = policy.restrict(self, sp_entity_id, metadata)
 
-        for key, val in self.items():
+        for key, val in list(self.items()):
             if key in ava:
                 self[key] = ava[key]
             else:

src/saml2/sdb.py

@@ -2,7 +2,7 @@
 
 from hashlib import sha1
 
-from saml2.ident import code
+from saml2.ident import code_binary
 
 from saml2 import md
 from saml2 import saml
@@ -49,7 +49,7 @@ def __init__(self):
 
     def store_assertion(self, assertion, to_sign):
         self.assertion[assertion.id] = (assertion, to_sign)
-        key = sha1(code(assertion.subject.name_id)).hexdigest()
+        key = sha1(code_binary(assertion.subject.name_id)).hexdigest()
         try:
             self.authn[key].append(assertion.authn_statement)
         except KeyError:
@@ -68,7 +68,7 @@ def get_authn_statements(self, name_id, session_index=None,
         :return:
         """
         result = []
-        key = sha1(code(name_id)).hexdigest()
+        key = sha1(code_binary(name_id)).hexdigest()
         try:
             statements = self.authn[key]
         except KeyError:
@@ -89,6 +89,6 @@ def get_authn_statements(self, name_id, session_index=None,
 
     def remove_authn_statements(self, name_id):
         logger.debug("remove authn about: %s" % name_id)
-        nkey = sha1(code(name_id)).hexdigest()
+        nkey = sha1(code_binary(name_id)).hexdigest()
 
         del self.authn[nkey]