From 190689603893f1746b6d6fe3e148e668c7ef5a28 Mon Sep 17 00:00:00 2001
From: Robert Parker <parrobe@uk.ibm.com>
Date: Fri, 24 Aug 2018 09:32:41 +0100
Subject: [PATCH] Fix TestDevSecure on RHEL

---
 Makefile-UBUNTU                                      |  2 +-
 test/docker/devconfig_test.go                        |  1 +
 test/docker/devconfig_test_util.go                   |  2 ++
 .../main/java/com/ibm/mqcontainer/test/JMSTests.java | 12 +++++++++---
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Makefile-UBUNTU b/Makefile-UBUNTU
index a24847a..4ff4c65 100644
--- a/Makefile-UBUNTU
+++ b/Makefile-UBUNTU
@@ -154,7 +154,7 @@ build-devjmstest:
 .PHONY: test-devserver
 test-devserver: test/docker/vendor
 	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on $(shell docker --version)"$(END)))
-	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)
+	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) IBMJRE=true go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)
 
 coverage:
 	mkdir coverage
diff --git a/test/docker/devconfig_test.go b/test/docker/devconfig_test.go
index 933100e..711e9ee 100644
--- a/test/docker/devconfig_test.go
+++ b/test/docker/devconfig_test.go
@@ -70,6 +70,7 @@ func TestDevSecure(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+
 	const tlsPassPhrase string = "passw0rd"
 	qm := "qm1"
 	appPassword := "differentPassw0rd"
diff --git a/test/docker/devconfig_test_util.go b/test/docker/devconfig_test_util.go
index 1ca662a..77afe15 100644
--- a/test/docker/devconfig_test_util.go
+++ b/test/docker/devconfig_test_util.go
@@ -26,6 +26,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httputil"
+	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -86,6 +87,7 @@ func runJMSTests(t *testing.T, cli *client.Client, ID string, tls bool, user, pa
 			"MQ_PORT_1414_TCP_ADDR=" + getIPAddress(t, cli, ID),
 			"MQ_USERNAME=" + user,
 			"MQ_CHANNEL=DEV.APP.SVRCONN",
+			"IBMJRE=" + os.Getenv("IBMJRE"),
 		},
 		Image: imageNameDevJMS(),
 	}
diff --git a/test/messaging/src/main/java/com/ibm/mqcontainer/test/JMSTests.java b/test/messaging/src/main/java/com/ibm/mqcontainer/test/JMSTests.java
index df0575d..4bc115e 100644
--- a/test/messaging/src/main/java/com/ibm/mqcontainer/test/JMSTests.java
+++ b/test/messaging/src/main/java/com/ibm/mqcontainer/test/JMSTests.java
@@ -84,9 +84,15 @@ class JMSTests {
         else {
             LOGGER.info(String.format("Using TLS.  Trust store=%s", TRUSTSTORE));
             SSLSocketFactory ssl = createSSLSocketFactory();
-            factory.setSSLSocketFactory(ssl);
-            factory.setSSLCipherSuite("SSL_RSA_WITH_AES_128_CBC_SHA256");
-            // LOGGER.info(Arrays.toString(ssl.getSupportedCipherSuites()));
+            factory.setSSLSocketFactory(ssl); 
+            boolean ibmjre = System.getenv("IBMJRE").equals("true");
+            if (ibmjre){
+                System.setProperty("com.ibm.mq.cfg.useIBMCipherMappings", "true");
+                factory.setSSLCipherSuite("SSL_RSA_WITH_AES_128_CBC_SHA256");
+            } else {
+                 System.setProperty("com.ibm.mq.cfg.useIBMCipherMappings", "false");
+                 factory.setSSLCipherSuite("TLS_RSA_WITH_AES_128_CBC_SHA256");
+            }
         }
         // Give up if unable to reconnect for 10 minutes
         // factory.setClientReconnectTimeout(600);