Merge branch 'master' of https://github.com/peppelinux/pysaml2

Author: peppelinux

src/saml2/client_base.py

@@ -181,6 +181,9 @@ def __init__(self, config=None, identity_cache=None, state_cache=None,
 
             setattr(self, attr, val)
 
+        for algorithm in ('signing_algorithm', 'digest_algorithm'):
+            setattr(self, algorithm, self.config.getattr(algorithm, "sp"))
+
         if self.entity_type == "sp" and not any(
             [
                 self.want_assertions_signed,

src/saml2/config.py

@@ -69,6 +69,9 @@
     "extensions",
     "allow_unknown_attributes",
     "crypto_backend",
+    "id_attr_name",
+    "signing_algorithm",
+    "digest_algorithm",
     "delete_tmpfiles",
 ]
 
@@ -242,6 +245,8 @@ def __init__(self, homedir="."):
         self.attribute = []
         self.attribute_profile = []
         self.requested_attribute_name_format = NAME_FORMAT_URI
+        self.signing_algorithm = None
+        self.digest_algorithm = None
         self.delete_tmpfiles = True
 
     def setattr(self, context, attr, val):

src/saml2/entity.py

@@ -416,6 +416,13 @@ def unpack_soap_message(text):
 
     def sign(self, msg, mid=None, to_sign=None, sign_prepare=False,
              sign_alg=None, digest_alg=None):
+
+        if sign_alg is None and self.signing_algorithm:
+            sign_alg = self.signing_algorithm
+
+        if digest_alg is None and self.digest_algorithm:
+            digest_alg = self.digest_algorithm
+
         if msg.signature is None:
             msg.signature = pre_signature_part(msg.id, self.sec.my_cert, 1,
                                                sign_alg=sign_alg,

src/saml2/server.py

@@ -595,6 +595,9 @@ def gather_authn_response_args(self, sp_entity_id, name_id_policy, userid,
         except KeyError:
             args['best_effort'] = False
 
+        for algorithm in ('signing_algorithm', 'digest_algorithm'):
+            setattr(self, algorithm, self.config.getattr(algorithm, "idp"))
+
         for param in ['sign_assertion', 'sign_response', 'encrypt_assertion',
                       'encrypt_assertion_self_contained',
                       'encrypted_advice_attributes', 'encrypt_cert_advice',