diff options
| author | Hans Hörberg <hans.horberg@umu.se> | 2014-02-28 08:30:27 +0100 |
|---|---|---|
| committer | Hans Hörberg <hans.horberg@umu.se> | 2014-02-28 08:30:27 +0100 |
| commit | 0213e1863048bd65d982fb4edfcd46208b542ed5 (patch) | |
| tree | 25eead02493de48719567d9717d27e93863a357a /src/saml2/config.py | |
| parent | 535acbafaa709363bf5847d0b08cb8b7142ce6eb (diff) | |
| parent | 26e25cd8a6dc49ba6eff1d0ee4b95b3560f86ef2 (diff) | |
| download | pysaml2-0213e1863048bd65d982fb4edfcd46208b542ed5.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/saml2/config.py')
| -rw-r--r-- | src/saml2/config.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/saml2/config.py b/src/saml2/config.py index a597ea58..da981195 100644 --- a/src/saml2/config.py +++ b/src/saml2/config.py @@ -2,6 +2,7 @@ __author__ = 'rolandh' +import copy import sys import os import re @@ -48,7 +49,7 @@ ONTS = { COMMON_ARGS = [ "entityid", "xmlsec_binary", "debug", "key_file", "cert_file", - "secret", "accepted_time_diff", "name", "ca_certs", + "encryption_type", "secret", "accepted_time_diff", "name", "ca_certs", "description", "valid_for", "verify_ssl_cert", "organization", "contact_person", @@ -175,6 +176,7 @@ class Config(object): self.debug = False self.key_file = None self.cert_file = None + self.encryption_type = 'both' self.secret = None self.accepted_time_diff = None self.name = None @@ -349,7 +351,7 @@ class Config(object): mod = self._load(config_file) #return self.load(eval(open(config_file).read())) - return self.load(mod.CONFIG, metadata_construction) + return self.load(copy.deepcopy(mod.CONFIG), metadata_construction) def load_metadata(self, metadata_conf): """ Loads metadata into an internal structure """ |