summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--site/mds.swamid.se/HEADER.html6
-rw-r--r--site/test.swamid.se/HEADER.html8
2 files changed, 3 insertions, 11 deletions
diff --git a/site/mds.swamid.se/HEADER.html b/site/mds.swamid.se/HEADER.html
index 0f91981e..078c8652 100644
--- a/site/mds.swamid.se/HEADER.html
+++ b/site/mds.swamid.se/HEADER.html
@@ -20,14 +20,12 @@
</div>
<div class="alert alert-warning">
- <p><i class="glyphicon glyphicon-exclamation-sign"></i>&nbsp;<strong>Warning</strong>&nbsp;The old SWAMID metadata signing key, with metadata located at <a class="alert-link" href="http://md.swamid.se/md/">md.swamid.se</a>, will expire on May 1st 2017. After that the metadata signed with the old key will be unusable. The new signing key and the metadata signed by it is located here at mds.swamid.se. You should update your metadata clients to reflect new metadata URLs and signing key as soon as possible.</p>
+ <p><i class="glyphicon glyphicon-exclamation-sign"></i>&nbsp;<strong>Warning</strong>&nbsp;The old SWAMID metadata signing key, with metadata located at md.swamid.se, expired on May 1st 2017. The metadata signed with the old key is now unusable. The new signing key and the metadata signed by it is located here at mds.swamid.se.</p>
</div>
<h2>Signing Key</h2>
-<p>Old SWAMID metadata is signed with the key found in <a href="http://md.swamid.se/md/md-signer.crt">md-signer.crt</a> which has SHA1 fingerprint <pre>12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB</pre></p>
-
-<p>New SWAMID metadata (not yet public) is signed with the key found in <a href="md-signer2.crt">md-signer2.crt</a> which has SHA256 fingerprint <pre>A6:78:5A:37:C9:C9:0C:25:AD:5F:1F:69:22:EF:76:7B:C9:78:67:67:3A:AF:4F:8B:EA:A1:A7:6D:A3:A8:E5:85</pre></p>
+<p>The SWAMID metadata is signed with the key found in <a href="md-signer2.crt">md-signer2.crt</a> which has SHA256 fingerprint <pre>A6:78:5A:37:C9:C9:0C:25:AD:5F:1F:69:22:EF:76:7B:C9:78:67:67:3A:AF:4F:8B:EA:A1:A7:6D:A3:A8:E5:85</pre></p>
<h2>Production Metadata</h2>
<p>
diff --git a/site/test.swamid.se/HEADER.html b/site/test.swamid.se/HEADER.html
index ff3ca050..625022dd 100644
--- a/site/test.swamid.se/HEADER.html
+++ b/site/test.swamid.se/HEADER.html
@@ -20,18 +20,12 @@
</div>
<div class="alert alert-warning">
- <p><i class="glyphicon glyphicon-exclamation-sign"></i>&nbsp;<strong>Warning</strong>&nbsp;The SWAMID metadata signing key will expire on May 1st 2017. A new key will be generated on December 6th 2016. Shortly after, a new set of metadata feeds signed with the new key will be made available. You should update your metadata clients to reflect new metadata URLs and signing key as soon as possible thereafter.</p>
- </div>
-
- <div class="alert alert-warning">
<p><i class="glyphicon glyphicon-exclamation-sign"></i>&nbsp;<strong>Warning</strong>&nbsp;This site is used to do QA on the SWAMID metadata itself - this is not the swamid-testing feed which is found at https://mds.swamid.se/md/swamid-testing-1.0.xml. This site is used to QA and test changes on the SWAMID metadata such as new signing algorithms etc. Do not use this in production. Instead use metadata from http://mds.swamid.se/md/</p>
</div>
<h2>Signing Key</h2>
-<p>Old SWAMID metadata is signed with the key found in <a href="http://md.swamid.se/md/md-signer.crt">md-signer.crt</a> which has SHA1 fingerprint <pre>12:60:D7:09:6A:D9:C1:43:AD:31:88:14:3C:A8:C4:B7:33:8A:4F:CB</pre></p>
-
-<p>New SWAMID metadata (not yet public) is signed with the key found in <a href="md-signer2.crt">md-signer2.crt</a> which has SHA256 fingerprint <pre>A6:78:5A:37:C9:C9:0C:25:AD:5F:1F:69:22:EF:76:7B:C9:78:67:67:3A:AF:4F:8B:EA:A1:A7:6D:A3:A8:E5:85</pre></p>
+<p>The SWAMID metadata is signed with the key found in <a href="md-signer2.crt">md-signer2.crt</a> which has SHA256 fingerprint <pre>A6:78:5A:37:C9:C9:0C:25:AD:5F:1F:69:22:EF:76:7B:C9:78:67:67:3A:AF:4F:8B:EA:A1:A7:6D:A3:A8:E5:85</pre></p>
<h2>Production Metadata</h2>
<p>