diff options
| author | Stanislav Boboň | 2021-01-07 10:12:18 +0100 |
|---|---|---|
| committer | Stanislav Boboň | 2021-01-07 10:12:18 +0100 |
| commit | e8409b7dce1038ba03f781150af53bf8ee38a413 (patch) | |
| tree | d23c04c0829b3469890648905f0caef3e317179c | |
| parent | 41ec3b09b847611a41bc23f64b4850a45dd7535d (diff) | |
| download | sec-certs-e8409b7dce1038ba03f781150af53bf8ee38a413.tar.gz sec-certs-e8409b7dce1038ba03f781150af53bf8ee38a413.tar.zst sec-certs-e8409b7dce1038ba03f781150af53bf8ee38a413.zip | |
little changes
| -rw-r--r-- | fips_oop_demo.py | 2 | ||||
| -rw-r--r-- | sec_certs/certificate.py | 4 | ||||
| -rw-r--r-- | sec_certs/dataset.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/fips_oop_demo.py b/fips_oop_demo.py index b9aa9425..45cd92b4 100644 --- a/fips_oop_demo.py +++ b/fips_oop_demo.py @@ -15,7 +15,7 @@ def main(): # dset = FIPSDataset({}, Path('./fips_test_dataset'), 'small dataset', 'small dataset for keyword testing') # Load metadata for certificates from CSV and HTML sources - dset.get_certs_from_web(True) + dset.get_certs_from_web() logging.info(f'Finished parsing. Have dataset with {len(dset)} certificates.') # Dump dataset into JSON diff --git a/sec_certs/certificate.py b/sec_certs/certificate.py index acb1fc79..7cada5a0 100644 --- a/sec_certs/certificate.py +++ b/sec_certs/certificate.py @@ -163,8 +163,8 @@ class FIPSCertificate(Certificate, ComplexSerializableType): self.module_name = module_name self.standard = standard self.status = status - self.date_sunset = date_sunset - self.date_validation = date_validation + self.date_sunset = parser.parse(date_sunset) if date_sunset else date_sunset + self.date_validation = [parser.parse(x) for x in date_validation if x] self.level = level self.caveat = caveat self.exceptions = exceptions diff --git a/sec_certs/dataset.py b/sec_certs/dataset.py index 11747908..cba23481 100644 --- a/sec_certs/dataset.py +++ b/sec_certs/dataset.py @@ -688,6 +688,7 @@ class FIPSDataset(Dataset, ComplexSerializableType): """ def validate_id(processed_cert: FIPSCertificate, cert_candidate: str) -> bool: + # returns True if candidates should _not_ be matched def compare_certs(current_certificate: 'FIPSCertificate', other_id: str): cert_first = current_certificate.date_validation[0].year @@ -698,7 +699,7 @@ class FIPSDataset(Dataset, ComplexSerializableType): return cert_first - conn_first > 5 and cert_last - conn_last > 5 # "< 105" still needs to be used, because of some old certs being revalidated - if cert_candidate.isdecimal() and (int(cert_candidate) < 105 or compare_certs(processed_cert, cert_candidate)): + if cert_candidate.isdecimal() and compare_certs(processed_cert, cert_candidate): return False if cert_candidate not in self.algorithms.certs: return True |