aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdam Janovsky2022-02-10 18:42:45 +0100
committerAdam Janovsky2022-02-10 18:42:45 +0100
commit473ac908dcd7b69c21575ef036f5dc5fbf232f33 (patch)
tree1bfdf812681ecf56dfba899307bcd1046ebf7460
parent6d9801f95905b5601c427c23398134b8aab98154 (diff)
downloadsec-certs-473ac908dcd7b69c21575ef036f5dc5fbf232f33.tar.gz
sec-certs-473ac908dcd7b69c21575ef036f5dc5fbf232f33.tar.zst
sec-certs-473ac908dcd7b69c21575ef036f5dc5fbf232f33.zip
delete redundant certificate method
-rw-r--r--pyproject.toml1
-rw-r--r--sec_certs/sample/certificate.py4
-rw-r--r--sec_certs/sample/common_criteria.py4
-rw-r--r--sec_certs/sample/fips.py7
4 files changed, 1 insertions, 15 deletions
diff --git a/pyproject.toml b/pyproject.toml
index 53b1f9bd..7ac509d6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,6 +6,7 @@ exclude = '''
| \.mypy_cache
| \.tox
| venv
+ | certsvenv
| \.venv
| _build
| buck-out
diff --git a/sec_certs/sample/certificate.py b/sec_certs/sample/certificate.py
index c9eeccca..7c0061d9 100644
--- a/sec_certs/sample/certificate.py
+++ b/sec_certs/sample/certificate.py
@@ -71,10 +71,6 @@ class Certificate(ABC, ComplexSerializableType):
raise NotImplementedError("Not meant to be implemented")
@abstractmethod
- def compute_heuristics_cpe_vendors(self, cpe_classifier: CPEClassifier):
- raise NotImplementedError("Not meant to be implemented")
-
- @abstractmethod
def compute_heuristics_cpe_match(self, cpe_classifier: CPEClassifier):
raise NotImplementedError("Not meant to be implemented")
diff --git a/sec_certs/sample/common_criteria.py b/sec_certs/sample/common_criteria.py
index 39070906..a32c3e8c 100644
--- a/sec_certs/sample/common_criteria.py
+++ b/sec_certs/sample/common_criteria.py
@@ -672,10 +672,6 @@ class CommonCriteriaCert(Certificate, PandasSerializableType, ComplexSerializabl
def compute_heuristics_version(self):
self.heuristics.extracted_versions = helpers.compute_heuristics_version(self.name)
- def compute_heuristics_cpe_vendors(self, cpe_classifier: CPEClassifier):
- # TODO: This method probably can be deleted.
- self.heuristics.cpe_candidate_vendors = cpe_classifier.get_candidate_list_of_vendors(self.manufacturer) # type: ignore
-
def compute_heuristics_cpe_match(self, cpe_classifier: CPEClassifier):
self.heuristics.cpe_matches = cpe_classifier.predict_single_cert(self.manufacturer, self.name, self.heuristics.extracted_versions) # type: ignore
diff --git a/sec_certs/sample/fips.py b/sec_certs/sample/fips.py
index 77776418..d9d1093c 100644
--- a/sec_certs/sample/fips.py
+++ b/sec_certs/sample/fips.py
@@ -15,7 +15,6 @@ from sec_certs import helpers
from sec_certs.cert_rules import REGEXEC_SEP, fips_common_rules, fips_rules
from sec_certs.config.configuration import config
from sec_certs.constants import LINE_SEPARATOR
-from sec_certs.dataset.cpe import CPEDataset
from sec_certs.helpers import fips_dgst, load_cert_file, normalize_match_string, save_modified_cert_file
from sec_certs.model.cpe_matching import CPEClassifier
from sec_certs.sample.certificate import Certificate, logger
@@ -831,12 +830,6 @@ class FIPSCertificate(Certificate, ComplexSerializableType):
versions_for_extraction += f" {self.web_scan.fw_version}"
self.heuristics.extracted_versions = helpers.compute_heuristics_version(versions_for_extraction)
- # TODO: This function is probably safe to delete // I'll not type it then - older API probably?
- def compute_heuristics_cpe_vendors(self, cpe_dataset: CPEDataset):
- if self.web_scan.vendor is None:
- raise RuntimeError(f"Vendor for cert {self.cert_id} not found - this should not be happening.")
- self.heuristics.cpe_candidate_vendors = cpe_dataset.get_candidate_list_of_vendors(self.web_scan.vendor) # type: ignore
-
def compute_heuristics_cpe_match(self, cpe_classifier: CPEClassifier):
if not self.web_scan.module_name:
self.heuristics.cpe_matches = None