From d86cfb33cdfa09ae57a32303a3be722404e73739 Mon Sep 17 00:00:00 2001
From: Christopher Broderick <uhurusurfa@gmail.com>
Date: Sun, 17 Mar 2024 17:07:46 +0000
Subject: [PATCH] Support ECDSA encryption (#363)

* Update release documentation for new version.

* Translate Elliptic Curve identifier extracted from certificate to be
compatible with BouncyCastle library.

* Fix tabs
---
 RELEASE-NOTES.md                                     | 12 ++++++------
 Remote/pom.xml                                       |  2 +-
 Server/pom.xml                                       |  2 +-
 .../java/org/openas2/lib/helper/BCCryptoHelper.java  |  4 ++++
 changes.txt                                          |  6 ++++++
 pom.xml                                              | 12 ++++++------
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 34664f3e..d0fad0fd 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,19 +1,19 @@
 #              OpenAS2 Server
-#              Version 3.9.1
+#              Version 3.10.0
 #              RELEASE NOTES
 -----
-The OpenAS2 project is pleased to announce the release of OpenAS2 3.9.1
+The OpenAS2 project is pleased to announce the release of OpenAS2 3.10.0
 
-The release download file is: OpenAS2Server-3.9.1.zip
+The release download file is: OpenAS2Server-3.10.0.zip
 
 The zip file contains a PDF document (OpenAS2HowTo.pdf) providing information on installing and using the application.
 ## NOTE: Testing covers Java 8 to 17. The application should work for older versions down to Java 7 but they are not tested as part of the CI/CD pipeline.
 
-Version 3.9.1 - 2024-02-06
-This is a minor bugfix release:
+Version 3.10.0 - 2024-03-17
+This is an enhancement release:
        **IMPORTANT NOTE**: Please review upgrade notes below if you are upgrading
 
- 1. Fix persistence to errordir after all resend attempts fail.
+ 1. Support Elliptic Curve algorithm.
 
 ##Upgrade Notes
  See the openAS2HowTo appendix for the general process on upgrading OpenAS2.
diff --git a/Remote/pom.xml b/Remote/pom.xml
index dd42d664..034abe1f 100644
--- a/Remote/pom.xml
+++ b/Remote/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>3.9.1</version>
+        <version>3.10.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/Server/pom.xml b/Server/pom.xml
index 110d7086..6fe25dd0 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -7,7 +7,7 @@
         <!-- DO NOT CHANGE THIS "groupId" WITHOUT CHANGING XMLSession.getManifestAttributes.MANIFEST_VENDOR_ID_ATTRIB -->
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>3.9.1</version>
+        <version>3.10.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Server/src/main/java/org/openas2/lib/helper/BCCryptoHelper.java b/Server/src/main/java/org/openas2/lib/helper/BCCryptoHelper.java
index 51d835da..e53eca77 100644
--- a/Server/src/main/java/org/openas2/lib/helper/BCCryptoHelper.java
+++ b/Server/src/main/java/org/openas2/lib/helper/BCCryptoHelper.java
@@ -290,6 +290,10 @@ public MimeBodyPart sign(MimeBodyPart part, Certificate cert, Key key, String di
         X509Certificate x509Cert = castCertificate(cert);
         PrivateKey privKey = castKey(key);
         String encryptAlg = cert.getPublicKey().getAlgorithm();
+        if (encryptAlg.equalsIgnoreCase("EC")) {
+            // Adjust algorithm name to support Elliptic Curve in Bouncy Castle
+            encryptAlg = "ECDSA";
+        }
 
         SMIMESignedGenerator sGen = new SMIMESignedGenerator(adjustDigestToOldName ? SMIMESignedGenerator.RFC3851_MICALGS : SMIMESignedGenerator.RFC5751_MICALGS);
         sGen.setContentTransferEncoding(getEncoding(contentTxfrEncoding));
diff --git a/changes.txt b/changes.txt
index 22989d43..2d99d079 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,9 @@
+Version 3.10.0 - 2024-03-17
+This is an enhancement release:
+       **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
+
+ 1. Support Elliptic Curve algorithm.
+
 Version 3.9.1 - 2024-02-06
 This is a minor bugfix release:
        **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
diff --git a/pom.xml b/pom.xml
index b7ecdb18..3b649f32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.openas2</groupId>
     <artifactId>OpenAS2</artifactId>
-    <version>3.9.1</version>
+    <version>3.10.0</version>
     <name>OpenAS2</name>
     <packaging>pom</packaging>
 
@@ -171,13 +171,13 @@
            <dependency>
                <groupId>com.fasterxml.jackson.core</groupId>
                <artifactId>jackson-databind</artifactId>
-               <version>2.16.1</version>
+               <version>2.17.0</version>
                <type>jar</type>
            </dependency>
 		   <dependency>
 		        <groupId>com.fasterxml.jackson.module</groupId>
 		        <artifactId>jackson-module-jaxb-annotations</artifactId>
-		        <version>2.16.1</version>
+		        <version>2.17.0</version>
 		   </dependency>
            <dependency>
                <groupId>org.glassfish.jersey.media</groupId>
@@ -199,17 +199,17 @@
            <dependency>
                <groupId>com.sun.xml.bind</groupId>
                <artifactId>jaxb-core</artifactId>
-               <version>4.0.4</version>
+               <version>4.0.5</version>
            </dependency>
            <dependency>
                <groupId>com.sun.xml.bind</groupId>
                <artifactId>jaxb-impl</artifactId>
-               <version>4.0.4</version>
+               <version>4.0.5</version>
            </dependency>
             <dependency>
                 <groupId>io.sentry</groupId>
                 <artifactId>sentry</artifactId>
-                <version>7.3.0</version>
+                <version>7.6.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>