Merge "[FAB-6465] Fix client ID library for v1.0"

hyperledger · Oct 10, 2017 · eb297c7 · eb297c7
2 parents ac1afd9 + 1ced8bc
commit eb297c7
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/core/chaincode/lib/cid/cid.go b/core/chaincode/lib/cid/cid.go
@@ -145,12 +145,8 @@ func (c *clientIdentityImpl) init() error {
 	c.mspID = signingID.GetMspid()
 	idbytes := signingID.GetIdBytes()
 	block, _ := pem.Decode(idbytes)
-	if block == nil || block.Type != "CERTIFICATE" {
-		bt := "none"
-		if block != nil {
-			bt = block.Type
-		}
-		return errors.Errorf("unexpected PEM block found. Expected a certificate but found a block of type: %s", bt)
+	if block == nil {
+		return errors.New("Expecting a PEM-encoded X509 certificate; PEM block not found")
 	}
 	cert, err := x509.ParseCertificate(block.Bytes)
 	if err != nil {