From bbee1b283bc92105727f49c81ce629627a2da4dd Mon Sep 17 00:00:00 2001 From: Anil Ambati Date: Thu, 25 Jan 2018 10:34:46 -0500 Subject: [PATCH] [FAB-7908] Change hf.admin attr to admin Recently, Fabric CA was changed to restrict custom attributes from starting with "hf." prefix. But fabric-ca sample was using hf.admin custom attribute. Hence it was failing. This change set changes custom attribute "hf.admin" to "admin". Change-Id: I6c9324e62717c26aab3c2d308d9fb098ecd2fb65 Signed-off-by: Anil Ambati --- fabric-ca/scripts/setup-fabric.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fabric-ca/scripts/setup-fabric.sh b/fabric-ca/scripts/setup-fabric.sh index 5507e4ad3c..fc22678dfc 100755 --- a/fabric-ca/scripts/setup-fabric.sh +++ b/fabric-ca/scripts/setup-fabric.sh @@ -49,8 +49,8 @@ function registerOrdererIdentities { COUNT=$((COUNT+1)) done log "Registering admin identity with $CA_NAME" - # The admin identity has the "hf.admin" attribute which is added to ECert by default - fabric-ca-client register -d --id.name $ADMIN_NAME --id.secret $ADMIN_PASS --id.attrs "hf.admin=true:ecert" + # The admin identity has the "admin" attribute which is added to ECert by default + fabric-ca-client register -d --id.name $ADMIN_NAME --id.secret $ADMIN_PASS --id.attrs "admin=true:ecert" done } @@ -67,8 +67,8 @@ function registerPeerIdentities { COUNT=$((COUNT+1)) done log "Registering admin identity with $CA_NAME" - # The admin identity has the "hf.admin" attribute which is added to ECert by default - fabric-ca-client register -d --id.name $ADMIN_NAME --id.secret $ADMIN_PASS --id.attrs "hf.Registrar.Roles=client,hf.Registrar.Attributes=*,hf.Revoker=true,hf.GenCRL=true,hf.admin=true:ecert,abac.init=true:ecert" + # The admin identity has the "admin" attribute which is added to ECert by default + fabric-ca-client register -d --id.name $ADMIN_NAME --id.secret $ADMIN_PASS --id.attrs "hf.Registrar.Roles=client,hf.Registrar.Attributes=*,hf.Revoker=true,hf.GenCRL=true,admin=true:ecert,abac.init=true:ecert" log "Registering user identity with $CA_NAME" fabric-ca-client register -d --id.name $USER_NAME --id.secret $USER_PASS done