diff --git a/examples/big.xrd b/examples/big.xrd
index 64714274..1841479f 100644
--- a/examples/big.xrd
+++ b/examples/big.xrd
@@ -4,7 +4,7 @@
-
+
@@ -18,18 +18,12 @@
-
-
-
-
-
-
@@ -37,10 +31,10 @@
-
+
-
+
@@ -49,7 +43,7 @@
-
+
@@ -58,25 +52,22 @@
-
-
-
-
+
-
+
-
+
-
+
-
+
@@ -91,9 +82,9 @@
-
+
-
+
diff --git a/examples/edugain.fd b/examples/edugain.fd
index 9281a1b4..51d166f5 100644
--- a/examples/edugain.fd
+++ b/examples/edugain.fd
@@ -1,16 +1,16 @@
- load:
- https://federation.belnet.be/edugain-metadata.xml
- - https://ds.cafe.rnp.br/metadata/edugain-metadata.signed.xml
- - https://login.aaiedu.hr/sso/module.php/aggregator/?id=aaieduhr_edugain&mimetype=application/xml
+ - https://ds.cafe.rnp.br/metadata/edugain/edugain-metadata.signed.xml
+ - https://login.aaiedu.hr/edugain/module.php/aggregator/?id=aaieduhr_edugain
- https://metadata.eduid.cz/entities/eduid2edugain
- https://haka.funet.fi/metadata/edugain-metadata.xml
- https://www.aai.dfn.de/fileadmin/metadata/DFN-AAI-4eduGAIN-metadata.xml
- - http://aai.grnet.gr/edugain-metadata.xml
- - https://metadata.eduid.hu/2011/href-edugain.xml
- - https://www.idem.garr.it/docs/conf/signed-edugain.metadata.xml
- - http://metadata.feide.no/feide-edugain-metadata.xml
+ - http://md.aai.grnet.gr/aggregates/edugain-metadata.xml
+ - https://metadata.eduid.hu/current/href-edugain.xml
+ - http://www.garr.it/idem-metadata/idem2edugain-metadata-sha256.xml
+ - https://metadata.feide.no/feide-edugain-metadata.xml
- https://www.rediris.es/sir/edugain-sir-metadata.xml
- - http://md2.swamid.se/md/swamid-edugain-1.0.xml
+ - https://md.swamid.se/md/swamid-edugain-1.0.xml
- http://metadata.aai.switch.ch/metadata.edugain.xml
- https://wayf.surfnet.nl/federate/surfnet/edugain
- select
diff --git a/examples/expiration.fd b/examples/expiration.fd
index 49f34953..d9871241 100644
--- a/examples/expiration.fd
+++ b/examples/expiration.fd
@@ -1,5 +1,5 @@
- load:
- - http://md.swamid.se/md/swamid-2.0.xml
+ - https://md.swamid.se/md/swamid-2.0.xml
- select
- stats
- certreport
diff --git a/examples/filter-idps.fd b/examples/filter-idps.fd
index 7e2555e9..582b0d23 100644
--- a/examples/filter-idps.fd
+++ b/examples/filter-idps.fd
@@ -1,6 +1,6 @@
- load:
- http://mds.edugain.org examples/edugain.crt
- - http://md.swamid.se/md/swamid-2.0.xml 12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB
+ - https://md.swamid.se/md/swamid-2.0.xml 12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB
- select: "http://mds.edugain.org!md:EntityDescriptor[md:IDPSSODescriptor]"
- xslt:
stylesheet: tidy.xsl
diff --git a/examples/links.xrd b/examples/links.xrd
index ba697d1f..6e4bd1d2 100644
--- a/examples/links.xrd
+++ b/examples/links.xrd
@@ -1,8 +1,8 @@
- http://md.swamid.se/md/swamid-2.0.xml
-
+ https://md.swamid.se/md/swamid-2.0.xml
+
SWAMID
diff --git a/examples/load.fd b/examples/load.fd
index 0724958a..e061bf4e 100644
--- a/examples/load.fd
+++ b/examples/load.fd
@@ -1,36 +1,33 @@
- load:
- https://wayf.aco.net/aconet-metadata.xml
- - http://manager.aaf.edu.au/metadata/metadata.aaf.signed.xml
+ - https://ds.aaf.edu.au/distribution/metadata/metadata.aaf.signed.complete.xml
- http://metadata.aai.switch.ch/metadata.switchaai.xml
- http://www.carsi.edu.cn/carsimetadata/carsifed-metadata.xml
- https://www.aai.dfn.de/fileadmin/metadata/DFN-AAI-metadata.xml
- https://metadata.eduid.cz/entities/eduid
- - https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2
- https://www.rediris.es/sir/shib1metadata.xml
- https://www.rediris.es/sir/shibsir1metadata.xml
- - https://haka.funet.fi/fed/haka-metadata.xml
- https://haka.funet.fi/metadata/haka-metadata.xml
- https://services-federation.renater.fr/metadata/renater-metadata.xml
- - http://aai.grnet.gr/metadata.xml
- - http://metadata.eduid.hu/metadata.xml
+ - https://md.aai.grnet.gr/aggregates/grnet-metadata.xml
+ - https://metadata.eduid.hu/current/href.xml
- http://mds.edugain.org/
- https://edugate.heanet.ie/edugate-metadata-signed.xml
- - https://www.idem.garr.it/docs/conf/signed-metadata.xml
+ - http://www.garr.it/idem-metadata/idem-metadata-sha256.xml
- https://metadata.gakunin.nii.ac.jp/gakunin-metadata.xml
- https://laife.lanet.lv/metadata/laife-metadata.xml
- - http://md.swamid.se/md/swamid-2.0.xml
- - http://md.swamid.se/md/swamid-1.0.xml
- - https://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml
- - http://ds.aai.arnes.si/metadata/aai.arnes.si.signed.xml
+ - https://md.swamid.se/md/swamid-2.0.xml
+ - http://md.incommon.org/InCommon/InCommon-metadata.xml
+ - https://ds.aai.arnes.si/metadata/aai.arnes.si.sha256.xml
- https://directory.tuakiri.ac.nz/metadata/tuakiri-metadata-signed.xml
- - https://caf-shibops.ca/CoreServices/cafshib_metadata_signed.xml
- - http://geant.edugain.org/geant_metadata.xml
+ - https://caf-shib2ops.ca/CoreServices/caf_metadata_signed_sha256.xml
+ - https://prod-idp.geant.org/saml2/idp/metadata.php
- https://federation.belnet.be/federation-metadata.xml
- http://metadata.ukfederation.org.uk/ukfederation-metadata.xml
- https://wayf.surfnet.nl/federate/metadata
- http://shib.kuleuven.be/download/metadata/idp/metadata-kulassoc-sp.xml
- - https://login.aaiedu.hr/sso/module.php/aggregator/?id=aaieduhr_edugain
- - http://metadata.feide.no/feide-edugain-metadata.xml
+ - https://login.aaiedu.hr/edugain/module.php/aggregator/?id=aaieduhr_edugain
+ - https://metadata.feide.no/feide-edugain-metadata.xml
- stats
- select
- store:
diff --git a/examples/met.mdx b/examples/met.mdx
index b34993a5..7914e7f3 100644
--- a/examples/met.mdx
+++ b/examples/met.mdx
@@ -11,22 +11,22 @@
- "https://www.rediris.es/sir/shibsir1metadata.xml"
- "https://haka.funet.fi/metadata/haka-metadata.xml"
- "https://services-federation.renater.fr/metadata/renater-metadata.xml"
- - "http://aai.grnet.gr/metadata.xml"
+ - "https://md.aai.grnet.gr/aggregates/grnet-metadata.xml"
- "http://metadata.eduid.hu/current/href.xml"
- "https://edugate.heanet.ie/edugate-federation-metadata-signed.xml"
- "http://www.garr.it/idem-metadata/idem-metadata-sha256.xml"
- "https://metadata.gakunin.nii.ac.jp/gakunin-metadata.xml"
- "https://laife.lanet.lv/metadata/laife-metadata.xml"
- - "http://md.swamid.se/md/swamid-2.0.xml"
+ - "https://md.swamid.se/md/swamid-2.0.xml"
- "http://md.incommon.org/InCommon/InCommon-metadata.xml"
- - "http://ds.aai.arnes.si/metadata/aai.arnes.si.signed.xml"
+ - "https://ds.aai.arnes.si/metadata/aai.arnes.si.sha256.xml"
- "https://directory.tuakiri.ac.nz/metadata/tuakiri-metadata-signed.xml"
- - "https://caf-shibops.ca/CoreServices/cafshib_metadata_signed.xml"
+ - "https://caf-shib2ops.ca/CoreServices/caf_metadata_signed_sha256.xml"
- "https://federation.belnet.be/federation-metadata.xml"
- "http://metadata.ukfederation.org.uk/ukfederation-metadata.xml"
- "https://engine.surfconext.nl/authentication/proxy/idps-metadata"
- "http://metadata-rctsaai.fccn.pt/metadata/RCTSaai_metadata.xml"
- - "https://login.aaiedu.hr/sso/module.php/aggregator/?id=aaieduhr_edugain"
+ - "https://login.aaiedu.hr/edugain/module.php/aggregator/?id=aaieduhr_edugain"
- "https://metadata.feide.no/feide-edugain-metadata.xml"
- "http://parichay.inflibnet.ac.in/metadata/infed.xml"
- "http://cofre.reuna.cl/metadata/cofre-md.xml"
diff --git a/examples/ndn-links.xrd b/examples/ndn-links.xrd
index 3584c465..e08ea8aa 100644
--- a/examples/ndn-links.xrd
+++ b/examples/ndn-links.xrd
@@ -80,8 +80,8 @@ t4VO/Uc7h6/tveL871eqrETLJKOBSiYajZxhOyJwwrpa/5M=
- http://md.swamid.se/md/swamid-2.0.xml
-
+ https://md.swamid.se/md/swamid-2.0.xml
+
SWAMID
diff --git a/examples/p11.fd b/examples/p11.fd
index afb68f12..2e1eccc1 100644
--- a/examples/p11.fd
+++ b/examples/p11.fd
@@ -1,5 +1,5 @@
- load:
- - http://md.swamid.se/md/swamid-2.0.xml 12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB
+ - https://md.swamid.se/md/swamid-2.0.xml 12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB
- select: "md:EntityDescriptor[md:IDPSSODescriptor]"
- xslt:
stylesheet: tidy.xsl
diff --git a/examples/verify.fd b/examples/verify.fd
index 3771c080..806613af 100644
--- a/examples/verify.fd
+++ b/examples/verify.fd
@@ -1,4 +1,4 @@
- remote:
- - http://md.swamid.se/md/swamid-kalmar-1.0.xml 12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB
+ - http://md.swamid.se/md/swamid-2.0.xml 12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB
- select
- stats