Skip to content

Commit a3eb4c1

Browse files
committed
fix: include gax changes
1 parent 5a0dc7a commit a3eb4c1

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

sdk-platform-java/gax-java/gax-grpc/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<dependency>
7171
<groupId>io.grpc</groupId>
7272
<artifactId>grpc-netty-shaded</artifactId>
73-
<scope>runtime</scope>
7473
</dependency>
7574
<dependency>
7675
<groupId>io.grpc</groupId>
@@ -131,6 +130,16 @@
131130
<groupId>com.google.protobuf</groupId>
132131
<artifactId>protobuf-java</artifactId>
133132
</dependency>
133+
<dependency>
134+
<groupId>org.bouncycastle</groupId>
135+
<artifactId>bcprov-jdk18on</artifactId>
136+
<version>1.84</version>
137+
</dependency>
138+
<dependency>
139+
<groupId>org.bouncycastle</groupId>
140+
<artifactId>bctls-jdk18on</artifactId>
141+
<version>1.84</version>
142+
</dependency>
134143
</dependencies>
135144

136145
<build>

sdk-platform-java/gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,12 +817,12 @@ public ManagedChannelBuilder<?> createDecoratedChannelBuilder() throws IOExcepti
817817
if (interceptorProvider != null) {
818818
builder.intercept(interceptorProvider.getInterceptors());
819819
}
820+
configurePqc(builder);
821+
820822
if (channelConfigurator != null) {
821823
builder = channelConfigurator.apply(builder);
822824
}
823825

824-
configurePqc(builder);
825-
826826
return builder;
827827
}
828828

@@ -846,9 +846,14 @@ private void configurePqc(ManagedChannelBuilder<?> builder) {
846846
ApplicationProtocolConfig.SelectedListenerFailureBehavior.ACCEPT,
847847
"h2");
848848

849+
java.security.Provider bcProvider = new org.bouncycastle.jce.provider.BouncyCastleProvider();
850+
java.security.Provider bcJsseProvider =
851+
new org.bouncycastle.jsse.provider.BouncyCastleJsseProvider(bcProvider);
852+
849853
SslContext shadedSslContext =
850854
SslContextBuilder.forClient()
851855
.sslProvider(SslProvider.JDK)
856+
.sslContextProvider(bcJsseProvider)
852857
.protocols("TLSv1.3")
853858
.applicationProtocolConfig(apn)
854859
.build();

0 commit comments

Comments
 (0)