diff options
| author | Ján Jančár | 2025-04-02 13:54:03 +0200 |
|---|---|---|
| committer | GitHub | 2025-04-02 13:54:03 +0200 |
| commit | d350a5f5ed709937dc36df28c054516cd7b00567 (patch) | |
| tree | dbb8cd5ee935b5928feac0b64aed2666a165b5bc | |
| parent | 3bbbbeb1d5dcd88bd99da79b6b0395b6fc3b3a01 (diff) | |
| parent | 72a9729ea604e14f7718a8369da68447e001c5aa (diff) | |
| download | sec-certs-d350a5f5ed709937dc36df28c054516cd7b00567.tar.gz sec-certs-d350a5f5ed709937dc36df28c054516cd7b00567.tar.zst sec-certs-d350a5f5ed709937dc36df28c054516cd7b00567.zip | |
Merge pull request #493 from crocs-muni/feat/better-bsi
Improve BSI cert_id regex.
| -rw-r--r-- | src/sec_certs/rules.yaml | 11 | ||||
| -rw-r--r-- | tests/cc/test_cc_misc.py | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/sec_certs/rules.yaml b/src/sec_certs/rules.yaml index f17eb242..5dec1c1b 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 @@ -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. ##### 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" |