From dd11e2435188a3bb0bf65ba6b3c3673ae861f5a8 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Wed, 23 Oct 2024 20:29:42 +0200
Subject: [PATCH] Bugfixes

---
 pom.xml                                       |  7 ++++-
 .../core/JettyAlpnSslEngineSubstitutions.java | 29 ++++++++++++++-----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 899f8a0..4811ca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <properties>
     <revision>1.0.0-SNAPSHOT</revision>
     <maven.compiler.release>23</maven.compiler.release>
-    <native.maven.plugin.version>0.9.28</native.maven.plugin.version>
+    <native.maven.plugin.version>0.10.3</native.maven.plugin.version>
     <gestalt.version>0.32.2</gestalt.version>
     <rocksdb.version>9.6.1</rocksdb.version>
     <slf4j.version>2.0.12</slf4j.version>
@@ -419,6 +419,11 @@
           <version>${rainbowgum.version}</version>
           <scope>compile</scope>
         </dependency>
+        <dependency>
+          <groupId>org.graalvm.sdk</groupId>
+          <artifactId>nativeimage</artifactId>
+          <version>23.1.0</version>
+        </dependency>
       </dependencies>
       <build>
         <plugins>
diff --git a/src/native/java/it/cavallium/rockserver/core/JettyAlpnSslEngineSubstitutions.java b/src/native/java/it/cavallium/rockserver/core/JettyAlpnSslEngineSubstitutions.java
index 04b2b9e..195ada9 100644
--- a/src/native/java/it/cavallium/rockserver/core/JettyAlpnSslEngineSubstitutions.java
+++ b/src/native/java/it/cavallium/rockserver/core/JettyAlpnSslEngineSubstitutions.java
@@ -181,6 +181,7 @@ final class Target_io_netty_handler_ssl_JdkSslServerContext {
 			ClientAuth clientAuth,
 			String[] protocols,
 			boolean startTls,
+			SecureRandom secureRandom,
 			String keyStore) throws SSLException {
 	}
 }
@@ -189,11 +190,21 @@ final class Target_io_netty_handler_ssl_JdkSslServerContext {
 final class Target_io_netty_handler_ssl_JdkSslClientContext {
 
 	@Alias
-	Target_io_netty_handler_ssl_JdkSslClientContext(Provider sslContextProvider, X509Certificate[] trustCertCollection,
-			TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key,
-			String keyPassword, KeyManagerFactory keyManagerFactory, Iterable<String> ciphers,
-			CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, String[] protocols,
-			long sessionCacheSize, long sessionTimeout, String keyStoreType) throws SSLException {
+	Target_io_netty_handler_ssl_JdkSslClientContext(Provider sslContextProvider,
+			X509Certificate[] trustCertCollection,
+			TrustManagerFactory trustManagerFactory,
+			X509Certificate[] keyCertChain,
+			PrivateKey key,
+			String keyPassword,
+			KeyManagerFactory keyManagerFactory,
+			Iterable<String> ciphers,
+			CipherSuiteFilter cipherFilter,
+			ApplicationProtocolConfig apn,
+			String[] protocols,
+			long sessionCacheSize,
+			long sessionTimeout,
+			SecureRandom secureRandom,
+			String keyStoreType) throws SSLException {
 	}
 }
 
@@ -250,6 +261,7 @@ final class Target_io_netty_handler_ssl_SslContext {
 			String[] protocols,
 			boolean startTls,
 			boolean enableOcsp,
+			SecureRandom secureRandom,
 			String keyStoreType,
 			Map.Entry<SslContextOption<?>, Object>... ctxOptions) throws SSLException {
 		if (enableOcsp) {
@@ -258,7 +270,7 @@ final class Target_io_netty_handler_ssl_SslContext {
 		return (SslContext) (Object) new Target_io_netty_handler_ssl_JdkSslServerContext(sslContextProvider,
 				trustCertCollection, trustManagerFactory, keyCertChain, key, keyPassword,
 				keyManagerFactory, ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout, clientAuth, protocols,
-				startTls, keyStoreType);
+				startTls, secureRandom, keyStoreType);
 	}
 
 	@Substitute
@@ -267,14 +279,15 @@ final class Target_io_netty_handler_ssl_SslContext {
 			TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword,
 			KeyManagerFactory keyManagerFactory, Iterable<String> ciphers, CipherSuiteFilter cipherFilter,
 			ApplicationProtocolConfig apn, String[] protocols, long sessionCacheSize, long sessionTimeout,
-			boolean enableOcsp, String keyStoreType, Map.Entry<SslContextOption<?>, Object>... options) throws SSLException {
+			boolean enableOcsp, SecureRandom secureRandom, String keyStoreType,
+			Map.Entry<SslContextOption<?>, Object>... options) throws SSLException {
 		if (enableOcsp) {
 			throw new IllegalArgumentException("OCSP is not supported with this SslProvider: " + provider);
 		}
 		return (SslContext) (Object) new Target_io_netty_handler_ssl_JdkSslClientContext(sslContextProvider,
 				trustCert, trustManagerFactory, keyCertChain, key, keyPassword,
 				keyManagerFactory, ciphers, cipherFilter, apn, protocols, sessionCacheSize,
-				sessionTimeout, keyStoreType);
+				sessionTimeout, secureRandom, keyStoreType);
 	}
 
 }