Merge pull request #267 from lorengordon/feat/update-certs

plus3it · Nov 1, 2024 · 8e42b70 · 8e42b70
2 parents 2f4ed48 + 048c951
commit 8e42b70
Show file tree

Hide file tree

Showing 6 changed files with 415 additions and 397 deletions.
diff --git a/package-templates/spel-dod-certs/DoD_CAs.pem b/package-templates/spel-dod-certs/DoD_CAs.pem
diff --git a/package-templates/spel-dod-certs/README.md b/package-templates/spel-dod-certs/README.md
@@ -15,11 +15,17 @@ Notifications of updates to the bundle go out via the "Tools" RSS feed:
 When a new bundle is published, follow these instructions to update `spel-dod-certs`:
 
 1. Download the new bundle and extract it
-2. Identify the `*pem.p7b` file in the bundle
+2. Identify the `*dod_der.p7b` file in the bundle
 3. Run this command to export the CA certificates to a concatenated PEM file:
+
     ```
-    openssl pkcs7 -in *pem.p7b -print_certs -out DoD_CAs.pem
+    openssl pkcs7 -in *dod_der.p7b -inform der -print_certs -out DoD_CAs.pem
     ```
+
+    NOTE: If the bundle format has changed, the file/command above might need to
+    be updated. Check for a README file in the bundle, and look for a Usage section
+    (or similar).
+
 4. Create a new branch in this project
 5. Replace the `DoD_CAs.pem` file with the new version
 6. Update `spel-dod-certs.spec` with the new version and a changelog entry

diff --git a/package-templates/spel-dod-certs/spel-dod-certs.spec b/package-templates/spel-dod-certs/spel-dod-certs.spec
@@ -1,5 +1,5 @@
 Name:           spel-dod-certs
-Version:        5.12
+Version:        5.13
 Release:        1%{?dist}
 Summary:        Installs and updates DoD CA Certificates
 

diff --git a/package-templates/spel-wcf-certs/README.md b/package-templates/spel-wcf-certs/README.md
@@ -15,11 +15,17 @@ Notifications of updates to the bundle go out via the "Tools" RSS feed:
 When a new bundle is published, follow these instructions to update `spel-wcf-certs`:
 
 1. Download the new bundle and extract it
-2. Identify the `*pem.p7b` file in the bundle
+2. Identify the `*wcf_der.p7b` file in the bundle
 3. Run this command to export the CA certificates to a concatenated PEM file:
+
     ```
-    openssl pkcs7 -in *.pem.p7b -print_certs -out WCF_CAs.pem
+    openssl pkcs7 -in *wcf_der.p7b -inform der -print_certs -out WCF_CAs.pem
     ```
+
+    NOTE: If the bundle format has changed, the file/command above might need to
+    be updated. Check for a README file in the bundle, and look for a Usage section
+    (or similar).
+
 4. Create a new branch in this project
 5. Replace the `WCF_CAs.pem` file with the new version
 6. Update `spel-wcf-certs.spec` with the new version and a changelog entry