From 296f3821ee8436ea8a311709c0a89e198b19466c Mon Sep 17 00:00:00 2001
From: Amir Vakili <114409643+amirhosv@users.noreply.github.com>
Date: Wed, 30 Aug 2023 10:15:56 -0400
Subject: [PATCH] Release candidate for version 2.3.1 (#324)

---
 CHANGELOG.md                                 | 10 ++++++++++
 aws-lc                                       |  2 +-
 build.gradle                                 |  2 +-
 examples/gradle-kt-dsl/lib/build.gradle.kts  |  2 +-
 tests/ci/codebuild/run_accp_legacy_build.yml | 10 ++++++++++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d96ada65..29e84b11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.3.1
+
+### Patches
+* Use AWS-LC [v1.15.0](https://github.com/aws/aws-lc/releases/tag/v1.15.0) for ACCP
+  * RSA performance on Graviton 2 has improved in version v1.15.0 of AWS-LC.
+  * For more details, please refer to [the release notes for v1.15.0](https://github.com/aws/aws-lc/releases/tag/v1.15.0)
+* Use [fips-2022-11-02](https://github.com/aws/aws-lc/tree/fips-2022-11-02) branch of AWS-LC at commit ID `d780e5e025c47cd782fd3d5d70a033e59fe80166` for ACCP-FIPS
+* Round RSA key sizes up when generating keys for ACCP [PR 321](https://github.com/corretto/amazon-corretto-crypto-provider/pull/321)
+* Throwing exceptions for too-short signatures [PR 320](https://github.com/corretto/amazon-corretto-crypto-provider/pull/320)
+
 ## 2.3.0
 
 ### Overview
diff --git a/aws-lc b/aws-lc
index 161e7470..aa90e509 160000
--- a/aws-lc
+++ b/aws-lc
@@ -1 +1 @@
-Subproject commit 161e747063dcb16e71d299190f072a26c0a56294
+Subproject commit aa90e509f2e940916fbe9fdd469a4c90c51824f6
diff --git a/build.gradle b/build.gradle
index 3b94a094..d0a79e6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ plugins {
 }
 
 group = 'software.amazon.cryptools'
-version = '2.3.0'
+version = '2.3.1'
 ext.isFips = Boolean.getBoolean('FIPS')
 ext.isLegacyBuild = Boolean.getBoolean('LEGACY_BUILD')
 
diff --git a/examples/gradle-kt-dsl/lib/build.gradle.kts b/examples/gradle-kt-dsl/lib/build.gradle.kts
index 584b5473..ffef1dfe 100644
--- a/examples/gradle-kt-dsl/lib/build.gradle.kts
+++ b/examples/gradle-kt-dsl/lib/build.gradle.kts
@@ -1,4 +1,4 @@
-val accpVersion = "2.3.0"
+val accpVersion = "2.3.1"
 val accpLocalJar: String by project
 val fips: Boolean by project
 
diff --git a/tests/ci/codebuild/run_accp_legacy_build.yml b/tests/ci/codebuild/run_accp_legacy_build.yml
index 627e04bb..7b8f14e2 100644
--- a/tests/ci/codebuild/run_accp_legacy_build.yml
+++ b/tests/ci/codebuild/run_accp_legacy_build.yml
@@ -4,6 +4,16 @@
 version: 0.2
 
 phases:
+  install:
+    commands:
+      - apt-get -y install curl
+      - mkdir go_tmp && cd go_tmp
+      - curl https://dl.google.com/go/go1.18.3.linux-amd64.tar.gz --output go.tar.gz
+      - tar -xf go.tar.gz
+      - mv go ../go_root && cd ..
   build:
     commands:
+      - export GOROOT=$(pwd)/go_root
+      - export GO111MODULE=on
+      - export PATH=$GOROOT/bin:$PATH
       - ./gradlew -DLEGACY_BUILD=true -DJAVA_HOME=$JAVA_HOME -DJAVA_MAJOR_VERSION=11 -DTEST_JAVA_HOME=$JAVA_HOME -DENABLE_NATIVE_TEST_HOOKS=ON release