diff options
| author | Adam Janovsky | 2021-04-20 09:06:50 +0200 |
|---|---|---|
| committer | Adam Janovsky | 2021-04-20 09:06:50 +0200 |
| commit | eb08912c1a463050dbe95efb92098c0cb6edb519 (patch) | |
| tree | 8d44e10d177a5d648860226a49742d063fbc6f01 | |
| parent | c13a2abdab4e734ffebca98846ebdacf004dd842 (diff) | |
| download | sec-certs-eb08912c1a463050dbe95efb92098c0cb6edb519.tar.gz sec-certs-eb08912c1a463050dbe95efb92098c0cb6edb519.tar.zst sec-certs-eb08912c1a463050dbe95efb92098c0cb6edb519.zip | |
compute heuristics cert lab
| -rw-r--r-- | sec_certs/certificate/common_criteria.py | 2 | ||||
| -rw-r--r-- | sec_certs/dataset/common_criteria.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sec_certs/certificate/common_criteria.py b/sec_certs/certificate/common_criteria.py index de6181d0..876e8d8f 100644 --- a/sec_certs/certificate/common_criteria.py +++ b/sec_certs/certificate/common_criteria.py @@ -565,4 +565,4 @@ class CommonCriteriaCert(Certificate, ComplexSerializableType): if not self.pdf_data: logger.error('Cannot compute certificate lab when pdf files were not processed.') return - self.pdf_data.get_cert_lab()
\ No newline at end of file + self.heuristics.cert_lab = self.pdf_data.get_cert_lab() diff --git a/sec_certs/dataset/common_criteria.py b/sec_certs/dataset/common_criteria.py index 18326b10..443c491f 100644 --- a/sec_certs/dataset/common_criteria.py +++ b/sec_certs/dataset/common_criteria.py @@ -600,9 +600,15 @@ class CCDataset(Dataset, ComplexSerializableType): for cert in self: cert.compute_heuristics_cpe_match(cpe_dataset) + def compute_cert_labs(): + logger.info('Deriving information about laboratories involved in certification.') + for cert in self: + cert.compute_heuristics_cert_lab() + compute_candidate_versions() cpe_dset = self.prepare_cpe_dataset(download_fresh_cpes) compute_cpe_matches(cpe_dset) + compute_cert_labs() if update_json is True: self.to_json(self.json_path) |