diff --git a/client/pom.xml b/client/pom.xml
index 1995158d8b7..d1a95b0aea2 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -564,6 +564,11 @@
bcpkix-jdk15on
${cs.bcprov.version}
+
+ org.bouncycastle
+ bctls-jdk15on
+ ${cs.bcprov.version}
+
@@ -751,6 +756,12 @@
false
${project.build.directory}/lib
+
+ org.bouncycastle
+ bctls-jdk15on
+ false
+ ${project.build.directory}/lib
+
@@ -786,6 +797,7 @@
org.apache.geronimo.specs:geronimo-javamail_1.4_spec
org.bouncycastle:bcprov-jdk15on
org.bouncycastle:bcpkix-jdk15on
+ org.bouncycastle:bctls-jdk15on
mysql:mysql-connector-java
diff --git a/plugins/integrations/kubernetes-service/pom.xml b/plugins/integrations/kubernetes-service/pom.xml
index 5cff3d3aa2e..4be08f276cc 100644
--- a/plugins/integrations/kubernetes-service/pom.xml
+++ b/plugins/integrations/kubernetes-service/pom.xml
@@ -126,6 +126,11 @@
bcprov-jdk15on
${cs.bcprov.version}
+
+ org.bouncycastle
+ bctls-jdk15on
+ ${cs.bcprov.version}
+
joda-time
joda-time
diff --git a/pom.xml b/pom.xml
index 5e77126b22d..10448b56e23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
1.2.8
1.4
1.14
- 1.64
+ 1.70
3.3.0
8.18
3.2.14
@@ -554,6 +554,11 @@
bcprov-jdk15on
${cs.bcprov.version}
+
+ org.bouncycastle
+ bctls-jdk15on
+ ${cs.bcprov.version}
+
org.codehaus.groovy
groovy-all
diff --git a/services/console-proxy/rdpconsole/pom.xml b/services/console-proxy/rdpconsole/pom.xml
index d0f7c78e6be..35dcfadb5d7 100644
--- a/services/console-proxy/rdpconsole/pom.xml
+++ b/services/console-proxy/rdpconsole/pom.xml
@@ -48,6 +48,10 @@
org.bouncycastle
bcprov-jdk15on
+
+ org.bouncycastle
+ bctls-jdk15on
+
com.sun.xml.security
xml-security-impl
diff --git a/services/console-proxy/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java b/services/console-proxy/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java
index 3d6635c7f5e..39aaba9e340 100644
--- a/services/console-proxy/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java
+++ b/services/console-proxy/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java
@@ -17,12 +17,13 @@
package streamer.bco;
import org.apache.log4j.Logger;
-import org.bouncycastle.crypto.tls.Certificate;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.ServerOnlyTlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.tls.DefaultTlsClient;
+import org.bouncycastle.tls.ServerOnlyTlsAuthentication;
+import org.bouncycastle.tls.TlsAuthentication;
+import org.bouncycastle.tls.TlsClientProtocol;
+import org.bouncycastle.tls.TlsServerCertificate;
+import org.bouncycastle.tls.crypto.impl.bc.BcTlsCrypto;
import streamer.Direction;
import streamer.Event;
import streamer.SocketWrapperImpl;
@@ -60,18 +61,18 @@ public class BcoSocketWrapperImpl extends SocketWrapperImpl {
try {
- SecureRandom secureRandom = new SecureRandom();
- bcoSslSocket = new TlsClientProtocol(socket.getInputStream(), socket.getOutputStream(), secureRandom);
+ bcoSslSocket = new TlsClientProtocol(socket.getInputStream(), socket.getOutputStream());
- bcoSslSocket.connect(new DefaultTlsClient() {
+ bcoSslSocket.connect(new DefaultTlsClient(new BcTlsCrypto(new SecureRandom())) {
@Override
public TlsAuthentication getAuthentication() throws IOException {
return new ServerOnlyTlsAuthentication() {
@Override
- public void notifyServerCertificate(final Certificate certificate) throws IOException {
+ public void notifyServerCertificate(final TlsServerCertificate certificate) throws IOException {
try {
if (sslState != null) {
- sslState.serverCertificateSubjectPublicKeyInfo = certificate.getCertificateAt(0).getSubjectPublicKeyInfo().getEncoded();
+ sslState.serverCertificateSubjectPublicKeyInfo =
+ certificate.getCertificate().getCertificateAt(0).getEncoded();
}
} catch (IOException e) {
throw new RuntimeException("Cannot get server public key.", e);
diff --git a/utils/pom.xml b/utils/pom.xml
index 9fcacb16511..8b0cf07a79b 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -70,6 +70,10 @@
org.bouncycastle
bcpkix-jdk15on
+
+ org.bouncycastle
+ bctls-jdk15on
+
com.jcraft
jsch