From 46873d9d3cfec4a6ff06fc0969db5b4d557b924f Mon Sep 17 00:00:00 2001
From: MohamedSabthar <sabthar@wso2.com>
Date: Fri, 20 Oct 2023 10:25:30 +0530
Subject: [PATCH 1/2] [Automated] Update the native jar versions

---
 ballerina/Ballerina.toml    | 8 ++++----
 ballerina/Dependencies.toml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
index 2bf90cde..d3c4a6f8 100644
--- a/ballerina/Ballerina.toml
+++ b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "crypto"
-version = "2.2.2"
+version = "2.2.3"
 authors = ["Ballerina"]
 keywords = ["security", "hash", "hmac", "sign", "encrypt", "decrypt", "private key", "public key"]
 repository = "https://github.com/ballerina-platform/module-ballerina-crypto"
@@ -10,10 +10,10 @@ license = ["Apache-2.0"]
 distribution = "2201.0.4"
 
 [[platform.java11.dependency]]
-path = "../native/build/libs/crypto-native-2.2.2.jar"
+path = "../native/build/libs/crypto-native-2.2.3-SNAPSHOT.jar"
 
 [[platform.java11.dependency]]
-path = "./lib/bcpkix-jdk15on-1.69.jar"
+path = "./lib/bcpkix-jdk18on-1.74.jar"
 
 [[platform.java11.dependency]]
-path = "./lib/bcprov-jdk15on-1.69.jar"
+path = "./lib/bcprov-jdk18on-1.74.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
index d1bc0747..fc8adeb9 100644
--- a/ballerina/Dependencies.toml
+++ b/ballerina/Dependencies.toml
@@ -9,7 +9,7 @@ dependencies-toml-version = "2"
 [[package]]
 org = "ballerina"
 name = "crypto"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "test"},
@@ -42,7 +42,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.2.2"
+version = "2.2.5"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]

From 1edbb3591d6878c0459c7257b592dbbc364e02fc Mon Sep 17 00:00:00 2001
From: MohamedSabthar <sabthar@wso2.com>
Date: Fri, 20 Oct 2023 10:29:30 +0530
Subject: [PATCH 2/2] Update Bouncy Castle version

---
 ballerina/build.gradle                | 4 ++--
 build-config/resources/Ballerina.toml | 4 ++--
 changelog.md                          | 5 +++++
 gradle.properties                     | 4 ++--
 native/build.gradle                   | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ballerina/build.gradle b/ballerina/build.gradle
index e0415e15..a53bb0cf 100644
--- a/ballerina/build.gradle
+++ b/ballerina/build.gradle
@@ -67,10 +67,10 @@ configurations {
 }
 
 dependencies {
-    externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}") {
+    externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}") {
         transitive = false
     }
-    externalJars(group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}") {
+    externalJars(group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: "${bouncycastleVersion}") {
         transitive = false
     }
 }
diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
index 5f561cd3..984380ad 100644
--- a/build-config/resources/Ballerina.toml
+++ b/build-config/resources/Ballerina.toml
@@ -13,7 +13,7 @@ distribution = "2201.0.4"
 path = "../native/build/libs/crypto-native-@project.version@.jar"
 
 [[platform.java11.dependency]]
-path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar"
+path = "./lib/bcpkix-jdk18on-@bouncycastle.version@.jar"
 
 [[platform.java11.dependency]]
-path = "./lib/bcprov-jdk15on-@bouncycastle.version@.jar"
+path = "./lib/bcprov-jdk18on-@bouncycastle.version@.jar"
diff --git a/changelog.md b/changelog.md
index 8cf1f5d9..665adfa2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,11 @@ This file contains all the notable changes done to the Ballerina Crypto package
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+- [Fix trivy scan failure due to CVE-2023-33201](https://github.com/ballerina-platform/ballerina-standard-library/issues/4776)
+
 ## [2.0.0] - 2021-10-10
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
index 5ae900f4..94ae7c9e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
-version=2.2.2
+version=2.2.3-SNAPSHOT
 puppycrawlCheckstyleVersion=8.18
-bouncycastleVersion=1.69
+bouncycastleVersion=1.74
 ballerinaGradlePluginVersion=0.14.1
 
 ballerinaLangVersion=2201.0.4
diff --git a/native/build.gradle b/native/build.gradle
index 8e386dd2..83905879 100644
--- a/native/build.gradle
+++ b/native/build.gradle
@@ -29,8 +29,8 @@ dependencies {
 
     implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}"
     implementation group: 'io.ballerina.stdlib', name: 'time-native', version: "${stdlibTimeVersion}"
-    implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}"
-    implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}"
+    implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}"
+    implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: "${bouncycastleVersion}"
 }
 
 checkstyle {