From 8bd0f8fa6f87904fa67f4673ea9e752bc0a7bdde Mon Sep 17 00:00:00 2001
From: J08nY
Date: Fri, 23 Sep 2022 15:58:32 +0200
Subject: Fix Japan canonicalízation.

---
 sec_certs/sample/cc_certificate_id.py | 1 +
 tests/test_cc_heuristics.py           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sec_certs/sample/cc_certificate_id.py b/sec_certs/sample/cc_certificate_id.py
index d491c9a3..20731383 100644
--- a/sec_certs/sample/cc_certificate_id.py
+++ b/sec_certs/sample/cc_certificate_id.py
@@ -107,6 +107,7 @@ class CertificateId:
             return match.group(1)
         if match := re.search("CRP-(C[0-9]+)-", new_cert_id):
             return match.group(1)
+        return new_cert_id
 
     def _canonical_no(self):
         new_cert_id = self.clean
diff --git a/tests/test_cc_heuristics.py b/tests/test_cc_heuristics.py
index e5352552..fcaf4642 100644
--- a/tests/test_cc_heuristics.py
+++ b/tests/test_cc_heuristics.py
@@ -368,6 +368,7 @@ class TestCommonCriteriaID(TestCase):
     def test_canonicalize_jp(self):
         self.assertEqual(canonicalize("Certification No. C01234", "JP"), "C01234")
         self.assertEqual(canonicalize("CRP-C01234-01", "JP"), "C01234")
+        self.assertEqual(canonicalize("JISEC-CC-CRP-C0689-01-2020", "JP"), "C0689")
 
     def test_canonicalize_no(self):
         self.assertEqual(canonicalize("SERTIT-12", "NO"), "SERTIT-012")
-- 
cgit v1.3.1