[FAB-13164] Revert Fix pkcs11 UT Failures

This reverts commit af5e9f0.

Change-Id: I8ef54da8f2040450fc82e44fd6c5089cc109a9f5
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

Makefile

@@ -17,7 +17,6 @@
 #   - orderer - builds a native fabric orderer binary
 #   - release - builds release packages for the host platform
 #   - release-all - builds release packages for all target platforms
-#   - softhsm2_initialization - generates softhsm2 tokens used in pkcs11 test
 #   - unit-test - runs the go-test based unit tests
 #   - verify - runs unit tests for only the changed package tree
 #   - profile - runs unit tests for all packages in coverprofile mode (slow)
@@ -184,10 +183,7 @@ ccenv: $(BUILD_DIR)/image/ccenv/$(DUMMY)
 integration-test: gotool.ginkgo ccenv docker-thirdparty
 	./scripts/run-integration-tests.sh
 
-softhsm2_initialization:
-	./scripts/config_softhsm2.sh
-
-unit-test: unit-test-clean peer-docker softhsm2_initialization docker-thirdparty ccenv
+unit-test: unit-test-clean peer-docker docker-thirdparty ccenv
 	unit-test/run.sh
 
 unit-tests: unit-test

devenv/setupRHELonZ.sh

@@ -36,10 +36,6 @@ fi
 iptables -I INPUT 1 -j ACCEPT
 sysctl vm.overcommit_memory=1
 
-##################
-# Install softhsm2
-yum install softhsm -y
-
 ##################
 # Install Docker
 cd /tmp

devenv/setupUbuntuOnPPC64le.sh

@@ -39,7 +39,7 @@ fi
 # Install pre-requisite OS packages #
 #####################################
 apt-get update
-apt-get -y install software-properties-common curl git sudo wget "build-essential" zlib1g-dev libbz2-dev softhsm2
+apt-get -y install software-properties-common curl git sudo wget "build-essential" zlib1g-dev libbz2-dev
 
 #####################################
 # Install and setup Docker services #

docs/source/dev-setup/devenv.rst

@@ -55,14 +55,6 @@ Prerequisites
 -  Note: The BIOS Enabled Virtualization may be within the CPU or
    Security settings of the BIOS
 
--  (macOS) `Install softhsm on Mac OSX <http://macappstore.org/softhsm/>`__.You can
-   use Homebrew to install it as follows:
-
-::
-
-    brew install softhsm
-
-
 ``pip``
 ~~~~~~