aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGeogeFI2022-04-21 08:18:29 +0200
committerGeogeFI2022-04-21 08:18:29 +0200
commit2894c9dacda0e2cdb5064f347ec973415814d201 (patch)
tree8b2a2933ad254ef999799cd1281fac326ea4d06b
parent891a5fbd527c26cdbc0749e5044eef87a4508b8f (diff)
downloadsec-certs-2894c9dacda0e2cdb5064f347ec973415814d201.tar.gz
sec-certs-2894c9dacda0e2cdb5064f347ec973415814d201.tar.zst
sec-certs-2894c9dacda0e2cdb5064f347ec973415814d201.zip
feat: Updated cert rules from old-api branch
-rw-r--r--sec_certs/cert_rules.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/sec_certs/cert_rules.py b/sec_certs/cert_rules.py
index ba0a28d8..27cd1a06 100644
--- a/sec_certs/cert_rules.py
+++ b/sec_certs/cert_rules.py
@@ -42,10 +42,12 @@ rules_cert_id = [
"CRP-C[0-9]+?-[0-9]+?", # Japan
"(?:CRP|ACR)-C[0-9]+-[0-9]+", # Japan (CRP-C0595-01 ACR-C0417-03)
"JISEC-CC-CRP-C[0-9]+-[0-9]+-[0-9]+", # Japan (JISEC-CC-CRP-C0689-01-2020)
+ "Certification No. C[0-9]+" # Japan (Certification No. C0090)
"ISCB-[0-9]+?-RPT-[0-9]+?", # Malaysia
- "ISCB-[0-9]+-(?:RPT|FRM)-[CM][0-9]+[A-Z]?-(?:CR|AMR)-[vV][0-9][a-z]?", # Malaysia (ISCB-3-RPT-C092-CR-v1)
+ # Malaysia (ISCB-3-RPT-C092-CR-v1, ISCB-3-RPT-C068-CR-1-v1)
+ "ISCB-[0-9]+-(?:RPT|FRM)-[CM][0-9]+[A-Z]?-(?:CR|AMR)(?:-[0-9]|)-[vV][0-9][a-z]?"
"OCSI/CERT/.+?", # Italia
- "OCSI/CERT/.+?/20[0-9]+(?:/w|/RC)", # Italia (OCSI/CERT/ATS/01/2018/RC)
+ "OCSI/CERT/.+?/20[0-9]+(?:\w|/RC)", # Italia (OCSI/CERT/ATS/01/2018/RC)
"[0-9\\.]+?/TSE-CCCS-[0-9]+", # Turkis CCCS (21.0.0sc/TSE-CCCS-75)
"CSEC[0-9]+", # Sweden (CSEC2019015)
# India (IC3S/DEL01/VALIANT/EAL1/0317/0007/CR STQC/CC/14-15/12/ETR/0017 IC3S/MUM01/CISCO/cPP/0119/0016/CR)
@@ -53,6 +55,12 @@ rules_cert_id = [
"(?:IC3S|STQC/CC)/[^ ]+?/CR ", # must end with CR, no space inside
"CSA_CC_[0-9]+", # Singapure (CSA_CC_19001)
"[0-9][0-9][0-9]-[47]-[0-9][0-9][0-9](-CR)*", # Canada xxx-{47}-xxx (383-4-438, 383-4-82-CR)
+ "[0-9][0-9][0-9](?: |-)(?:EWA|LSS)(?: |-)20[0-9][0-9]", # Canada (522-EWA-2020, 524 LSS 2020)
+ # Canada filename with space (518-LSS%20CR%20v1.0)
+ "[0-9][0-9][0-9](?:%20|-)(?:EWA|LSS|CCS)(?:%20|-)(?:20[0-9][0-9]%20|)CR%20v[0-9]\.[0-9]",
+
+ # 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]+",
]
rules_vendor = [