From 7aacee686f4a2714d9e230bfdf20c79c21c6f461 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Tue, 1 Apr 2025 16:39:13 +0200
Subject: Improve BSI cert_id regex.

---
 src/sec_certs/rules.yaml | 2 +-
 tests/cc/test_cc_misc.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sec_certs/rules.yaml b/src/sec_certs/rules.yaml
index f17eb242..bf7af391 100644
--- a/src/sec_certs/rules.yaml
+++ b/src/sec_certs/rules.yaml
@@ -5,7 +5,7 @@
 #####
 cc_cert_id:
   DE:
-    - "BSI-DSZ-CC-(?:(?P<s>S)-)?(?P<counter>[0-9]{3,5})-?(?:(?P<version>[vV][0-9])-)?(?P<year>[0-9]{4})?(?:-(?P<doc>(?:RA|MA)(?:-[0-9]+)?))?"
+    - "BSI[-_]DSZ[-_]CC[-_](?:(?P<s>S)[-_])?(?P<counter>[0-9]{3,5})[-_]?(?:(?P<version>[vV][0-9])[-_])?(?P<year>[0-9]{4})?(?:[-_](?P<doc>(?:RA|MA)(?:[-_][0-9]+)?))?"
     # Examples:
     # BSI-DSZ-CC-1004
     # BSI-DSZ-CC-0973-2016
diff --git a/tests/cc/test_cc_misc.py b/tests/cc/test_cc_misc.py
index 2f9dcea7..76c0cdc6 100644
--- a/tests/cc/test_cc_misc.py
+++ b/tests/cc/test_cc_misc.py
@@ -30,6 +30,7 @@ def test_canonicalize_fr(n):
 def test_canonicalize_de(n):
     assert canonicalize_n(n, "BSI-DSZ-CC-0420-2007", "DE") == "BSI-DSZ-CC-0420-2007"
     assert canonicalize_n(n, "BSI-DSZ-CC-1004", "DE") == "BSI-DSZ-CC-1004"
+    assert canonicalize_n(n, "BSI_DSZ_CC_0348_2006", "DE") == "BSI-DSZ-CC-0348-2006"
     assert canonicalize_n(n, "BSI-DSZ-CC-0831-V4-2021", "DE") == "BSI-DSZ-CC-0831-V4-2021"
     assert canonicalize_n(n, "BSI-DSZ-CC-0837-V2-2014-MA-01", "DE") == "BSI-DSZ-CC-0837-V2-2014-MA-01"
 
-- 
cgit v1.3.1


From 72a9729ea604e14f7718a8369da68447e001c5aa Mon Sep 17 00:00:00 2001
From: J08nY
Date: Tue, 1 Apr 2025 16:45:39 +0200
Subject: Generalize a few keywords.

---
 src/sec_certs/rules.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/sec_certs/rules.yaml b/src/sec_certs/rules.yaml
index bf7af391..5dec1c1b 100644
--- a/src/sec_certs/rules.yaml
+++ b/src/sec_certs/rules.yaml
@@ -736,7 +736,7 @@ crypto_scheme:
 #####
 crypto_protocol:
   SSH:
-    - "SSH"
+    - "SSH(v[0-9])?"
   TLS:
     SSL:
       - "SSL( ?v?[123]\\.0)?"
@@ -760,7 +760,7 @@ crypto_protocol:
 #####
 randomness:
   DUAL_EC:
-    - "DUAL_EC_DRBG"
+    - "DUAL[ _]EC[ _]DRBG"
   TRNG:
     - "D?TRNG"
   PRNG:
@@ -841,10 +841,11 @@ crypto_engine:
   TORNADO:
     - "TORNADO"
   SmartMX:
-    - "SmartMX2?"
+    - "SmartMX[0-9]?"
   NexCrypt:
     - "NexCrypt"
-
+  NesCrypt:
+    - "(NESCRYPT|Nescrypt)"
 #####
 # TLS cipher suite name.
 #####
-- 
cgit v1.3.1