Merge pull request #232 from APegaDavis/add-bc-jars-for-infinity-25

Include bc jars for Infinity 25+

Author: APegaDavis

Dockerfile

@@ -217,23 +217,31 @@ RUN apt-get update && \
     gpg --import /keys/prometheus.asc && \
     gpg --verify /tmp/jmx_prometheus_javaagent-0.18.0.jar.asc /opt/pega/prometheus/jmx_prometheus_javaagent.jar && \
     rm /tmp/jmx_prometheus_javaagent-0.18.0.jar.asc && \
-    curl -sL -o /opt/pega/bcfips/bc-fips-2.0.0.jar https://repo1.maven.org/maven2/org/bouncycastle/bc-fips/2.0.0/bc-fips-2.0.0.jar && \
-    curl -sL -o /tmp/bc-fips-2.0.0.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bc-fips/2.0.0/bc-fips-2.0.0.jar.asc && \
-    curl -sL -o /opt/pega/bcfips/bctls-fips-2.0.19.jar https://repo1.maven.org/maven2/org/bouncycastle/bctls-fips/2.0.19/bctls-fips-2.0.19.jar && \
-    curl -sL -o /tmp/bctls-fips-2.0.19.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bctls-fips/2.0.19/bctls-fips-2.0.19.jar.asc && \
-    curl -sL -o /opt/pega/bcfips/bcpkix-fips-2.0.7.jar https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-fips/2.0.7/bcpkix-fips-2.0.7.jar && \
-    curl -sL -o /tmp/bcpkix-fips-2.0.7.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-fips/2.0.7/bcpkix-fips-2.0.7.jar.asc && \
-    curl -sL -o /opt/pega/bcfips/bcutil-fips-2.0.3.jar https://repo1.maven.org/maven2/org/bouncycastle/bcutil-fips/2.0.3/bcutil-fips-2.0.3.jar && \
-    curl -sL -o /tmp/bcutil-fips-2.0.3.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bcutil-fips/2.0.3/bcutil-fips-2.0.3.jar.asc && \
+    curl -sL -o /opt/pega/bcfips/bc-fips-2.1.0.jar https://repo1.maven.org/maven2/org/bouncycastle/bc-fips/2.1.0/bc-fips-2.1.0.jar && \
+    curl -sL -o /tmp/bc-fips-2.1.0.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bc-fips/2.1.0/bc-fips-2.1.0.jar.asc && \
+    curl -sL -o /opt/pega/bcfips/bctls-fips-2.1.20.jar https://repo1.maven.org/maven2/org/bouncycastle/bctls-fips/2.1.20/bctls-fips-2.1.20.jar && \
+    curl -sL -o /tmp/bctls-fips-2.1.20.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bctls-fips/2.1.20/bctls-fips-2.1.20.jar.asc && \
+    curl -sL -o /opt/pega/bcfips/bcpkix-fips-2.1.9.jar https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-fips/2.1.9/bcpkix-fips-2.1.9.jar && \
+    curl -sL -o /tmp/bcpkix-fips-2.1.9.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-fips/2.1.9/bcpkix-fips-2.1.9.jar.asc && \
+    curl -sL -o /opt/pega/bcfips/bcutil-fips-2.1.4.jar https://repo1.maven.org/maven2/org/bouncycastle/bcutil-fips/2.1.4/bcutil-fips-2.1.4.jar && \
+    curl -sL -o /tmp/bcutil-fips-2.1.4.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bcutil-fips/2.1.4/bcutil-fips-2.1.4.jar.asc && \
+    curl -sL -o /opt/pega/bcfips/bcmail-fips-2.1.6.jar https://repo1.maven.org/maven2/org/bouncycastle/bcmail-fips/2.1.6/bcmail-fips-2.1.6.jar && \
+    curl -sL -o /tmp/bcmail-fips-2.1.6.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bcmail-fips/2.1.6/bcmail-fips-2.1.6.jar.asc && \
+    curl -sL -o /opt/pega/bcfips/bcpg-fips-2.1.10.jar https://repo1.maven.org/maven2/org/bouncycastle/bcpg-fips/2.1.10/bcpg-fips-2.1.10.jar && \
+    curl -sL -o /tmp/bcpg-fips-2.1.10.jar.asc https://repo1.maven.org/maven2/org/bouncycastle/bcpg-fips/2.1.10/bcpg-fips-2.1.10.jar.asc && \
     gpg --import /keys/bc_maven_public_key.asc && \
-    gpg --verify /tmp/bc-fips-2.0.0.jar.asc /opt/pega/bcfips/bc-fips-2.0.0.jar && \
-    rm /tmp/bc-fips-2.0.0.jar.asc && \
-    gpg --verify /tmp/bctls-fips-2.0.19.jar.asc /opt/pega/bcfips/bctls-fips-2.0.19.jar && \
-    rm /tmp/bctls-fips-2.0.19.jar.asc && \
-    gpg --verify /tmp/bcpkix-fips-2.0.7.jar.asc /opt/pega/bcfips/bcpkix-fips-2.0.7.jar && \
-    rm /tmp/bcpkix-fips-2.0.7.jar.asc  && \
-    gpg --verify /tmp/bcutil-fips-2.0.3.jar.asc /opt/pega/bcfips/bcutil-fips-2.0.3.jar && \
-    rm /tmp/bcutil-fips-2.0.3.jar.asc && \
+    gpg --verify /tmp/bc-fips-2.1.0.jar.asc /opt/pega/bcfips/bc-fips-2.1.0.jar && \
+    rm /tmp/bc-fips-2.1.0.jar.asc && \
+    gpg --verify /tmp/bctls-fips-2.1.20.jar.asc /opt/pega/bcfips/bctls-fips-2.1.20.jar && \
+    rm /tmp/bctls-fips-2.1.20.jar.asc && \
+    gpg --verify /tmp/bcpkix-fips-2.1.9.jar.asc /opt/pega/bcfips/bcpkix-fips-2.1.9.jar && \
+    rm /tmp/bcpkix-fips-2.1.9.jar.asc  && \
+    gpg --verify /tmp/bcutil-fips-2.1.4.jar.asc /opt/pega/bcfips/bcutil-fips-2.1.4.jar && \
+    rm /tmp/bcutil-fips-2.1.4.jar.asc && \
+    gpg --verify /tmp/bcmail-fips-2.1.6.jar.asc /opt/pega/bcfips/bcmail-fips-2.1.6.jar && \
+    rm /tmp/bcmail-fips-2.1.6.jar.asc && \
+    gpg --verify /tmp/bcpg-fips-2.1.10.jar.asc /opt/pega/bcfips/bcpg-fips-2.1.10.jar && \
+    rm /tmp/bcpg-fips-2.1.10.jar.asc && \
     apt-get autoremove --purge -y gpg && \
     chgrp -R 0 /opt/pega/prometheus && \
     chmod -R g+rw /opt/pega/prometheus && \

tomcat-bin/setenv.sh

@@ -41,10 +41,12 @@ else
   echo "No krb5.conf was specified in ${krb5_conf}."
 fi
 
-if [ "${FIPS_140_3_MODE}" == "true" ]; then
-  JAVA_OPTS="${JAVA_OPTS} -Dorg.bouncycastle.fips.approved_only=true"
+if [ "${IS_PEGA_25_OR_LATER}" == "true" ]; then
   export CLASSPATH="/opt/pega/bcfips/*"
-  HIGHLY_SECURE_CRYPTO_MODE_ENABLED=true
+  if [ "${FIPS_140_3_MODE}" == "true" ]; then
+    JAVA_OPTS="${JAVA_OPTS} -Dorg.bouncycastle.fips.approved_only=true"
+    HIGHLY_SECURE_CRYPTO_MODE_ENABLED=true
+  fi
 fi
 
 if [ "${HIGHLY_SECURE_CRYPTO_MODE_ENABLED}" == "true" ]; then