summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-10-23 14:17:57 +0200
committerLeif Johansson <leifj@sunet.se>2015-10-23 14:17:57 +0200
commitacf78be9a6260df9737a475da3d63bc334ef6dac (patch)
tree2401ae4d518ce84de2664bfa44a36cf05868c401
parent66a18b1f8f1e8e6f832a89d5d5a450610fcf9c2f (diff)
fix validation issues
-rw-r--r--Makefile2
-rw-r--r--schema.xsd1
-rw-r--r--xslt/sign.xsl3
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2e09f6cb..021cd996 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ ORG=true
TRANSFORM=xslt/normalize.xsl
ID=$(shell perl scripts/unique_id.pl)
XSLTDEFS := --stringparam org $(ORG) --stringparam ID $(ID) --stringparam tou $(TOU) --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE)
-SIGNER := xmlsec1 --sign --privkey-pem $(KEY),$(CERT) --pwd $(PASS)
+SIGNER := xmlsec1 --sign --privkey-pem $(KEY),$(CERT) --pwd $(PASS) --id-attr:ID urn:oasis:names:tc:SAML:2.0:metadata:EntitiesDescriptor
-include local.mk
diff --git a/schema.xsd b/schema.xsd
index 2cf3b8fb..20882b95 100644
--- a/schema.xsd
+++ b/schema.xsd
@@ -16,4 +16,5 @@
<import namespace="urn:oasis:names:tc:SAML:metadata:attribute" schemaLocation="sstc-metadata-attr.xsd"/>
<import namespace="urn:oasis:names:tc:SAML:metadata:algsupport" schemaLocation="sstc-saml-metadata-algsupport.xsd"/>
<import namespace="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" schemaLocation="sstc-saml-idp-discovery.xsd"/>
+<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
</schema>
diff --git a/xslt/sign.xsl b/xslt/sign.xsl
index c0e04ab5..51d2492a 100644
--- a/xslt/sign.xsl
+++ b/xslt/sign.xsl
@@ -3,6 +3,7 @@
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:exsl="http://exslt.org/common"
xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
@@ -22,7 +23,7 @@
<xsl:attribute name="URI"><xsl:text>#</xsl:text><xsl:value-of select="@ID"/></xsl:attribute>
<ds:Transforms>
<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
- <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
+ <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</ds:Transforms>
<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<ds:DigestValue></ds:DigestValue>