summaryrefslogtreecommitdiff
path: root/src/saml2/config.py
diff options
context:
space:
mode:
authorHans Hörberg <hans.horberg@umu.se>2015-06-02 15:34:01 +0200
committerHans Hörberg <hans.horberg@umu.se>2015-06-02 15:34:01 +0200
commitcddf80f4c0e62fac9e8b41ad6f6ecee42909d55e (patch)
tree826568e43f0ac1626ad8244a9b5f61cdfacc9142 /src/saml2/config.py
parent9c2b951be6a830aa4d165821ea4f0d7f245221f2 (diff)
downloadpysaml2-cddf80f4c0e62fac9e8b41ad6f6ecee42909d55e.tar.gz
New metadata configuration for encryption.
Diffstat (limited to 'src/saml2/config.py')
-rw-r--r--src/saml2/config.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/saml2/config.py b/src/saml2/config.py
index 4c0cb12a..9cd36f6d 100644
--- a/src/saml2/config.py
+++ b/src/saml2/config.py
@@ -49,8 +49,8 @@ ONTS = {
}
COMMON_ARGS = [
- "entityid", "xmlsec_binary", "debug", "key_file", "cert_file",
- "encryption_type", "secret", "accepted_time_diff", "name", "ca_certs",
+ "entityid", "xmlsec_binary", "debug", "key_file", "cert_file", "encryption_keypairs", "additional_cert_files",
+ "metadata_key_usage", "secret", "accepted_time_diff", "name", "ca_certs",
"description", "valid_for", "verify_ssl_cert",
"organization",
"contact_person",
@@ -190,7 +190,9 @@ class Config(object):
self.debug = False
self.key_file = None
self.cert_file = None
- self.encryption_type = 'both'
+ self.encryption_keypairs = None
+ self.additional_cert_files = None
+ self.metadata_key_usage = 'both'
self.secret = None
self.accepted_time_diff = None
self.name = None