From 27ff45ecabcef881ffde7fd61a457e3c90d1a69c Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Thu, 21 Dec 2023 11:08:56 +0100
Subject: [PATCH] Move BouncyCastle implementation of hpke to an extra module
 (#20)

Motivation:

We should not depend on BouncyCastle in our OHTTP implementation as its an implementation detail and alterantive implementations will be added.

Modifications:

Move Bouncycastle implementation to extra module and only depend on it for tests.

Result:

No bouncycastle dependency for ohttp codec
---
 codec-ohttp-hpke-bouncycastle/pom.xml         | 90 +++++++++++++++++++
 .../BouncyCastleAEADCryptoContext.java        |  0
 .../BouncyCastleAsymmetricCipherKeyPair.java  |  0
 .../BouncyCastleAsymmetricKeyParameter.java   |  0
 .../BouncyCastleCryptoOperation.java          |  0
 .../bouncycastle/BouncyCastleHPKEContext.java |  0
 .../BouncyCastleHPKERecipientContext.java     |  0
 .../BouncyCastleHPKESenderContext.java        |  0
 .../BouncyCastleOHttpCryptoProvider.java      |  0
 .../codec/hpke/bouncycastle/package-info.java |  0
 codec-ohttp/pom.xml                           |  6 ++
 pom.xml                                       |  1 +
 12 files changed, 97 insertions(+)
 create mode 100644 codec-ohttp-hpke-bouncycastle/pom.xml
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAEADCryptoContext.java (100%)
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricCipherKeyPair.java (100%)
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricKeyParameter.java (100%)
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleCryptoOperation.java (100%)
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKEContext.java (100%)
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKERecipientContext.java (100%)
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKESenderContext.java (100%)
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleOHttpCryptoProvider.java (100%)
 rename {codec-ohttp-hpke => codec-ohttp-hpke-bouncycastle}/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/package-info.java (100%)

diff --git a/codec-ohttp-hpke-bouncycastle/pom.xml b/codec-ohttp-hpke-bouncycastle/pom.xml
new file mode 100644
index 0000000..f29fb9f
--- /dev/null
+++ b/codec-ohttp-hpke-bouncycastle/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2023 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~   https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+<modelVersion>4.0.0</modelVersion>
+<parent>
+    <groupId>io.netty.incubator</groupId>
+    <artifactId>netty-incubator-codec-parent-ohttp</artifactId>
+    <version>0.0.3.Final-SNAPSHOT</version>
+</parent>
+
+<artifactId>netty-incubator-codec-ohttp-hpke-bouncycastle</artifactId>
+<version>0.0.3.Final-SNAPSHOT</version>
+<name>Netty/Incubator/Codec/OHTTP/HPKE/BouncyCastle</name>
+<packaging>jar</packaging>
+
+<properties>
+    <javaModuleName>io.netty.incubator.codec.ohttp.hpke.bouncycastle</javaModuleName>
+</properties>
+
+<build>
+    <plugins>
+        <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>3.2.0</version>
+            <executions>
+                <execution>
+                    <id>default-jar</id>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                            <manifestEntries>
+                                <Automatic-Module-Name>${javaModuleName}</Automatic-Module-Name>
+                            </manifestEntries>
+                            <index>true</index>
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        </archive>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
+
+<dependencies>
+    <dependency>
+        <groupId>io.netty.incubator</groupId>
+        <artifactId>netty-incubator-codec-ohttp-hpke</artifactId>
+        <version>${project.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-buffer</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcpkix-jdk18on</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <scope>test</scope>
+    </dependency>
+</dependencies>
+</project>
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAEADCryptoContext.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAEADCryptoContext.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAEADCryptoContext.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAEADCryptoContext.java
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricCipherKeyPair.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricCipherKeyPair.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricCipherKeyPair.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricCipherKeyPair.java
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricKeyParameter.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricKeyParameter.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricKeyParameter.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleAsymmetricKeyParameter.java
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleCryptoOperation.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleCryptoOperation.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleCryptoOperation.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleCryptoOperation.java
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKEContext.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKEContext.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKEContext.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKEContext.java
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKERecipientContext.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKERecipientContext.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKERecipientContext.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKERecipientContext.java
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKESenderContext.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKESenderContext.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKESenderContext.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleHPKESenderContext.java
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleOHttpCryptoProvider.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleOHttpCryptoProvider.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleOHttpCryptoProvider.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/BouncyCastleOHttpCryptoProvider.java
diff --git a/codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/package-info.java b/codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/package-info.java
similarity index 100%
rename from codec-ohttp-hpke/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/package-info.java
rename to codec-ohttp-hpke-bouncycastle/src/main/java/io/netty/incubator/codec/hpke/bouncycastle/package-info.java
diff --git a/codec-ohttp/pom.xml b/codec-ohttp/pom.xml
index c54f888..3195de1 100644
--- a/codec-ohttp/pom.xml
+++ b/codec-ohttp/pom.xml
@@ -103,5 +103,11 @@
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.netty.incubator</groupId>
+      <artifactId>netty-incubator-codec-ohttp-hpke-bouncycastle</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 9e18f23..fbb4c02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@
     <module>codec-ohttp</module>
     <module>codec-bhttp</module>
     <module>codec-ohttp-hpke</module>
+    <module>codec-ohttp-hpke-bouncycastle</module>
   </modules>
   <properties>
     <javaModuleName />