diff options
| -rw-r--r-- | src/sec_certs/constants.py | 4 | ||||
| -rw-r--r-- | src/sec_certs/dataset/fips_algorithm.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/sec_certs/constants.py b/src/sec_certs/constants.py index 71c79f3e..e9b6d882 100644 --- a/src/sec_certs/constants.py +++ b/src/sec_certs/constants.py @@ -32,7 +32,9 @@ FIPS_BASE_URL = "https://csrc.nist.gov" FIPS_CMVP_URL = FIPS_BASE_URL + "/projects/cryptographic-module-validation-program" FIPS_CAVP_URL = FIPS_BASE_URL + "/projects/Cryptographic-Algorithm-Validation-Program" FIPS_MODULE_URL = FIPS_CMVP_URL + "/certificate/{}" -FIPS_ALG_SEARCH_URL = FIPS_CAVP_URL + "/validation-search?searchMode=validation&page=" +FIPS_ALG_SEARCH_VALIDATION_URL = FIPS_CAVP_URL + "/validation-search?searchMode=validation&page=" +FIPS_ALG_SEARCH_IMPLEMENTATION_URL = FIPS_CAVP_URL + "/validation-search?searchMode=implementation&page=" +FIPS_ALG_SEARCH_URL = FIPS_ALG_SEARCH_VALIDATION_URL FIPS_SP_URL = "https://csrc.nist.gov/CSRC/media/projects/cryptographic-module-validation-program/documents/security-policies/140sp{}.pdf" FIPS_ACTIVE_MODULES_URL = ( FIPS_CMVP_URL + "/validated-modules/search?SearchMode=Advanced&CertificateStatus=Active&ValidationYear=0" diff --git a/src/sec_certs/dataset/fips_algorithm.py b/src/sec_certs/dataset/fips_algorithm.py index 4a87b3ef..56163078 100644 --- a/src/sec_certs/dataset/fips_algorithm.py +++ b/src/sec_certs/dataset/fips_algorithm.py @@ -96,6 +96,9 @@ class FIPSAlgorithmDataset(JSONPathDataset, ComplexSerializableType): @staticmethod def parse_algorithms_from_html(html_path: Path) -> set[FIPSAlgorithm]: df = pd.read_html(html_path)[0] + for col in df.columns: + if "Order by" in col: + df.rename(columns={col: col.split("Order by")[0]}, inplace=True) df["alg_type"] = df["Validation Number"].map(lambda x: re.sub(r"[0-9\s]", "", x)) df["alg_number"] = df["Validation Number"].map(lambda x: re.sub(r"[^0-9]", "", x)) df["alg"] = df.apply( |