From a6f307c6b543b295a1bc773397836f4f35916e88 Mon Sep 17 00:00:00 2001
From: Robert Parker <parrobe@uk.ibm.com>
Date: Thu, 30 May 2019 16:19:50 +0100
Subject: [PATCH] Remove openssl

---
 install-mq-server-prereqs.sh          | 5 ++---
 internal/keystore/keystore.go         | 9 ---------
 mq-advanced-server-rhel/mq-buildah.sh | 1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/install-mq-server-prereqs.sh b/install-mq-server-prereqs.sh
index 7d46faa..5bf4747 100644
--- a/install-mq-server-prereqs.sh
+++ b/install-mq-server-prereqs.sh
@@ -59,12 +59,11 @@ if ($UBUNTU); then
     procps \
     sed \
     tar \
-    util-linux \
-    openssl
+    util-linux 
 fi
 
 if ($RPM); then
-  EXTRA_RPMS="bash bc ca-certificates coreutils file findutils gawk glibc-common grep passwd procps-ng sed shadow-utils tar util-linux which openssl"
+  EXTRA_RPMS="bash bc ca-certificates coreutils file findutils gawk glibc-common grep passwd procps-ng sed shadow-utils tar util-linux which"
   # Install additional packages required by MQ, this install process and the runtime scripts
   $YUM && yum -y install --setopt install_weak_deps=false ${EXTRA_RPMS}
   $MICRODNF && microdnf install --nodocs ${EXTRA_RPMS}
diff --git a/internal/keystore/keystore.go b/internal/keystore/keystore.go
index be2c174..cc8c3d4 100644
--- a/internal/keystore/keystore.go
+++ b/internal/keystore/keystore.go
@@ -140,15 +140,6 @@ func (ks *KeyStore) CreateStash() error {
 	return nil
 }
 
-// GeneratePKCS12 generates a PKCS12 file
-func (ks *KeyStore) GeneratePKCS12(keyFile, crtFile, pkcs12File, label, password string) error {
-	out, _, err := command.Run("openssl", "pkcs12", "-export", "-inkey", keyFile, "-in", crtFile, "-out", pkcs12File, "-name", label, "-passout", "pass:"+password)
-	if err != nil {
-		return fmt.Errorf("error running \"openssl pkcs12 -export\": %v %s", err, out)
-	}
-	return nil
-}
-
 // Import imports a certificate file in the keystore
 func (ks *KeyStore) Import(inputFile, password string) error {
 	out, _, err := command.Run(ks.command, "-cert", "-import", "-file", inputFile, "-pw", password, "-target", ks.Filename, "-target_pw", ks.Password, "-target_type", ks.keyStoreType)
diff --git a/mq-advanced-server-rhel/mq-buildah.sh b/mq-advanced-server-rhel/mq-buildah.sh
index 98a532e..94222ed 100755
--- a/mq-advanced-server-rhel/mq-buildah.sh
+++ b/mq-advanced-server-rhel/mq-buildah.sh
@@ -86,7 +86,6 @@ buildah run ${ctr_mq} -- microdnf ${microdnf_opts} install \
   shadow-utils \
   tar \
   util-linux \
-  openssl \
   which
 
 # Install "sudo" if using MQ Advanced for Developers