From a096f7ed6c4637dc700bd53df2d110bb8a428394 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sat, 3 Feb 2024 18:45:46 +0100
Subject: Improve UK rules.

---
 src/sec_certs/sample/cc_certificate_id.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/sec_certs/sample')

diff --git a/src/sec_certs/sample/cc_certificate_id.py b/src/sec_certs/sample/cc_certificate_id.py
index fe362b99..5ec168ee 100644
--- a/src/sec_certs/sample/cc_certificate_id.py
+++ b/src/sec_certs/sample/cc_certificate_id.py
@@ -133,8 +133,12 @@ class CertificateId:
 
     def _canonical_uk(self):
         new_cert_id = self.clean
-        if match := re.match("CERTIFICATION REPORT No. P([0-9]+[A-Z]?)", new_cert_id):
-            new_cert_id = "CRP" + match.group(1)
+        for rule in rules["cc_cert_id"]["UK"]:
+            if match := re.match(rule, new_cert_id):
+                groups = match.groupdict()
+                counter = groups["counter"]
+                new_cert_id = f"CRP{counter}"
+                break
         return new_cert_id
 
     def _canonical_ca(self):
-- 
cgit v1.3.1