Remove openssl
This commit is contained in:
committed by
Arthur Barr
parent
6f677e2a59
commit
a6f307c6b5
@@ -59,12 +59,11 @@ if ($UBUNTU); then
|
|||||||
procps \
|
procps \
|
||||||
sed \
|
sed \
|
||||||
tar \
|
tar \
|
||||||
util-linux \
|
util-linux
|
||||||
openssl
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ($RPM); then
|
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
|
# Install additional packages required by MQ, this install process and the runtime scripts
|
||||||
$YUM && yum -y install --setopt install_weak_deps=false ${EXTRA_RPMS}
|
$YUM && yum -y install --setopt install_weak_deps=false ${EXTRA_RPMS}
|
||||||
$MICRODNF && microdnf install --nodocs ${EXTRA_RPMS}
|
$MICRODNF && microdnf install --nodocs ${EXTRA_RPMS}
|
||||||
|
|||||||
@@ -140,15 +140,6 @@ func (ks *KeyStore) CreateStash() error {
|
|||||||
return nil
|
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
|
// Import imports a certificate file in the keystore
|
||||||
func (ks *KeyStore) Import(inputFile, password string) error {
|
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)
|
out, _, err := command.Run(ks.command, "-cert", "-import", "-file", inputFile, "-pw", password, "-target", ks.Filename, "-target_pw", ks.Password, "-target_type", ks.keyStoreType)
|
||||||
|
|||||||
@@ -86,7 +86,6 @@ buildah run ${ctr_mq} -- microdnf ${microdnf_opts} install \
|
|||||||
shadow-utils \
|
shadow-utils \
|
||||||
tar \
|
tar \
|
||||||
util-linux \
|
util-linux \
|
||||||
openssl \
|
|
||||||
which
|
which
|
||||||
|
|
||||||
# Install "sudo" if using MQ Advanced for Developers
|
# Install "sudo" if using MQ Advanced for Developers
|
||||||
|
|||||||
Reference in New Issue
Block a user