diff options
| author | Adam Janovsky | 2021-12-15 09:39:44 +0100 |
|---|---|---|
| committer | Adam Janovsky | 2021-12-15 09:39:44 +0100 |
| commit | 94414e8e040e162883d1d0182a198ca1533cd42c (patch) | |
| tree | fdb1790275d9db86cc75676180bba3a865ba33ce /sec_certs/sample | |
| parent | 80a39c9a279a7ed20e0deec004d02744c914f581 (diff) | |
| parent | 9d7e8aebdbba5978d62ec8beca079b4db5b3fdc9 (diff) | |
| download | sec-certs-94414e8e040e162883d1d0182a198ca1533cd42c.tar.gz sec-certs-94414e8e040e162883d1d0182a198ca1533cd42c.tar.zst sec-certs-94414e8e040e162883d1d0182a198ca1533cd42c.zip | |
Merge branch 'dev' into mypy-ci-cd
Diffstat (limited to 'sec_certs/sample')
| -rw-r--r-- | sec_certs/sample/cc_maintenance_update.py | 8 | ||||
| -rw-r--r-- | sec_certs/sample/common_criteria.py | 8 | ||||
| -rw-r--r-- | sec_certs/sample/cve.py | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sec_certs/sample/cc_maintenance_update.py b/sec_certs/sample/cc_maintenance_update.py index 3af30312..6fce7ebb 100644 --- a/sec_certs/sample/cc_maintenance_update.py +++ b/sec_certs/sample/cc_maintenance_update.py @@ -47,8 +47,8 @@ class CommonCriteriaMaintenanceUpdate(CommonCriteriaCert, ComplexSerializableTyp if cert.maintenance_updates is None: raise RuntimeError("Dataset was probably not built correctly - this should not be happening.") - return [cls(x.maintainance_title, x.maintainance_report_link, x.maintainance_st_link, - None, None, None, cert.dgst, x.maintainance_date) for x in cert.maintenance_updates - if (x.maintainance_title is not None and x.maintainance_report_link is not None\ - and x.maintainance_st_link is not None and x.maintainance_date is not None)] + return [cls(x.maintaeance_title, x.maintenance_report_link, x.maintenance_st_link, + None, None, None, cert.dgst, x.maintenance_date) for x in cert.maintenance_updates + if (x.maintenance_title is not None and x.maintenance_report_link is not None\ + and x.maintenance_st_link is not None and x.maintenance_date is not None)] diff --git a/sec_certs/sample/common_criteria.py b/sec_certs/sample/common_criteria.py index dd17a055..890c38e8 100644 --- a/sec_certs/sample/common_criteria.py +++ b/sec_certs/sample/common_criteria.py @@ -26,10 +26,10 @@ class CommonCriteriaCert(Certificate, PandasSerializableType, ComplexSerializabl """ Object for holding maintenance reports. """ - maintainance_date: Optional[date] - maintainance_title: Optional[str] - maintainance_report_link: Optional[str] - maintainance_st_link: Optional[str] + maintenance_date: Optional[date] + maintenance_title: Optional[str] + maintenance_report_link: Optional[str] + maintenance_st_link: Optional[str] def __post_init__(self): super().__setattr__('maintenance_report_link', diff --git a/sec_certs/sample/cve.py b/sec_certs/sample/cve.py index 94924483..f63a8869 100644 --- a/sec_certs/sample/cve.py +++ b/sec_certs/sample/cve.py @@ -90,8 +90,8 @@ class CVE(PandasSerializableType, ComplexSerializableType): for x in lst: if x['vulnerable']: cpe_uri = x['cpe23Uri'] - version_start: Optional[Tuple[str, Any]] - version_end: Optional[Tuple[str, Any]] + version_start: Optional[Tuple[str, str]] + version_end: Optional[Tuple[str, str]] if 'versionStartIncluding' in x and x['versionStartIncluding']: version_start = ('including', x['versionStartIncluding']) elif 'versionStartExcluding' in x and x['versionStartExcluding']: |
