aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPetr Svenda2020-10-16 08:50:31 +0200
committerPetr Svenda2020-10-16 08:50:31 +0200
commit79f8bd1e30cc4d58a93228cd8a3f9fe8564d8749 (patch)
tree822305994cb21a1306e55bf935c12a43218dd642
parent01320d6b405db216555080e42bdaae9d39ce196a (diff)
parentf27a6706b9e77d9802027c85dc0cbcc98218ffd2 (diff)
downloadsec-certs-79f8bd1e30cc4d58a93228cd8a3f9fe8564d8749.tar.gz
sec-certs-79f8bd1e30cc4d58a93228cd8a3f9fe8564d8749.tar.zst
sec-certs-79f8bd1e30cc4d58a93228cd8a3f9fe8564d8749.zip
Merge branch 'master' of https://github.com/petrs/sec-certs
-rw-r--r--requirements.txt12
-rw-r--r--src/fips_certificates.py10
2 files changed, 17 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..43e7ade0
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,12 @@
+certifi==2020.6.20
+cycler==0.10.0
+graphviz==0.14.2
+kiwisolver==1.2.0
+matplotlib==3.3.2
+numpy==1.19.2
+Pillow==8.0.0
+pyparsing==2.4.7
+PyPDF2==1.26.0
+python-dateutil==2.8.1
+six==1.15.0
+tabulate==0.8.7
diff --git a/src/fips_certificates.py b/src/fips_certificates.py
index 5d7380ee..c7486906 100644
--- a/src/fips_certificates.py
+++ b/src/fips_certificates.py
@@ -351,14 +351,14 @@ def repair_pdf_page_count(file):
def extract_certs_from_tables(list_of_files, html_items):
global count
- list_of_files = json.loads(open(FIPS_RESULTS_DIR + 'bakup/broken_files.json').read())
+
not_decoded = []
for REDHAT_FILE in list_of_files:
if '.txt' not in REDHAT_FILE:
continue
- #
- # if html_items[extract_filename(REDHAT_FILE[:-8])]['tables_done']:
- # continue
+
+ if html_items[extract_filename(REDHAT_FILE[:-8])]['tables_done']:
+ continue
with open(REDHAT_FILE, 'r') as f:
try:
@@ -392,7 +392,7 @@ def extract_certs_from_tables(list_of_files, html_items):
html_items[extract_filename(REDHAT_FILE[:-8])]['fips_algorithms'] = lst
else:
html_items[extract_filename(REDHAT_FILE[:-8])]['fips_algorithms'] += lst
- print(lst)
+
html_items[extract_filename(REDHAT_FILE[:-8])]['tables_done'] = True
return not_decoded