From 823fb6b9c58350de78c8d0d0a5678a5ec91c878e Mon Sep 17 00:00:00 2001 From: rennman Date: Tue, 6 Mar 2018 13:42:48 -0500 Subject: [PATCH] [ FAB-8679 ] Permit samples to use RootCAs Fix USE_INTERMEDIATE_CA variable to allow exclusive use of RootCA for sample tests. Change-Id: If10f9a768ba17943f03b416f5a68edb9eb65a27a Signed-off-by: rennman --- fabric-ca/scripts/env.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fabric-ca/scripts/env.sh b/fabric-ca/scripts/env.sh index 8306967b..ca0ecfa2 100755 --- a/fabric-ca/scripts/env.sh +++ b/fabric-ca/scripts/env.sh @@ -127,7 +127,7 @@ function initOrgVars { ORG_ADMIN_CERT=${ORG_MSP_DIR}/admincerts/cert.pem ORG_ADMIN_HOME=/${DATA}/orgs/$ORG/admin - if $USE_INTERMEDIATE_CA; then + if test "$USE_INTERMEDIATE_CA" = "true"; then CA_NAME=$INT_CA_NAME CA_HOST=$INT_CA_HOST CA_CHAINFILE=$INT_CA_CHAINFILE @@ -169,7 +169,7 @@ function initOrdererVars { TLSDIR=$MYHOME/tls export ORDERER_GENERAL_TLS_PRIVATEKEY=$TLSDIR/server.key export ORDERER_GENERAL_TLS_CERTIFICATE=$TLSDIR/server.crt - export ORDERER_GENERAL_TLS_ROOTCAS=[$INT_CA_CHAINFILE] + export ORDERER_GENERAL_TLS_ROOTCAS=[$CA_CHAINFILE] } function genClientTLSCert { @@ -221,7 +221,7 @@ function initPeerVars { export CORE_LOGGING_LEVEL=DEBUG export CORE_PEER_TLS_ENABLED=true export CORE_PEER_TLS_CLIENTAUTHREQUIRED=true - export CORE_PEER_TLS_ROOTCERT_FILE=$INT_CA_CHAINFILE + export CORE_PEER_TLS_ROOTCERT_FILE=$CA_CHAINFILE export CORE_PEER_TLS_CLIENTCERT_FILE=/$DATA/tls/$PEER_NAME-cli-client.crt export CORE_PEER_TLS_CLIENTKEY_FILE=/$DATA/tls/$PEER_NAME-cli-client.key export CORE_PEER_PROFILE_ENABLED=true