From 33e9bfac0798df8d9b89477627d4ba09e83c3e23 Mon Sep 17 00:00:00 2001
From: Sofia Boldyreva <mooresofia81@gmail.com>
Date: Fri, 14 Feb 2025 12:39:03 +0100
Subject: [PATCH] Updating/placing footnotes for expired keys

---
 i18n/en.json                 |  4 +++-
 layouts/security/single.html | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 2132f4d..4a9cfe5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -821,5 +821,7 @@
    "Annual service credits or hardware donations valued at $20,000 or more": "Annual service credits or hardware donations valued at $20,000 or more",
    "The enterprise linux ecosystem is a very large and diverse community, and we have developed this project in good faith as members of that ecosystem.": "The enterprise linux ecosystem is a very large and diverse community, and we have developed this project in good faith as members of that ecosystem.",
    "AlmaLinux OS 9.2 is FIPS 140-3 validated and on the NIST Active list. Read more in this blog post: ": "AlmaLinux OS 9.2 is FIPS 140-3 validated and on the NIST Active list. Read more in this blog post: ",
-   "AlmaLinux 9.2 FIPS Validation Update": "AlmaLinux 9.2 FIPS Validation Update"
+   "AlmaLinux 9.2 FIPS Validation Update": "AlmaLinux 9.2 FIPS Validation Update",
+   "Expired but remains a trusted key.": "Expired but remains a trusted key.",
+   "Expired:": "Expired:"
 }
\ No newline at end of file
diff --git a/layouts/security/single.html b/layouts/security/single.html
index 220e465..e7c7041 100644
--- a/layouts/security/single.html
+++ b/layouts/security/single.html
@@ -115,7 +115,7 @@
                 <div class="itemAl_02" style="padding-left: 20px; display: flex; flex-direction: column;">
                   <div class="wrapper" style="display: flex;">
                     <h3>AlmaLinux OS 8 #1</h3>
-                    <p class="walid_date" style="margin-top: 17px; font-size: 11px; font-weight: 700;">* Valid until January 12, 2024 - <a href="https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/">blog post</a></p>
+                    <p class="valid_date" style="margin-top: 17px; font-size: 11px; font-weight: 700;">* {{ i18n "Expired but remains a trusted key." }}</p>
                   </div>
                   <span><b>rsa4096/488FCF7C3ABB34F8 (2021-01-12):</b></span>
                   <span>AlmaLinux &lt;packager@almalinux.org&gt;</span>
@@ -218,16 +218,22 @@
               </p>
               <div class="AL" style="display: flex; justify-content: space-between">
                 <div class="itemAl_01" style="display: flex; flex-direction: column;">
-                  <h3><a href="https://git.almalinux.org/rpms/shim-unsigned-x64/raw/branch/a8/SOURCES/almalinux-sb-cert-1.der">almalinux-sb-cert-1.der</a></h3>
+                  <div class="wrapper" style="display: flex;">
+                    <h3><a href="https://git.almalinux.org/rpms/shim-unsigned-x64/raw/branch/a8/SOURCES/almalinux-sb-cert-1.der">almalinux-sb-cert-1.der</a></h3>
+                    <p class="valid_date" style="margin-top: 17px; font-size: 11px; font-weight: 700;">* Expired but remains a trusted key.</p>
+                  </div>
                   <span><b>{{ i18n "Signed for:" }}</b> AlmaLinux OS Foundation</span>
                   <span><b>{{ i18n "Verified by:" }}</b> Sectigo Public Code Signing CA EV R36</span>
-                  <span><b>{{ i18n "Expires:" }}</b> 30.01.2025</span>
+                  <span><b>{{ i18n "Expired:" }}</b> 30.01.2025</span>
                 </div>
                 <div class="itemAl_02" style="display: flex; flex-direction: column;">
-                  <h3><a href="https://git.almalinux.org/rpms/shim-unsigned-x64/raw/branch/a8/SOURCES/almalinux-sb-cert-2.der">almalinux-sb-cert-2.der</a></h3>
+                  <div class="wrapper" style="display: flex;">
+                    <h3><a href="https://git.almalinux.org/rpms/shim-unsigned-x64/raw/branch/a8/SOURCES/almalinux-sb-cert-2.der">almalinux-sb-cert-2.der</a></h3>
+                    <p class="valid_date" style="margin-top: 17px; font-size: 11px; font-weight: 700;">* Expired but remains a trusted key.</p>
+                  </div>
                   <span><b>{{ i18n "Signed for:" }}</b> AlmaLinux OS Foundation</span>
                   <span><b>{{ i18n "Verified by:" }}</b> SSL.com EV Code Signing Intermediate CA RSA</span>
-                  <span><b>{{ i18n "Expires:" }}</b> 19.01.2025</span>
+                  <span><b>{{ i18n "Expired:" }}</b> 19.01.2025</span>
                 </div>
                 <div class="itemAl_03" style="display: flex; flex-direction: column;">
                   <h3><a href="https://git.almalinux.org/rpms/shim-unsigned-x64/raw/branch/a8/SOURCES/almalinux-sb-cert-3.der">almalinux-sb-cert-3.der</a></h3>