From f5a7c1d829323a2ddc07654cdbfa5b635728a24a Mon Sep 17 00:00:00 2001
From: gauravsaini04 <147703805+gauravsaini04@users.noreply.github.com>
Date: Thu, 29 Feb 2024 00:21:33 +0530
Subject: [PATCH] 
 miniconda-cryptography-update_for_security_patch_GHSA-6vqw-3v5j-54x4 (#976)

* miniconda-cryptography-update_for_security_patch_GHSA-6vqw-3v5j-54x4

* changes as requested

* misc change
---
 src/miniconda/.devcontainer/Dockerfile | 10 ++++------
 src/miniconda/test-project/test.sh     |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/miniconda/.devcontainer/Dockerfile b/src/miniconda/.devcontainer/Dockerfile
index e6b1ecda6..f4e4e15b9 100644
--- a/src/miniconda/.devcontainer/Dockerfile
+++ b/src/miniconda/.devcontainer/Dockerfile
@@ -6,13 +6,11 @@ FROM continuumio/miniconda3 as upstream
     # https://github.com/advisories/<CVE_ID>
     # <package_name> = <version>
 
-RUN conda install \
-    # https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
-    cryptography==42.0.2
-
 RUN python3 -m pip install --upgrade \
-    # installed for compatibility with cryptography v42.0.2
-    pyopenssl==24.0.0
+    # https://github.com/advisories/GHSA-6vqw-3v5j-54x4
+    cryptography==42.0.4 \
+    # installed for compatibility with cryptography v42.0.4
+    pyopenssl==24.0.0 
 
 # Reset and copy updated files with updated privs to keep image size down
 FROM mcr.microsoft.com/devcontainers/base:1-bullseye
diff --git a/src/miniconda/test-project/test.sh b/src/miniconda/test-project/test.sh
index 525ae9366..24563e213 100755
--- a/src/miniconda/test-project/test.sh
+++ b/src/miniconda/test-project/test.sh
@@ -18,11 +18,11 @@ check "gitconfig-contains-name" sh -c "cat /etc/gitconfig | grep 'name = devcont
 
 check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
 
-checkPythonPackageVersion "cryptography" "42.0.2"
+checkPythonPackageVersion "cryptography" "42.0.4"
 checkPythonPackageVersion "setuptools" "65.5.1"
 checkPythonPackageVersion "wheel" "0.38.1"
 
-checkCondaPackageVersion "cryptography" "42.0.2"
+checkCondaPackageVersion "cryptography" "42.0.4"
 checkCondaPackageVersion "pyopenssl" "24.0.0"
 checkCondaPackageVersion "setuptools" "65.5.1"
 checkCondaPackageVersion "wheel" "0.38.1"