Merge pull request #114 from HaToHo/master

Fix for encrypted assertion.

Author: Roland Hedberg

src/saml2/response.py

@@ -809,7 +809,7 @@ def parse_assertion(self, key_file=""):
 
         if self.response.encrypted_assertion:
             logger.debug("***Encrypted assertion/-s***")
-            decr_text = self.sec.decrypt(self.xmlstr)
+            decr_text = self.sec.decrypt(self.xmlstr, key_file)
             resp = samlp.response_from_string(decr_text)
             res = self.decrypt_assertions(resp.encrypted_assertion, key_file)
             if self.response.assertion:

src/saml2/sigver.py

@@ -1250,12 +1250,14 @@ def encrypt_assertion(self, statement, cert_file, cert_type="pem"):
         :return:
         """
 
-    def decrypt(self, enctext):
+    def decrypt(self, enctext, key_file=None):
         """ Decrypting an encrypted text by the use of a private key.
 
         :param enctext: The encrypted text as a string
         :return: The decrypted text
         """
+        if key_file is not None and len(key_file.strip()) > 0:
+            return self.crypto.decrypt(enctext, key_file)
         return self.crypto.decrypt(enctext, self.key_file)
 
     def verify_signature(self, signedtext, cert_file=None, cert_type="pem",