Removing references to primitives init

This change-set removes references to primitives.SetSecurityLevel and primitives.InitSecurityLevel from core, peer and protos packages. References to those methods still remain in other packages and will be removed in subsequent change-sets. Change-Id: Ib9aa88aeb225cb705420a8d652e3939e58d5d6cb Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
hyperledger · Jan 9, 2017 · 7d1b541 · 7d1b541
1 parent 97066b5
commit 7d1b541
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 41 deletions.
diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
@@ -37,7 +37,6 @@ import (
 	putils "github.com/hyperledger/fabric/protos/utils"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
@@ -1091,8 +1090,6 @@ var signer msp.SigningIdentity
 func TestMain(m *testing.M) {
 	var err error
 
-	primitives.SetSecurityLevel("SHA2", 256)
-
 	// setup the MSP manager so that we can sign/verify
 	mspMgrConfigDir := "../../msp/sampleconfig/"
 	mspmgmt.LoadFakeSetupWithLocalMspAndTestChainMsp(mspMgrConfigDir)

diff --git a/core/crypto/primitives/hash.go b/core/crypto/primitives/hash.go
@@ -48,14 +48,6 @@ func Hash(msg []byte) []byte {
 	return h.Sum(nil)
 }
 
-// HMAC hmacs x using key key
-func HMAC(key, x []byte) []byte {
-	mac := hmac.New(GetDefaultHash(), key)
-	mac.Write(x)
-
-	return mac.Sum(nil)
-}
-
 // HMACTruncated hmacs x using key key and truncate to truncation
 func HMACTruncated(key, x []byte, truncation int) []byte {
 	mac := hmac.New(GetDefaultHash(), key)

diff --git a/core/endorser/endorser_test.go b/core/endorser/endorser_test.go
@@ -28,7 +28,6 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/container"
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/core/util"
@@ -77,12 +76,6 @@ func initPeer(chainID string) (net.Listener, error) {
 		return &pb.PeerEndpoint{ID: &pb.PeerID{Name: "testpeer"}, Address: peerAddress}, nil
 	}
 
-	// Install security object for peer
-	//TODO:  integrate new crypto / idp
-	securityLevel := viper.GetInt("security.level")
-	hashAlgorithm := viper.GetString("security.hashAlgorithm")
-	primitives.SetSecurityLevel(hashAlgorithm, securityLevel)
-
 	ccStartupTimeout := time.Duration(30000) * time.Millisecond
 	pb.RegisterChaincodeSupportServer(grpcServer, chaincode.NewChaincodeSupport(getPeerEndpoint, false, ccStartupTimeout))
 

diff --git a/core/peer/fullflow_test.go b/core/peer/fullflow_test.go
@@ -24,7 +24,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/core/util"
 	"github.com/hyperledger/fabric/msp"
@@ -314,7 +313,6 @@ var signerSerialized []byte
 
 func TestMain(m *testing.M) {
 	// setup crypto algorithms
-	primitives.SetSecurityLevel("SHA2", 256)
 	// setup the MSP manager so that we can sign/verify
 	mspMgrConfigDir := "../../msp/sampleconfig/"
 	err := mspmgmt.LoadFakeSetupWithLocalMspAndTestChainMsp(mspMgrConfigDir)

diff --git a/core/system_chaincode/escc/endorser_onevalidsignature_test.go b/core/system_chaincode/escc/endorser_onevalidsignature_test.go
@@ -24,7 +24,6 @@ import (
 	"os"
 
 	"github.com/hyperledger/fabric/core/chaincode/shim"
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/core/util"
@@ -275,9 +274,6 @@ func validateProposalResponse(prBytes []byte, proposal *pb.Proposal, visibility
 }
 
 func TestMain(m *testing.M) {
-	primitives.InitSecurityLevel("SHA2", 256)
-	// setup the MSP manager so that we can sign/verify
-	// TODO: determine the config file for the MSP
 	mspMgrConfigDir := "../../../msp/sampleconfig/"
 	mspmgmt.LoadFakeSetupWithLocalMspAndTestChainMsp(mspMgrConfigDir)
 

diff --git a/core/system_chaincode/vscc/validator_onevalidsignature_test.go b/core/system_chaincode/vscc/validator_onevalidsignature_test.go
@@ -22,7 +22,6 @@ import (
 	"os"
 
 	"github.com/hyperledger/fabric/core/chaincode/shim"
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/core/util"
 	"github.com/hyperledger/fabric/msp"
@@ -101,7 +100,6 @@ var sid []byte
 func TestMain(m *testing.M) {
 	var err error
 
-	primitives.InitSecurityLevel("SHA2", 256)
 	// setup the MSP manager so that we can sign/verify
 	mspMgrConfigDir := "../../../msp/sampleconfig/"
 	mspmgmt.LoadFakeSetupWithLocalMspAndTestChainMsp(mspMgrConfigDir)

diff --git a/peer/common/common.go b/peer/common/common.go
@@ -22,7 +22,6 @@ import (
 	"path/filepath"
 
 	"github.com/hyperledger/fabric/common/flogging"
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/core/errors"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/peer/msp"
@@ -62,10 +61,6 @@ func InitConfig(cmdRoot string) error {
 
 //InitCrypto initializes crypto for this peer
 func InitCrypto(mspMgrConfigDir string) error {
-	// Init the crypto layer
-	//TODO: integrate new crypto / idp code
-	primitives.SetSecurityLevel("SHA2", 256)
-
 	// FIXME: when this peer joins a chain, it should get the
 	// config for that chain with the list of MSPs that the
 	// chain uses; however this is not yet implemented.

diff --git a/peer/main.go b/peer/main.go
@@ -30,7 +30,6 @@ import (
 
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/core"
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/peer/chaincode"
 	"github.com/hyperledger/fabric/peer/clilogging"
 	"github.com/hyperledger/fabric/peer/common"
@@ -98,10 +97,6 @@ func main() {
 	// initialize logging format from core.yaml
 	flogging.SetLoggingFormat(viper.GetString("logging.format"), logOutput)
 
-	// Init the crypto layer
-	//TODO: integrate new crypto / idp code
-	primitives.SetSecurityLevel("SHA2", 256)
-
 	// Init the MSP
 	// TODO: determine the location of this config file
 	var mspMgrConfigDir string

diff --git a/protos/testutils/txtestutils.go b/protos/testutils/txtestutils.go
@@ -22,7 +22,6 @@ import (
 
 	"path/filepath"
 
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/common"
@@ -36,7 +35,6 @@ var (
 
 func init() {
 	var err error
-	primitives.SetSecurityLevel("SHA2", 256)
 	// setup the MSP manager so that we can sign/verify
 	mspMgrConfigDir, err := getMSPMgrConfigDir()
 	if err != nil {

diff --git a/protos/utils/proputils_test.go b/protos/utils/proputils_test.go
@@ -25,7 +25,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/core/util"
 	"github.com/hyperledger/fabric/msp"
@@ -294,8 +293,6 @@ var signer msp.SigningIdentity
 var signerSerialized []byte
 
 func TestMain(m *testing.M) {
-	// setup crypto algorithms
-	primitives.SetSecurityLevel("SHA2", 256)
 	// setup the MSP manager so that we can sign/verify
 	mspMgrConfigFile := "../../msp/sampleconfig/"
 	err := mspmgmt.LoadFakeSetupWithLocalMspAndTestChainMsp(mspMgrConfigFile)