Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/saml2/xmldsig/__init__.py

1 files changed, 7 insertions, 0 deletions

diff --git a/src/saml2/metadata.py b/src/saml2/metadata.py
index 4a85ccfe..ae5979d9 100644
--- a/src/saml2/metadata.py
+++ b/src/saml2/metadata.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from saml2.algsupport import algorithm_support_in_metadata
 from saml2.md import AttributeProfile
 from saml2.sigver import security_context
 from saml2.config import Config
@@ -728,6 +729,12 @@ def entity_descriptor(confd):
         item = mdattr.EntityAttributes(attribute=attr)
         entd.extensions.add_extension_element(item)
 
+    if not entd.extensions:
+        entd.extensions = md.Extensions()
+
+    for item in algorithm_support_in_metadata(confd.xmlsec_binary):
+        entd.extensions.add_extension_element(item)
+
     serves = confd.serves
     if not serves:
         raise SAMLError(