ca-certificates: Rebase patch for removing TrustCor root CAs

This is necessary since the certdata2pem.py script does not take
meta information such as "distrust after date" into account, hence
Mozilla's changes to TrustCor's root CAs are not sufficient to have them
removed from or distrusted on IPFire installations.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/src/patches/ca-certificates-Remove-TrustCor-Systems-root-CAs.patch b/src/patches/ca-certificates-Remove-TrustCor-Systems-root-CAs.patch
index 99498a41aad30e4db1d0e4d662801d57322cb0fb..889d5e63a0622dfb7b343631916c232ec6915e1e 100644 (file)
--- a/src/patches/ca-certificates-Remove-TrustCor-Systems-root-CAs.patch
+++ b/src/patches/ca-certificates-Remove-TrustCor-Systems-root-CAs.patch
@@ -1,9 +1,10 @@
---- certdata.txt       2022-12-01 10:23:58.186454756 +0100
-+++ certdata.txt       2022-12-01 10:25:19.587297113 +0100
-@@ -15292,517 +15292,6 @@
+--- certdata.txt
++++ certdata.txt
+@@ -14609,536 +14609,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
  CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
- 
- #
+
+-#
 -# Certificate "TrustCor RootCert CA-1"
 -#
 -# Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA
@@ -120,8 +121,14 @@
 -\132\171\054\031
 -END
 -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
--CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
--CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+-# For Server Distrust After: Wed Nov 30 00:00:00 2022
+-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
+-\062\062\061\061\063\060\060\060\060\060\060\060\132
+-END
+-# For Email Distrust After: Wed Nov 30 00:00:00 2022
+-CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL
+-\062\062\061\061\063\060\060\060\060\060\060\060\132
+-END
 -
 -# Trust for "TrustCor RootCert CA-1"
 -# Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA
@@ -313,8 +320,15 @@
 -\326\354\011
 -END
 -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
--CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
--CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+-# For Server Distrust After: Wed Nov 30 00:00:00 2022
+-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
+-\062\062\061\061\063\060\060\060\060\060\060\060\132
+-END
+-# For Email Distrust After: Wed Nov 30 00:00:00 2022
+-CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL
+-\062\062\061\061\063\060\060\060\060\060\060\060\132
+-END
+-
 -
 -# Trust for "TrustCor RootCert CA-2"
 -# Issuer: CN=TrustCor RootCert CA-2,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA
@@ -471,8 +485,14 @@
 -\264\237\327\346
 -END
 -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
--CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
--CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+-# For Server Distrust After: Wed Nov 30 00:00:00 2022
+-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
+-\062\062\061\061\063\060\060\060\060\060\060\060\132
+-END
+-# For Email Distrust After: Wed Nov 30 00:00:00 2022
+-CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL
+-\062\062\061\061\063\060\060\060\060\060\060\060\132
+-END
 -
 -# Trust for "TrustCor ECA-1"
 -# Issuer: CN=TrustCor ECA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA
@@ -514,7 +534,6 @@
 -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 -
--#
+ #
  # Certificate "SSL.com Root Certification Authority RSA"
  #
- # Issuer: CN=SSL.com Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US