diff options
| author | J08nY | 2023-02-10 12:54:37 +0100 |
|---|---|---|
| committer | J08nY | 2023-02-10 12:54:37 +0100 |
| commit | 9febd62efa7ebcfffa444e5bd32ed957aea27f1f (patch) | |
| tree | 721748ced9be01b4cb5e4385ec13f6501a1835bb /src | |
| parent | 9eba76583fa99e38ec906fee918bcfc6772267bb (diff) | |
| download | sec-certs-9febd62efa7ebcfffa444e5bd32ed957aea27f1f.tar.gz sec-certs-9febd62efa7ebcfffa444e5bd32ed957aea27f1f.tar.zst sec-certs-9febd62efa7ebcfffa444e5bd32ed957aea27f1f.zip | |
Make FIPS cert_id an int.
Diffstat (limited to 'src')
| -rw-r--r-- | src/sec_certs/dataset/fips.py | 8 | ||||
| -rw-r--r-- | src/sec_certs/sample/fips.py | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/sec_certs/dataset/fips.py b/src/sec_certs/dataset/fips.py index 6f8eff3e..68d027d0 100644 --- a/src/sec_certs/dataset/fips.py +++ b/src/sec_certs/dataset/fips.py @@ -211,7 +211,7 @@ class FIPSDataset(Dataset[FIPSCertificate, FIPSAuxillaryDatasets], ComplexSerial if cert_id not in cert_ids: cert_ids.add(cert_id) - return [FIPSCertificate(cert_id) for cert_id in cert_ids] + return [FIPSCertificate(int(cert_id)) for cert_id in cert_ids] @classmethod def from_web_latest(cls) -> FIPSDataset: @@ -284,7 +284,7 @@ class FIPSDataset(Dataset[FIPSCertificate, FIPSAuxillaryDatasets], ComplexSerial def _compute_transitive_vulnerabilities(self) -> None: logger.info("Computing heuristics: Computing transitive vulnerabilities in referenc(ed/ing) certificates.") - transitive_cve_finder = TransitiveVulnerabilityFinder(lambda cert: cert.cert_id) + transitive_cve_finder = TransitiveVulnerabilityFinder(lambda cert: str(cert.cert_id)) transitive_cve_finder.fit(self.certs, lambda cert: cert.heuristics.policy_processed_references) for dgst in self.certs: @@ -309,12 +309,12 @@ class FIPSDataset(Dataset[FIPSCertificate, FIPSAuxillaryDatasets], ComplexSerial policy_reference_finder = ReferenceFinder() policy_reference_finder.fit( - self.certs, lambda cert: cert.cert_id, lambda cert: cert.heuristics.policy_prunned_references + self.certs, lambda cert: str(cert.cert_id), lambda cert: cert.heuristics.policy_prunned_references ) module_reference_finder = ReferenceFinder() module_reference_finder.fit( - self.certs, lambda cert: cert.cert_id, lambda cert: cert.heuristics.module_prunned_references + self.certs, lambda cert: str(cert.cert_id), lambda cert: cert.heuristics.module_prunned_references ) for cert in self: diff --git a/src/sec_certs/sample/fips.py b/src/sec_certs/sample/fips.py index f93bf33b..b3ff8ba6 100644 --- a/src/sec_certs/sample/fips.py +++ b/src/sec_certs/sample/fips.py @@ -499,7 +499,7 @@ class FIPSCertificate( def __init__( self, - cert_id: str, + cert_id: int, web_data: FIPSCertificate.WebData | None = None, pdf_data: FIPSCertificate.PdfData | None = None, heuristics: FIPSCertificate.Heuristics | None = None, @@ -680,9 +680,7 @@ class FIPSCertificate( 2. Consider only ids s.t. they don't appear in self.heuristics.algorithms 3. Consider only ids s.t. they don't appear in self.pdf_data.keywords["fips_certlike"]["Certlike"] """ - prunned = {x for x in attribute_to_prune if x != self.cert_id} + prunned = {x for x in attribute_to_prune if x != str(self.cert_id)} prunned = {x for x in prunned if int(x) > config.always_false_positive_fips_cert_id_threshold} prunned = {x for x in prunned if x not in self.heuristics.algorithm_numbers} return {x for x in prunned if x not in self.pdf_data.certlike_algorithm_numbers} - - return prunned |