Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for IBMJSSE2 into grpc-java #7422

Merged
merged 8 commits into from Sep 16, 2020
Merged

Add support for IBMJSSE2 into grpc-java #7422

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
44ef7bb
Update GrpcSslContexts.java
kiwi1969 Sep 13, 2020
80c1bef
Add files via upload
kiwi1969 Sep 13, 2020
e9f5bc5
Delete grpc-netty-shaded-1.33.0-SNAPSHOT.jar
kiwi1969 Sep 13, 2020
d47497b
Update GrpcSslContexts.java
kiwi1969 Sep 13, 2020
9a7eca4
Update GrpcSslContexts.java
kiwi1969 Sep 13, 2020
143ccbd
Prebuilt jar for IBMJSEE testing
kiwi1969 Sep 13, 2020
10b9089
Delete grpc-netty-shaded-1.33.0-SNAPSHOT.jar
kiwi1969 Sep 14, 2020
dc4b905
Update GrpcSslContexts.java
kiwi1969 Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion netty/src/main/java/io/grpc/netty/GrpcSslContexts.java
View file
Open in desktop
Expand Up @@ -82,6 +82,7 @@ private GrpcSslContexts() {}
NEXT_PROTOCOL_VERSIONS);

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.
Expand Down Expand Up @@ -196,7 +197,14 @@ public static SslContextBuilder configure(SslContextBuilder builder, Provider jd
apc = ALPN;
} else {
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(
sanjaypujare marked this conversation as resolved.
Show resolved Hide resolved
jdkProvider.getName() + " selected, but Java 9+ ALPN unavailable");
}
} else if (ConscryptLoader.isConscrypt(jdkProvider)) {
apc = ALPN;
Expand Down Expand Up @@ -243,6 +251,10 @@ private static Provider findJdkProvider() {
|| JettyTlsUtil.isJava9AlpnAvailable()) {
return provider;
}
} else if (IBM_PROVIDER_NAME.equals(provider.getName())) {
sanjaypujare marked this conversation as resolved.
Show resolved Hide resolved
if (JettyTlsUtil.isJava9AlpnAvailable()) {
return provider;
}
} else if (ConscryptLoader.isConscrypt(provider)) {
return provider;
}
Expand Down