diff options
| author | Stanislav Boboň | 2021-02-03 15:26:18 +0100 |
|---|---|---|
| committer | Stanislav Boboň | 2021-02-03 15:26:18 +0100 |
| commit | bfd91bcd31e4425b419b199ddab23585736ae079 (patch) | |
| tree | 5cbf36352ab8aee591c716b519c69fe38fd7e873 /sec_certs/dataset.py | |
| parent | add500861f50b07791cdbbde262133d52646d197 (diff) | |
| download | sec-certs-bfd91bcd31e4425b419b199ddab23585736ae079.tar.gz sec-certs-bfd91bcd31e4425b419b199ddab23585736ae079.tar.zst sec-certs-bfd91bcd31e4425b419b199ddab23585736ae079.zip | |
rules as constants
Diffstat (limited to 'sec_certs/dataset.py')
| -rw-r--r-- | sec_certs/dataset.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sec_certs/dataset.py b/sec_certs/dataset.py index a8396fc6..46674f60 100644 --- a/sec_certs/dataset.py +++ b/sec_certs/dataset.py @@ -22,7 +22,6 @@ import sec_certs.files as files from sec_certs.certificate import CommonCriteriaCert, Certificate, FIPSCertificate from sec_certs.serialization import ComplexSerializableType, CustomJSONDecoder, CustomJSONEncoder -from sec_certs.cert_rules import configuration logger = logging.getLogger(__name__) @@ -701,12 +700,12 @@ class FIPSDataset(Dataset, ComplexSerializableType): conn_first = self.certs[other_id].date_validation[0].year conn_last = self.certs[other_id].date_validation[-1].year - return cert_first - conn_first > configuration["year_difference_between_validations"]["value"] \ - and cert_last - conn_last > configuration["year_difference_between_validations"]["value"] + return cert_first - conn_first > constants.FIPS_YEAR_DIFFERENCE_BETWEEN_VALIDATION \ + and cert_last - conn_last > constants.FIPS_YEAR_DIFFERENCE_BETWEEN_VALIDATION # "< 105" still needs to be used, because of some old certs being revalidated if cert_candidate.isdecimal() \ - and int(cert_candidate) < configuration["smallest_certificate_id_to_connect"]["value"] or \ + and int(cert_candidate) < constants.FIPS_SMALLEST_CERT_ID_TO_CONNECT or \ compare_certs(processed_cert, cert_candidate): return False if cert_candidate not in self.algorithms.certs: |
