27
27
import java .security .PrivateKey ;
28
28
import java .security .Provider ;
29
29
import java .security .cert .X509Certificate ;
30
+ import java .util .Map ;
30
31
import javax .net .ssl .KeyManagerFactory ;
31
32
import javax .net .ssl .SSLEngine ;
32
33
import javax .net .ssl .SSLException ;
45
46
import io .netty .handler .ssl .JdkAlpnApplicationProtocolNegotiator ;
46
47
import io .netty .handler .ssl .JdkApplicationProtocolNegotiator ;
47
48
import io .netty .handler .ssl .SslContext ;
49
+ import io .netty .handler .ssl .SslContextOption ;
48
50
import io .netty .handler .ssl .SslProvider ;
49
51
import io .netty .util .concurrent .GlobalEventExecutor ;
50
52
import io .netty .util .internal .logging .InternalLoggerFactory ;
@@ -179,7 +181,7 @@ static SslContext newServerContextInternal(SslProvider provider,
179
181
X509Certificate [] keyCertChain , PrivateKey key , String keyPassword , KeyManagerFactory keyManagerFactory ,
180
182
Iterable <String > ciphers , CipherSuiteFilter cipherFilter , ApplicationProtocolConfig apn ,
181
183
long sessionCacheSize , long sessionTimeout , ClientAuth clientAuth , String [] protocols , boolean startTls ,
182
- boolean enableOcsp , String keyStoreType )
184
+ boolean enableOcsp , String keyStoreType , Map . Entry < SslContextOption <?>, Object >... ctxOptions )
183
185
throws SSLException
184
186
{
185
187
@@ -200,7 +202,7 @@ static SslContext newClientContextInternal(
200
202
X509Certificate [] trustCert , TrustManagerFactory trustManagerFactory ,
201
203
X509Certificate [] keyCertChain , PrivateKey key , String keyPassword , KeyManagerFactory keyManagerFactory ,
202
204
Iterable <String > ciphers , CipherSuiteFilter cipherFilter , ApplicationProtocolConfig apn , String [] protocols ,
203
- long sessionCacheSize , long sessionTimeout , boolean enableOcsp , String keyStoreType ) throws SSLException
205
+ long sessionCacheSize , long sessionTimeout , boolean enableOcsp , String keyStoreType , Map . Entry < SslContextOption <?>, Object >... options ) throws SSLException
204
206
{
205
207
if (enableOcsp ) {
206
208
throw new IllegalArgumentException ("OCSP is not supported with this SslProvider: " + provider );
0 commit comments