aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJ08nY2022-09-05 14:54:27 +0200
committerJ08nY2022-09-19 14:48:58 +0200
commitfcbc18305d77639fd89ce8e1c50dec8a22b6030c (patch)
treefd0cbea2c121a90dab8eb71272d3c6fa4e12c051
parent7960059c41c18e347d49e9cf992594ce1c5ffb70 (diff)
downloadsec-certs-fcbc18305d77639fd89ce8e1c50dec8a22b6030c.tar.gz
sec-certs-fcbc18305d77639fd89ce8e1c50dec8a22b6030c.tar.zst
sec-certs-fcbc18305d77639fd89ce8e1c50dec8a22b6030c.zip
Fixup cert_id rules.
-rw-r--r--sec_certs/rules.yaml12
1 files changed, 7 insertions, 5 deletions
diff --git a/sec_certs/rules.yaml b/sec_certs/rules.yaml
index 5d9fb9ce..a5abd389 100644
--- a/sec_certs/rules.yaml
+++ b/sec_certs/rules.yaml
@@ -35,16 +35,17 @@ cc_cert_id:
CA:
# '[0-9][0-9\-]+?-CR', # Canada
- "[0-9][0-9][0-9]-[347]-[0-9][0-9][0-9]?(?:-CR|P)?" # Canada xxx-{347}-xxx (383-4-438, 383-4-82-CR, 383-4-422P)
- - "[0-9][0-9][0-9][ -](?:EWA|LSS)(?:[ -]20[0-9][0-9])?" # Canada (522-EWA-2020, 524 LSS 2020, 503-LSS)
+ - "[0-9][0-9][0-9][ -](?:EWA|LSS|CCS)(?:[ -]20[0-9][0-9])?" # Canada (522-EWA-2020, 524 LSS 2020, 503-LSS)
- "[0-9][0-9][0-9](?:%20|-)(?:EWA|LSS|CCS)(?:%20|-)(?:20[0-9][0-9]%20|)CR%20v[0-9]\\.[0-9]" # Canada filename with space (518-LSS%20CR%20v1.0)
UK:
- "CRP[0-9]+" # UK CESG
- - "CRP[0-9][0-9][0-9][0-9]*?" # UK CESG
- "CERTIFICATION REPORT No. P[0-9]+" # UK CESG
ES:
- "20[0-9][0-9][-‐][0-9]+[-‐]INF[-‐][0-9]+([-‐]?[ -‐](?:V|v)[0-9]+)?" # Spain ("2006-4-INF-98 v2" or "2006-4-INF-98-v2" or "2020-34-INF-3784- v1")
KR:
- - "KECS[-‐]CR[-‐][0-9]+[-‐][0-9]+" # Korea KECS-CR-20-61
+ # Korea
+ # XXX: Do not use KECS-CR as those refer to the certificate report and do not represent the certificate id.
+ # - "KECS[-‐]CR[-‐][0-9]+[-‐][0-9]+" # Korea KECS-CR-20-61
- "KECS[-‐](?:ISIS|NISS|CISS)[-‐][0-9]+[-‐][0-9]{4}" # Korea KECS-ISIS-1234-2011
JP:
- "CRP-C[0-9]+?-[0-9]+?" # Japan
@@ -64,12 +65,13 @@ cc_cert_id:
IN:
# India (IC3S/DEL01/VALIANT/EAL1/0317/0007/CR STQC/CC/14-15/12/ETR/0017 IC3S/MUM01/CISCO/cPP/0119/0016/CR)
# will miss STQC/CC/14-15/12/ETR/0017
- - "(?:IC3S|STQC/CC)/[^ ]+?/CR"
+ - "(?:IC3S|STQC/CC)/[^ ]+? ?/CR"
SG:
- "CSA_CC_[0-9]+" # Singapore (CSA_CC_19001)
AU:
# Australia (EFS-T048 ETR 1.0, EFS-T056-ETR 1.0, DXC-EFC-T092-ETR 1.0)
- - "(?:EFS|EFT|DXC-EFC)-T[0-9]+(?: |-)ETR [0-9]+.[0-9]+"
+ # XXX: Do not use Australian ETR numbers, they are not certificate id.
+ # - "(?:EFS|EFT|DXC-EFC)-T[0-9]+(?: |-)ETR [0-9]+.[0-9]+"
- "Certificate Number: [0-9]{1,4}/[0-9]{1,4}"
#####