summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile31
1 files changed, 14 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 8933a186..ec84845c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ DAYS:=1
DATE=$(shell perl scripts/expiration_date.pl $(DAYS))
RPI=false
CONTACTS=false
+TRANSFORM=xslt/normalize.xsl
XSLTDEFS := --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE)
all: update clean sign clean
@@ -19,24 +20,32 @@ keys: $(KEY) $(CERT)
MXML=$(shell echo *.mxml)
-sign: keys swamid nya nya-testing swamid-testing swamid-testing-idp upstream swamid-ki-sll swamid-fiv-test
+sign: keys swamid nya nya-testing swamid-testing swamid-testing-idp upstream projects swamid-ki-sll
%.sig: %.mxml
- xsltproc $(XSLTDEFS) --xinclude xslt/swamid-sign.xsl $< > $*.tbs
- xmlsec1 --sign --privkey-pem $(KEY),$(CERT) --pwd $(PASS) --output $@ $*.tbs
+ xsltproc $(XSLTDEFS) --xinclude $(TRANSFORM) $< > $*.tbs
+ #xsltproc $(XSLTDEFS) --xinclude xslt/swamid-sign.xsl $< > $*.tbs
+ samlsign -s -c $(CERT) -k $(KEY) -f $*.tbs > $@
+ #xmlsec1 --sign --privkey-pem $(KEY),$(CERT) --pwd $(PASS) --output $@ $*.tbs
xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $@
+ samlsign -c $(CERT) -f $@
rm -f $*.tbs
%.pub: %.sig
- @test -s $< && xmllint --c14n $< > $(DEST)/$*.xml
+ samlsign -c $(CERT) -f $< && xmllint --c14 $< > $(DEST)/$*.xml
+ rm -f $<
upstream: edugain kalmar
-kalmar: swamid-kalmar swamid-kalmar-testing
+kalmar:
+ $(MAKE) RPI=false CONTACTS=false swamid-kalmar-1.0.pub swamid-kalmar-testing-1.0.pub
edugain:
$(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub
+projects:
+ $(MAKE) RPI=false CONTACTS=false swamid-fiv-test.pub
+
swamid-externals: swamid-externals1 swamid-externals2
swamid-externals1:
@@ -112,22 +121,10 @@ swamid-testing-idp:
@saml-md-tool swamid-testing-idp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
@test -s swamid-testing-idp-1.0.xml && cp swamid-testing-idp-1.0.xml $(DEST)
-swamid-kalmar:
- @saml-md-tool swamid-kalmar-1.0 update --days=2 --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
- @test -s swamid-kalmar-1.0.xml && cp swamid-kalmar-1.0.xml $(DEST)
-
-swamid-kalmar-testing:
- @saml-md-tool swamid-kalmar-testing-1.0 update --days=2 --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
- @test -s swamid-kalmar-testing-1.0.xml && cp swamid-kalmar-testing-1.0.xml $(DEST)
-
swamid-ki-sll:
@saml-md-tool swamid-ki-sll-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
@test -s swamid-ki-sll-1.0.xml && cp swamid-ki-sll-1.0.xml $(DEST)
-swamid-fiv-test:
- @saml-md-tool swamid-fiv-test update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
- @test -s swamid-fiv-test.xml && cp swamid-fiv-test.xml $(DEST)
-
test: swamid2-deps
@for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x; done