diff --git a/.github/requirements.txt b/.github/requirements.txt index 936f27cc..663ab463 100644 --- a/.github/requirements.txt +++ b/.github/requirements.txt @@ -1,22 +1,22 @@ -blinker==1.8.2 +blinker==1.9.0 cffi==1.17.1 -click==8.1.7 -colorlog==6.8.2 -coverage==7.6.2 -cryptography==43.0.1 -Flask==3.0.3 -gcovr==8.0 +click==8.1.8 +colorlog==6.9.0 +coverage==7.6.12 +cryptography==44.0.1 +Flask==3.1.0 +gcovr==8.3 imutils==0.5.4 itsdangerous==2.2.0 -Jinja2==3.1.4 -lxml==5.3.0 -MarkupSafe==3.0.1 +Jinja2==3.1.5 +lxml==5.3.1 +MarkupSafe==3.0.2 numpy==1.26.4 opencv-python-headless==4.9.0.80 protobuf==4.24.2 pycparser==2.22 -Pygments==2.18.0 +Pygments==2.19.1 pyzmq==26.0.3 -scipy==1.14.1 +scipy==1.15.2 sk-video==1.1.10 -Werkzeug==3.0.6 +Werkzeug==3.1.3 \ No newline at end of file diff --git a/.github/scripts/Dockerfile.checkin b/.github/scripts/Dockerfile.checkin index dd508f04..b485056c 100644 --- a/.github/scripts/Dockerfile.checkin +++ b/.github/scripts/Dockerfile.checkin @@ -209,7 +209,7 @@ RUN apt-get update -y && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists/* && \ echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig && \ python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==4.${PROTOBUF_VERSION}" \ - "coverage>=7.3.1" "cryptography>=42.0.7" + "coverage>=7.3.1" "cryptography>=44.0.1" # COVERAGE TESTING WORKDIR /vdms diff --git a/.github/scripts/setup_vdms.sh b/.github/scripts/setup_vdms.sh index c7886f6b..c3f7eccb 100755 --- a/.github/scripts/setup_vdms.sh +++ b/.github/scripts/setup_vdms.sh @@ -238,7 +238,7 @@ make install # INSTALL PYTHON PACKAGES python -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "coverage>=7.3.1" \ - "protobuf==4.${PROTOBUF_VERSION}" "cryptography>=42.0.7" + "protobuf==4.${PROTOBUF_VERSION}" "cryptography>=44.0.1" # INSTALL VALIJSON diff --git a/INSTALL.md b/INSTALL.md index 4e2bcd8b..aed88745 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -84,7 +84,7 @@ alias python3=/usr/bin/python3.x Now that python is setup, now install Numpy and also install the coverage and cryptography packages if interested in running the Python unit tests. ```bash python3 -m pip install --upgrade pip -python3 -m pip install --no-cache-dir "numpy>=1.26.0" "coverage>=7.3.1" "cryptography>=42.0.7" +python3 -m pip install --no-cache-dir "numpy>=1.26.0" "coverage>=7.3.1" "cryptography>=44.0.1" ``` diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index aa83577d..b65174ed 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -191,7 +191,7 @@ RUN apt-get update -y && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists/* && \ echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig && \ python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==4.${PROTOBUF_VERSION}" \ - "coverage>=7.3.1" "cryptography>=42.0.7" + "coverage>=7.3.1" "cryptography>=44.0.1" # VDMS WORKDIR /vdms diff --git a/tests/tls_test/prep_certs.py b/tests/tls_test/prep_certs.py index e5ec5e88..9cf60d7e 100644 --- a/tests/tls_test/prep_certs.py +++ b/tests/tls_test/prep_certs.py @@ -33,16 +33,18 @@ def generate_ca_certificate(subject_name, private_key): ] ) + current_time = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None) + certificate = ( x509.CertificateBuilder() .subject_name(subject) .issuer_name(issuer) .public_key(private_key.public_key()) .serial_number(x509.random_serial_number()) - .not_valid_before(datetime.datetime.utcnow()) + .not_valid_before(current_time) .not_valid_after( # Our certificate will be valid for 10 days - datetime.datetime.utcnow() + current_time + datetime.timedelta(days=10) ) .add_extension( @@ -70,16 +72,18 @@ def generate_signed_certificate( issuer = issuer_certificate.subject + current_time = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None) + certificate = ( x509.CertificateBuilder() .subject_name(subject) .issuer_name(issuer) .public_key(subject_private_key.public_key()) .serial_number(x509.random_serial_number()) - .not_valid_before(datetime.datetime.utcnow()) + .not_valid_before(current_time) .not_valid_after( # Our certificate will be valid for 10 days - datetime.datetime.utcnow() + current_time + datetime.timedelta(days=10) ) .add_extension(