aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--certs/Cloudflare-Inc-ECC-CA-3.pem (renamed from certs/Cloudflare Inc ECC CA-3.pem)0
-rw-r--r--certs/DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1.pem (renamed from certs/DigiCert Global G2 TLS RSA SHA256 2020 CA1.pem)0
-rw-r--r--certs/DigiCert-TLS-Hybrid-ECC-SHA384-2020-CA1.pem (renamed from certs/DigiCert TLS Hybrid ECC SHA384 2020 CA1.pem)0
-rw-r--r--certs/GTS-CA-1C3.pem (renamed from certs/GTS CA 1C3.pem)0
-rw-r--r--certs/GTS-CA-1P5.pem (renamed from certs/GTS CA 1P5.pem)0
-rw-r--r--certs/GlobalSign-Atlas-R3-DV-TLS-CA-2022-Q3.pem (renamed from certs/GlobalSign Atlas R3 DV TLS CA 2022 Q3.pem)0
-rw-r--r--certs/Go-Daddy-Secure-Certificate-Authority-G2.pem (renamed from certs/Go Daddy Secure Certificate Authority - G2.pem)0
-rw-r--r--certs/Starfield-Secure-Certificate-Authority-G2.pem (renamed from certs/Starfield Secure Certificate Authority - G2.pem)0
-rw-r--r--global-functions.rsc17
9 files changed, 8 insertions, 9 deletions
diff --git a/certs/Cloudflare Inc ECC CA-3.pem b/certs/Cloudflare-Inc-ECC-CA-3.pem
index fa91603..fa91603 100644
--- a/certs/Cloudflare Inc ECC CA-3.pem
+++ b/certs/Cloudflare-Inc-ECC-CA-3.pem
diff --git a/certs/DigiCert Global G2 TLS RSA SHA256 2020 CA1.pem b/certs/DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1.pem
index 12084ee..12084ee 100644
--- a/certs/DigiCert Global G2 TLS RSA SHA256 2020 CA1.pem
+++ b/certs/DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1.pem
diff --git a/certs/DigiCert TLS Hybrid ECC SHA384 2020 CA1.pem b/certs/DigiCert-TLS-Hybrid-ECC-SHA384-2020-CA1.pem
index 446f56f..446f56f 100644
--- a/certs/DigiCert TLS Hybrid ECC SHA384 2020 CA1.pem
+++ b/certs/DigiCert-TLS-Hybrid-ECC-SHA384-2020-CA1.pem
diff --git a/certs/GTS CA 1C3.pem b/certs/GTS-CA-1C3.pem
index a8432d2..a8432d2 100644
--- a/certs/GTS CA 1C3.pem
+++ b/certs/GTS-CA-1C3.pem
diff --git a/certs/GTS CA 1P5.pem b/certs/GTS-CA-1P5.pem
index 5be738d..5be738d 100644
--- a/certs/GTS CA 1P5.pem
+++ b/certs/GTS-CA-1P5.pem
diff --git a/certs/GlobalSign Atlas R3 DV TLS CA 2022 Q3.pem b/certs/GlobalSign-Atlas-R3-DV-TLS-CA-2022-Q3.pem
index b514c11..b514c11 100644
--- a/certs/GlobalSign Atlas R3 DV TLS CA 2022 Q3.pem
+++ b/certs/GlobalSign-Atlas-R3-DV-TLS-CA-2022-Q3.pem
diff --git a/certs/Go Daddy Secure Certificate Authority - G2.pem b/certs/Go-Daddy-Secure-Certificate-Authority-G2.pem
index 4faba90..4faba90 100644
--- a/certs/Go Daddy Secure Certificate Authority - G2.pem
+++ b/certs/Go-Daddy-Secure-Certificate-Authority-G2.pem
diff --git a/certs/Starfield Secure Certificate Authority - G2.pem b/certs/Starfield-Secure-Certificate-Authority-G2.pem
index 7772e6b..7772e6b 100644
--- a/certs/Starfield Secure Certificate Authority - G2.pem
+++ b/certs/Starfield-Secure-Certificate-Authority-G2.pem
diff --git a/global-functions.rsc b/global-functions.rsc
index 8df70f1..ca238ba 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -136,25 +136,24 @@
:global ScriptUpdatesUrlSuffix;
:global CertificateNameByCN;
+ :global CleanName;
:global FetchUserAgent;
:global LogPrint;
- :global UrlEncode;
:global WaitForFile;
$LogPrint info $0 ("Downloading and importing certificate with " . \
"CommonName \"" . $CommonName . "\".");
:do {
- :local LocalFileName ($CommonName . ".pem");
- :local UrlFileName ([ $UrlEncode $CommonName ] . ".pem");
+ :local FileName ([ $CleanName $CommonName ] . ".pem");
/tool/fetch check-certificate=yes-without-crl http-header-field=({ [ $FetchUserAgent $0 ] }) \
- ($ScriptUpdatesBaseUrl . "certs/" . $UrlFileName . $ScriptUpdatesUrlSuffix) \
- dst-path=$LocalFileName as-value;
- $WaitForFile $LocalFileName;
- /certificate/import file-name=$LocalFileName passphrase="" as-value;
+ ($ScriptUpdatesBaseUrl . "certs/" . $FileName . $ScriptUpdatesUrlSuffix) \
+ dst-path=$FileName as-value;
+ $WaitForFile $FileName;
+ /certificate/import file-name=$FileName passphrase="" as-value;
:delay 1s;
- /file/remove $LocalFileName;
+ /file/remove $FileName;
- :foreach Cert in=[ /certificate/find where name~("^" . $LocalFileName . "_[0-9]+\$") ] do={
+ :foreach Cert in=[ /certificate/find where name~("^" . $FileName . "_[0-9]+\$") ] do={
$CertificateNameByCN [ /certificate/get $Cert common-name ];
}
} on-error={