From d5ed21bd9d6e0625e7716c2b005a2c35a6042edd Mon Sep 17 00:00:00 2001 From: SteveSamJacob19 Date: Mon, 29 Jan 2024 20:43:29 +0530 Subject: [PATCH] Combined lib cert and pub key --- src/main/content/_assets/js/builds.js | 11 ++++++++++- src/main/content/_i18n/en.yml | 2 +- src/main/content/_i18n/ja.yml | 2 +- src/main/content/_i18n/zh-Hans.yml | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/content/_assets/js/builds.js b/src/main/content/_assets/js/builds.js index 965637a1b5..0976f7a7a0 100644 --- a/src/main/content/_assets/js/builds.js +++ b/src/main/content/_assets/js/builds.js @@ -127,16 +127,25 @@ function getPublicKeyURL(liberty_version) { var liberty_versions_using_2021_pem = ["22.0.0.1", "22.0.0.2", "22.0.0.3", "22.0.0.4", "22.0.0.5", "22.0.0.6", "22.0.0.7", "22.0.0.8", "22.0.0.9", "22.0.0.10", "22.0.0.11", "22.0.0.12", "22.0.0.13", "23.0.0.1"]; + var liberty_versions_using_2023_pem = ["23.0.0.2", "23.0.0.3", "23.0.0.4", "23.0.0.5", "23.0.0.6", + "23.0.0.7", "23.0.0.8", "23.0.0.9", "23.0.0.10", "23.0.0.11", "23.0.0.12"]; + + var pem_2021_href = "https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/sign/public_keys/WebSphereLiberty_06-02-2021.pem"; var pem_2023_href = "https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/sign/public_keys/OpenLiberty_02-13-2023.pem"; + var pem_2024_href = + "https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/sign/public_keys/OpenLiberty_02-13-2023.pem.cer"; + if(liberty_versions_using_2021_pem.indexOf(liberty_version) > -1) { return pem_2021_href; - } else { + } else if(liberty_versions_using_2023_pem.indexOf(liberty_version) > -1) { return pem_2023_href; + } else { + return pem_2024_href; } } diff --git a/src/main/content/_i18n/en.yml b/src/main/content/_i18n/en.yml index 647417e827..0b74487301 100644 --- a/src/main/content/_i18n/en.yml +++ b/src/main/content/_i18n/en.yml @@ -132,7 +132,7 @@ start: tests: Tests logs: Logs releases_content1: New releases will be announced on the Open Liberty - releases_content2: In version 22.0.0.1 and later, to verify the authenticity and integrity of an Open Liberty release package, use the provided signature file (SIG) and public key (PEM). + releases_content2: In version 22.0.0.1 and later, to verify the authenticity and integrity of an Open Liberty release package, use the provided signature (SIG) and certificate (CER) files. For more information, see Verifying Open Liberty release packages. more_information: For more information, see verify_oio_release_packages: Verifying Open Liberty release packages. beta_content1: Try out new features in our betas and let us know diff --git a/src/main/content/_i18n/ja.yml b/src/main/content/_i18n/ja.yml index 57e0e1ec85..aadbe7383f 100644 --- a/src/main/content/_i18n/ja.yml +++ b/src/main/content/_i18n/ja.yml @@ -132,7 +132,7 @@ start: tests: Tests logs: Logs releases_content1: New releases will be announced on the Open Liberty - releases_content2: In version 22.0.0.1 and later, to verify the authenticity and integrity of an Open Liberty release package, use the provided signature file (SIG) and + releases_content2: In version 22.0.0.1 and later, to verify the authenticity and integrity of an Open Liberty release package, use the provided signature (SIG) and certificate (CER) files. For more information, see Verifying Open Liberty release packages. more_information: For more information, see verify_oio_release_packages: Verifying Open Liberty release packages. beta_content1: Try out new features in our betas and let us know diff --git a/src/main/content/_i18n/zh-Hans.yml b/src/main/content/_i18n/zh-Hans.yml index eff10dc080..9f66918567 100644 --- a/src/main/content/_i18n/zh-Hans.yml +++ b/src/main/content/_i18n/zh-Hans.yml @@ -132,7 +132,7 @@ start: tests: Tests logs: Logs releases_content1: New releases will be announced on the Open Liberty - releases_content2: In version 22.0.0.1 and later, to verify the authenticity and integrity of an Open Liberty release package, use the provided signature file (SIG) and + releases_content2: In version 22.0.0.1 and later, to verify the authenticity and integrity of an Open Liberty release package, use the provided signature (SIG) and certificate (CER) files. For more information, see Verifying Open Liberty release packages. more_information: For more information, see verify_oio_release_packages: Verifying Open Liberty release packages. beta_content1: Try out new features in our betas and let us know