summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRoland Hedberg <roland.hedberg@adm.umu.se>2013-05-04 10:10:34 +0200
committerRoland Hedberg <roland.hedberg@adm.umu.se>2013-05-04 10:10:34 +0200
commit655a24f0d28e102c213a39ba924d8b0e14da0ed9 (patch)
treefe26a7a21eb1f2124fbacb5e7a5826da9be72ce4 /tools
parent76da2bb6bb77110cb782b31663090f28c410b8eb (diff)
downloadpysaml2-655a24f0d28e102c213a39ba924d8b0e14da0ed9.tar.gz
Added support for entity categories.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/make_metadata.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/make_metadata.py b/tools/make_metadata.py
index 68110ec1..1eaaca05 100755
--- a/tools/make_metadata.py
+++ b/tools/make_metadata.py
@@ -6,7 +6,7 @@ from saml2.metadata import entity_descriptor
from saml2.metadata import entities_descriptor
from saml2.metadata import sign_entity_descriptor
-from saml2.sigver import SecurityContext
+from saml2.sigver import SecurityContext, CryptoBackendXmlSec1
from saml2.sigver import get_xmlsec_cryptobackend
from saml2.sigver import get_xmlsec_binary
from saml2.validate import valid_instance
@@ -61,9 +61,13 @@ for filespec in args.config:
cnf = Config().load_file(fil, metadata_construction=True)
eds.append(entity_descriptor(cnf))
-crypto = get_xmlsec_cryptobackend()
-secc = SecurityContext(crypto, key_file=args.keyfile,
- cert_file=args.cert, debug=1)
+if not xmlsec:
+ crypto = get_xmlsec_cryptobackend()
+else:
+ crypto = CryptoBackendXmlSec1(xmlsec)
+
+secc = SecurityContext(crypto, key_file=args.keyfile, cert_file=args.cert,
+ debug=1)
if args.id:
desc = entities_descriptor(eds, valid_for, args.name, args.id,