[FAB-10195] Bump to latest fabric

This change updates the imported code from fabric to the
latest versions commits in master.

Change-Id: Ibc2d15c5371d2df34cd4ba55fcf45debe02fc792
Signed-off-by: Troy Ronda <troy@troyronda.com>

Author: troyronda

Makefile

@@ -66,7 +66,7 @@ FABRIC_DEV_REGISTRY_PRE_CMD ?= docker login -u docker -p docker nexus3.hyperledg
 THIRDPARTY_FABRIC_CA_BRANCH ?= master
 THIRDPARTY_FABRIC_CA_COMMIT ?= v1.1.0
 THIRDPARTY_FABRIC_BRANCH    ?= master
-THIRDPARTY_FABRIC_COMMIT    ?= a8cc2c46d8cec1ad199741c0630a46ccb24084ac
+THIRDPARTY_FABRIC_COMMIT    ?= d78be9f4567d98e8c14542446a85ec5f8fcb5e5a
 
 # Force removal of images in cleanup (overridable)
 FIXTURE_DOCKER_REMOVE_FORCE ?= false

internal/github.com/hyperledger/fabric-ca/lib/streamer/jsonstreamer.go

@@ -47,8 +47,8 @@ type SearchElement struct {
 // For each element of this array, it streams one element at a time.
 func StreamJSONArray(decoder *json.Decoder, path string, cb func(*json.Decoder) error) error {
 	ses := []SearchElement{
-		{Path: path, CB: cb},
-		{Path: "errors", CB: errCB},
+		SearchElement{Path: path, CB: cb},
+		SearchElement{Path: "errors", CB: errCB},
 	}
 	return StreamJSON(decoder, ses)
 }

internal/github.com/hyperledger/fabric-ca/util/csp.go

@@ -142,7 +142,6 @@ func ImportBCCSPKeyFromPEM(keyFile string, myCSP core.CryptoSuite, temporary boo
 // ImportBCCSPKeyFromPEMBytes attempts to create a private BCCSP key from a pem byte slice
 func ImportBCCSPKeyFromPEMBytes(keyBuff []byte, myCSP core.CryptoSuite, temporary bool) (core.Key, error) {
 	keyFile := "pem bytes"
-
 	key, err := factory.PEMtoPrivateKey(keyBuff, nil)
 	if err != nil {
 		return nil, errors.WithMessage(err, fmt.Sprintf("Failed parsing private key from %s", keyFile))

internal/github.com/hyperledger/fabric-ca/util/util.go

@@ -31,17 +31,16 @@ import (
 	"io/ioutil"
 	"math/big"
 	mrand "math/rand"
-
-	factory "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/cryptosuitebridge"
-	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
-
 	"net/http"
 	"path/filepath"
 	"reflect"
 	"regexp"
 	"strings"
 	"time"
 
+	factory "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/cryptosuitebridge"
+	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
+
 	"github.com/pkg/errors"
 
 	"golang.org/x/crypto/ocsp"
@@ -312,7 +311,7 @@ func GetMaskedURL(url string) string {
 				matchStr = strings.Replace(matchStr, matches[idx], "****", 1)
 			}
 		}
-		url = url[:matchIdxs[0]] + matchStr + url[matchIdxs[1]:]
+		url = url[:matchIdxs[0]] + matchStr + url[matchIdxs[1]:len(url)]
 	}
 	return url
 }

internal/github.com/hyperledger/fabric/bccsp/factory/sw/swfactory.go

@@ -59,7 +59,7 @@ func (f *SWFactory) Get(swOpts *SwOpts) (bccsp.BCCSP, error) {
 		ks = sw.NewDummyKeyStore()
 	}
 
-	return sw.New(swOpts.SecLevel, swOpts.HashFamily, ks)
+	return sw.NewWithParams(swOpts.SecLevel, swOpts.HashFamily, ks)
 }
 
 // SwOpts contains options for the SWFactory

internal/github.com/hyperledger/fabric/bccsp/pkcs11/impl.go

@@ -41,7 +41,7 @@ var (
 	sessionCacheSize = 10
 )
 
-// New returns a new instance of the software-based BCCSP
+// NewWithParams returns a new instance of the software-based BCCSP
 // set at the passed security level, hash family and KeyStore.
 func New(opts PKCS11Opts, keyStore bccsp.KeyStore) (bccsp.BCCSP, error) {
 	// Init config
@@ -51,7 +51,7 @@ func New(opts PKCS11Opts, keyStore bccsp.KeyStore) (bccsp.BCCSP, error) {
 		return nil, errors.Wrapf(err, "Failed initializing configuration")
 	}
 
-	swCSP, err := sw.New(opts.SecLevel, opts.HashFamily, keyStore)
+	swCSP, err := sw.NewWithParams(opts.SecLevel, opts.HashFamily, keyStore)
 	if err != nil {
 		return nil, errors.Wrapf(err, "Failed initializing fallback SW BCCSP")
 	}

internal/github.com/hyperledger/fabric/bccsp/signer/signer.go

@@ -21,11 +21,10 @@ package signer
 
 import (
 	"crypto"
+	"io"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/core"
 
-	"io"
-
 	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
 	"github.com/pkg/errors"
 )

internal/github.com/hyperledger/fabric/bccsp/sw/fileks.go

@@ -292,7 +292,7 @@ func (ks *fileBasedKeyStore) storePrivateKey(alias string, privateKey interface{
 		return err
 	}
 
-	err = ioutil.WriteFile(ks.getPathForAlias(alias, "sk"), rawKey, 0700)
+	err = ioutil.WriteFile(ks.getPathForAlias(alias, "sk"), rawKey, 0600)
 	if err != nil {
 		logger.Errorf("Failed storing private key [%s]: [%s]", alias, err)
 		return err
@@ -308,7 +308,7 @@ func (ks *fileBasedKeyStore) storePublicKey(alias string, publicKey interface{})
 		return err
 	}
 
-	err = ioutil.WriteFile(ks.getPathForAlias(alias, "pk"), rawKey, 0700)
+	err = ioutil.WriteFile(ks.getPathForAlias(alias, "pk"), rawKey, 0600)
 	if err != nil {
 		logger.Errorf("Failed storing private key [%s]: [%s]", alias, err)
 		return err
@@ -324,7 +324,7 @@ func (ks *fileBasedKeyStore) storeKey(alias string, key []byte) error {
 		return err
 	}
 
-	err = ioutil.WriteFile(ks.getPathForAlias(alias, "key"), pem, 0700)
+	err = ioutil.WriteFile(ks.getPathForAlias(alias, "key"), pem, 0600)
 	if err != nil {
 		logger.Errorf("Failed storing key [%s]: [%s]", alias, err)
 		return err