grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netty: Add support for IBMJSSE2 (#7422) 

This is a very simple change to test for IBMJSSE2 security provider in addition to the others. IBM JRE does not support the Sun provider, but instead has IBMJSSE2 which supports the same API calls.

I tested this on Z/OS machine as now it works when before it couldn't find a security provider
This commit is contained in:
Russell Shaw 2020-09-16 11:07:52 -04:00 committed by GitHub
parent ee5b5929d5
commit 5879b53c57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
netty/src/main/java/io/grpc/netty/GrpcSslContexts.java
View File

@ -82,6 +82,7 @@ public class GrpcSslContexts {
NEXT_PROTOCOL_VERSIONS); NEXT_PROTOCOL_VERSIONS);
private static final String SUN_PROVIDER_NAME = "SunJSSE"; private static final String SUN_PROVIDER_NAME = "SunJSSE";
private static final String IBM_PROVIDER_NAME = "IBMJSSE2";
/** /**
* Creates an SslContextBuilder with ciphers and APN appropriate for gRPC. * Creates an SslContextBuilder with ciphers and APN appropriate for gRPC.
@ -196,7 +197,14 @@ public class GrpcSslContexts {
apc = ALPN; apc = ALPN;
} else { } else {
throw new IllegalArgumentException( throw new IllegalArgumentException(
SUN_PROVIDER_NAME + " selected, but Java 9+ and Jetty NPN/ALPN unavailable"); jdkProvider.getName() + " selected, but Java 9+ and Jetty NPN/ALPN unavailable");
}
} else if (IBM_PROVIDER_NAME.equals(jdkProvider.getName())) {
if (JettyTlsUtil.isJava9AlpnAvailable()) {
apc = ALPN;
} else {
throw new IllegalArgumentException(
jdkProvider.getName() + " selected, but Java 9+ ALPN unavailable");
} }
} else if (ConscryptLoader.isConscrypt(jdkProvider)) { } else if (ConscryptLoader.isConscrypt(jdkProvider)) {
apc = ALPN; apc = ALPN;
@ -243,6 +251,10 @@ public class GrpcSslContexts {
|| JettyTlsUtil.isJava9AlpnAvailable()) { || JettyTlsUtil.isJava9AlpnAvailable()) {
return provider; return provider;
} }
} else if (IBM_PROVIDER_NAME.equals(provider.getName())) {
if (JettyTlsUtil.isJava9AlpnAvailable()) {
return provider;
}
} else if (ConscryptLoader.isConscrypt(provider)) { } else if (ConscryptLoader.isConscrypt(provider)) {
return provider; return provider;
} }