Fix CC schema validation tests.

4 files changed, 13 insertions, 11 deletions

diff --git a/src/sec_certs/serialization/schemas/cc_certificate.json b/src/sec_certs/serialization/schemas/cc_certificate.json
index ec34cdf5..750b4a00 100644
--- a/src/sec_certs/serialization/schemas/cc_certificate.json
+++ b/src/sec_certs/serialization/schemas/cc_certificate.json
@@ -12,7 +12,7 @@
       "description": "A hex string representing 8 bytes."
     },
     "cc_id": {
-      "type": "string",
+      "type": ["string", "null"],
       "title": "Certificate ID",
       "description": "The unique identifier of the Common Criteria certificate."
     },
@@ -58,7 +58,10 @@
       "description": "State of the document processing pipeline for cert, report, or st document."
     },
     "cc_document_metadata": {
-      "type": "object",
+      "type": [
+        "object",
+        "null"
+      ],
       "properties": {
         "pdf_file_size_bytes": {
           "type": "integer"
@@ -217,7 +220,10 @@
       "additionalProperties": false
     },
     "cc_document_keywords": {
-      "type": "object",
+      "type": [
+        "object",
+        "null"
+      ],
       "additionalProperties": true,
       "title": "Certificate Document Keywords",
       "description": "Extracted keywords from the certification documents.",
@@ -491,10 +497,6 @@
         },
         "cert_id": {
           "$ref": "#/definitions/cc_id",
-          "type": [
-            "string",
-            "null"
-          ],
           "title": "Certificate ID",
           "description": "The unique identifier of the Common Criteria certificate."
         },
diff --git a/src/sec_certs/serialization/schemas/fips_certificate.json b/src/sec_certs/serialization/schemas/fips_certificate.json
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/sec_certs/serialization/schemas/fips_certificate.json
diff --git a/tests/cc/conftest.py b/tests/cc/conftest.py
index 8651b92e..12fbc2db 100644
--- a/tests/cc/conftest.py
+++ b/tests/cc/conftest.py
@@ -74,10 +74,10 @@ def cert_two() -> CCCertificate:
 
     return CCCertificate(
         "archived",
-        "Sample category",
+        "Access Control Devices and Systems",
         "Sample certificate name",
         "Sample manufacturer",
-        "Sample scheme",
+        "DE",
         {"Sample security level"},
         date(1900, 1, 2),
         date(1900, 1, 3),
diff --git a/tests/data/cc/certificate/fictional_cert.json b/tests/data/cc/certificate/fictional_cert.json
index 15b7f507..5206c811 100644
--- a/tests/data/cc/certificate/fictional_cert.json
+++ b/tests/data/cc/certificate/fictional_cert.json
@@ -1,8 +1,8 @@
 {
   "_type": "sec_certs.sample.cc.CCCertificate",
-  "dgst": "8049938203b26f7b",
+  "dgst": "265b6e29d58940b7",
   "status": "archived",
-  "category": "Sample category",
+  "category": "Access Control Devices and Systems",
   "name": "Sample certificate name",
   "manufacturer": "Sample manufacturer",
   "scheme": "DE",