Only negotiate SSLIOP if it is required by a peer

jbosstm · Apr 7, 2016 · 96612f7 · 96612f7
1 parent bdd2b14
commit 96612f7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/iiop-openjdk/src/main/java/org/wildfly/iiop/openjdk/csiv2/CSIV2IORToSocketInfo.java b/iiop-openjdk/src/main/java/org/wildfly/iiop/openjdk/csiv2/CSIV2IORToSocketInfo.java
@@ -136,7 +136,10 @@ public CDRInputStream run() {
             }
         });
         in.consumeEndian();
-        return SSLHelper.read(in);
+        SSL ssl = SSLHelper.read(in);
+
+        // HACK: Previous versions advertise they support SSL when they do not
+        return ssl.target_requires > 0 ? ssl : null;
     }
 
     private TransportAddress selectSSLTransportAddress(IOR ior) {