From a0898e61f392a6757ecb4ab3d8f455b7c476cbf5 Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <vpaprots@ca.ibm.com>
Date: Tue, 24 Jan 2017 18:13:33 -0500
Subject: [PATCH] [FAB-1648] Install SoftHSM for testing PKCS11 CSP

Made part of the testenv docker image. Might be easier in baseimage
but testenv is really intended for testing.

Unresolved question is how fabric-ca and fabric-sdk gets softhsm

Change-Id: I9cbb5590f23705b29c0cd0f80afdcc7920572072
Signed-off-by: Volodymyr Paprotski <vpaprots@ca.ibm.com>
---
 Makefile                           |  3 ++-
 images/testenv/Dockerfile.in       |  4 ++++
 images/testenv/install-softhsm2.sh | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100755 images/testenv/install-softhsm2.sh

diff --git a/Makefile b/Makefile
index 8ffbead82ca..37237ac6a89 100644
--- a/Makefile
+++ b/Makefile
@@ -192,7 +192,8 @@ build/image/testenv/payload:    build/gotools.tar.bz2 \
 				orderer/orderer.yaml \
 				build/docker/bin/peer \
 				peer/core.yaml \
-				build/msp-sampleconfig.tar.bz2
+				build/msp-sampleconfig.tar.bz2 \
+				images/testenv/install-softhsm2.sh
 build/image/runtime/payload:    build/docker/busybox
 build/image/zookeeper/payload:  images/zookeeper/docker-entrypoint.sh
 build/image/kafka/payload:      images/kafka/docker-entrypoint.sh
diff --git a/images/testenv/Dockerfile.in b/images/testenv/Dockerfile.in
index d691119f725..417ef100028 100644
--- a/images/testenv/Dockerfile.in
+++ b/images/testenv/Dockerfile.in
@@ -21,5 +21,9 @@ ADD payload/msp-sampleconfig.tar.bz2 $PEER_CFG_PATH
 COPY payload/orderer /usr/local/bin
 COPY payload/peer /usr/local/bin
 
+# softhsm2
+COPY payload/install-softhsm2.sh /tmp
+RUN bash /tmp/install-softhsm2.sh && rm -f install-softhsm2.sh
+
 # typically, this is mapped to a developer's dev environment
 WORKDIR /opt/gopath/src/github.com/hyperledger/fabric
diff --git a/images/testenv/install-softhsm2.sh b/images/testenv/install-softhsm2.sh
new file mode 100755
index 00000000000..8f76b1157f0
--- /dev/null
+++ b/images/testenv/install-softhsm2.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+ARCH=`uname -m`
+
+if [ $ARCH = "s390x" ]; then
+  echo "deb http://ftp.us.debian.org/debian sid main" >> /etc/apt/sources.list
+fi
+
+# Install softhsm2 package
+apt-get update
+apt-get -y install softhsm2
+
+# Create tokens directory
+mkdir -p /var/lib/softhsm/tokens/
+
+#Initialize token
+softhsm2-util --init-token --slot 0 --label "ForFabric" --so-pin 1234 --pin 98765432