Cleanup PdfData attributes.

3 files changed, 14 insertions, 77 deletions

diff --git a/tests/data/cc/analysis/cc_full_dataset.json b/tests/data/cc/analysis/cc_full_dataset.json
index 4baf4758..64ef38e4 100644
--- a/tests/data/cc/analysis/cc_full_dataset.json
+++ b/tests/data/cc/analysis/cc_full_dataset.json
@@ -130,8 +130,7 @@
                     }
                 },
                 "report_frontpage": {
-                    "anssi": {},
-                    "bsi": {
+                    "DE": {
                         "match_rules": [
                             "(BSI-DSZ-CC-.+?) (?:for|For) (.+?) from (.*)"
                         ],
@@ -142,17 +141,9 @@
                         "ref_protection_profiles": "None",
                         "cc_version": "Product specific Security Target Common Criteria Part 2 conformant",
                         "cc_security_level": "Common Criteria Part 3 conformant EAL 3 augmented by ALC_FLR.1 SOGIS Recognition Agreement"
-                    },
-                    "nscib": {},
-                    "niap": {},
-                    "canada": {}
+                    }
                 },
                 "st_frontpage": {
-                    "anssi": {},
-                    "bsi": {},
-                    "nscib": {},
-                    "niap": {},
-                    "canada": {}
                 },
                 "report_keywords": {
                     "cc_cert_id": {
diff --git a/tests/data/cc/analysis/reference_dataset.json b/tests/data/cc/analysis/reference_dataset.json
index b0ef6683..38fb7fd0 100644
--- a/tests/data/cc/analysis/reference_dataset.json
+++ b/tests/data/cc/analysis/reference_dataset.json
@@ -101,8 +101,7 @@
           "/Title": "Security Target The Océ Digital Access Controller (DAC) R10.1.5, as used in the Océ VarioPrint 1055, 1055 BC, 1055 DP, 1065, 1075, 2062, 2075, 2075 DP printer/copier/scanner products"
         },
         "report_frontpage": {
-          "anssi": {},
-          "bsi": {
+          "DE": {
             "match_rules": [
               "(BSI-DSZ-CC-.+?) (?:for|For) (.+?) from (.*)"
             ],
@@ -110,17 +109,9 @@
             "cert_item": "Océ Digital Access Controller (DAC) R10.1.5 for use in the Océ VarioPrint 1055, 1055 BC, 1055 DP, 1065, 1075, 2062, 2075, 2075 DP printer/copier/scanner products",
             "developer": "Océ Technologies B.V",
             "cert_lab": "BSI"
-          },
-          "nscib": {},
-          "niap": {},
-          "canada": {}
+          }
         },
         "st_frontpage": {
-          "anssi": {},
-          "bsi": {},
-          "nscib": {},
-          "niap": {},
-          "canada": {}
         },
         "report_keywords": {
           "cc_cert_id": {
@@ -678,8 +669,7 @@
           "/Title": "Microsoft Word - Oce Venlo DAC Security Target 2.4.doc"
         },
         "report_frontpage": {
-          "anssi": {},
-          "bsi": {
+          "DE": {
             "match_rules": [
               "(BSI-DSZ-CC-.+?) (?:for|For) (.+?) from (.*)"
             ],
@@ -687,17 +677,9 @@
             "cert_item": "Océ Digital Access Controller (DAC) R9.1.6",
             "developer": "Océ Technologies B.V",
             "cert_lab": "BSI"
-          },
-          "nscib": {},
-          "niap": {},
-          "canada": {}
+          }
         },
         "st_frontpage": {
-          "anssi": {},
-          "bsi": {},
-          "nscib": {},
-          "niap": {},
-          "canada": {}
         },
         "report_keywords": {
           "cc_cert_id": {
@@ -1333,8 +1315,7 @@
           "/Title": "Microsoft Word - Oce Venlo DAC Security Target 1.9.doc"
         },
         "report_frontpage": {
-          "anssi": {},
-          "bsi": {
+          "DE": {
             "match_rules": [
               "(BSI-DSZ-CC-.+?) (?:for|For) (.+?) from (.*)"
             ],
@@ -1342,17 +1323,9 @@
             "cert_item": "Océ Digital Access Controller (DAC) R 8.1.10",
             "developer": "Océ Technologies B.V",
             "cert_lab": "BSI"
-          },
-          "nscib": {},
-          "niap": {},
-          "canada": {}
+          }
         },
         "st_frontpage": {
-          "anssi": {},
-          "bsi": {},
-          "nscib": {},
-          "niap": {},
-          "canada": {}
         },
         "report_keywords": {
           "cc_cert_id": {
diff --git a/tests/data/cc/analysis/transitive_vulnerability_dataset.json b/tests/data/cc/analysis/transitive_vulnerability_dataset.json
index 21391a12..abd4c7a3 100644
--- a/tests/data/cc/analysis/transitive_vulnerability_dataset.json
+++ b/tests/data/cc/analysis/transitive_vulnerability_dataset.json
@@ -108,8 +108,7 @@
           "/CreationDate": "D:20140828154014+02'00'"
         },
         "report_frontpage": {
-          "anssi": {},
-          "bsi": {
+          "DE": {
             "match_rules": [
               "(BSI-DSZ-CC-.+?) (?:for|For) (.+?) from (.*)"
             ],
@@ -117,17 +116,9 @@
             "cert_item": "IBM z/OS Version 2 Release 1",
             "developer": "IBM Corporation",
             "cert_lab": "BSI"
-          },
-          "nscib": {},
-          "niap": {},
-          "canada": {}
+          }
         },
         "st_frontpage": {
-          "anssi": {},
-          "bsi": {},
-          "nscib": {},
-          "niap": {},
-          "canada": {}
         },
         "report_keywords": {
           "cc_cert_id": {
@@ -1432,8 +1423,7 @@
           "/CreationDate": "D:20150508083715+02'00'"
         },
         "report_frontpage": {
-          "anssi": {},
-          "bsi": {
+          "DE": {
             "match_rules": [
               "(BSI-DSZ-CC-.+?) (?:for|For) (.+?) from (.*)"
             ],
@@ -1441,17 +1431,9 @@
             "cert_item": "RACF Element of z/OS Version 2, Release 1",
             "developer": "IBM Corporation",
             "cert_lab": "BSI"
-          },
-          "nscib": {},
-          "niap": {},
-          "canada": {}
+          }
         },
         "st_frontpage": {
-          "anssi": {},
-          "bsi": {},
-          "nscib": {},
-          "niap": {},
-          "canada": {}
         },
         "report_keywords": {
           "cc_cert_id": {
@@ -2399,8 +2381,7 @@
           "/CreationDate": "D:20170503171742+02'00'"
         },
         "report_frontpage": {
-          "anssi": {},
-          "bsi": {
+          "DE": {
             "match_rules": [
               "(BSI-DSZ-CC-.+?) (?:for|For) (.+?) from (.*)"
             ],
@@ -2411,17 +2392,9 @@
             "ref_protection_profiles": "Operating System Protection Profile, Version 2.0, 01 June 2010, BSI-CC-PP-0067-2010, OSPP Extended Packages: Extended Identification and Authentication and Labeled Security, both Version 2.0, 28 May 2010",
             "cc_version": "PP conformant Common Criteria Part 2 extended",
             "cc_security_level": "Common Criteria Part 3 conformant EAL 4 augmented by ALC_FLR.3"
-          },
-          "nscib": {},
-          "niap": {},
-          "canada": {}
+          }
         },
         "st_frontpage": {
-          "anssi": {},
-          "bsi": {},
-          "nscib": {},
-          "niap": {},
-          "canada": {}
         },
         "report_keywords": {
           "cc_cert_id": {