From dcf2893b221220b10d4313d39cc64bcce18d6021 Mon Sep 17 00:00:00 2001
From: James Howe <675056+OrangeDog@users.noreply.github.com>
Date: Tue, 10 May 2022 12:06:01 +0100
Subject: [PATCH 1/2] Update BouncyCastle version.

---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index f543ca9e3..52771a858 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,8 +21,7 @@ configure(allprojects) { project ->
 	ext.slf4jVersion = "1.7.29"
 	ext.springVersion = "4.3.25.RELEASE"
 	ext.springSecurityVersion = "4.2.13.RELEASE"
-	ext.bcprovVersion = "1.64"
-	ext.bcpkixVersion = "1.64"
+	ext.bouncyCastleVersion = "1.71"
 	ext.openSamlVersion = "2.6.6"
 	ext.openSamlXmlSec = "1.5.8"
 	ext.esapiVersion = "2.2.0.0"

From a54e1086f778482d5d54f68f9d71f6a7a14d21f5 Mon Sep 17 00:00:00 2001
From: James Howe <675056+OrangeDog@users.noreply.github.com>
Date: Tue, 10 May 2022 12:07:15 +0100
Subject: [PATCH 2/2] Update BouncyCastle version

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 573acdd9e..ed6499376 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -20,8 +20,8 @@ dependencies {
 		exclude(group: "org.apache.velocity", module: 'velocity')
 	}
 	compile group: 'org.apache.velocity', name: 'velocity-engine-core', version: '2.0'
-	compile group:'org.bouncycastle', name:'bcprov-jdk15on', version: "$bcprovVersion"
-	compile group:'org.bouncycastle', name:'bcpkix-jdk15on', version: "$bcpkixVersion"
+	compile group:'org.bouncycastle', name:'bcprov-jdk18on', version: "$bouncyCastleVersion"
+	compile group:'org.bouncycastle', name:'bcpkix-jdk18on', version: "$bouncyCastleVersion"
 	compile group: 'org.apache.santuario', name: 'xmlsec', version: "$openSamlXmlSec"
 	compile (group:'org.owasp.esapi', name:'esapi', version: "$esapiVersion") {
 		exclude(group: 'org.beanshell', module: 'bsh-core')