andreacavalli/rockserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Andrea Cavalli 2024-10-23 20:29:42 +02:00
parent d34f225b55
commit dd11e24351
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -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>

29
src/native/java/it/cavallium/rockserver/core/JettyAlpnSslEngineSubstitutions.java
View File

@ -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);
}
}