Moving BCCSP under fabric

This change-set moves the BCCSP package under fabric/ Refenreces to the BCCSP package have been updated to reflect the new path. Change-Id: I0a5e6d9c49d8f8099aaa8b21258937d83c2b40d9 Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
hyperledger · Jan 6, 2017 · b9ed727 · b9ed727
1 parent 4ad8f9e
commit b9ed727
Show file tree

Hide file tree

Showing 34 changed files with 28 additions and 28 deletions.
diff --git a/core/crypto/bccsp/aesopts.go → bccsp/aesopts.go b/core/crypto/bccsp/aesopts.go → bccsp/aesopts.go
diff --git a/core/crypto/bccsp/bccsp.go → bccsp/bccsp.go b/core/crypto/bccsp/bccsp.go → bccsp/bccsp.go
diff --git a/core/crypto/bccsp/ecdsaopts.go → bccsp/ecdsaopts.go b/core/crypto/bccsp/ecdsaopts.go → bccsp/ecdsaopts.go
diff --git a/core/crypto/bccsp/factory/factory.go → bccsp/factory/factory.go b/core/crypto/bccsp/factory/factory.go → bccsp/factory/factory.go
@@ -22,8 +22,8 @@ import (
 
 	"os"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/sw"
 )
 
 var (

diff --git a/core/crypto/bccsp/factory/factory_test.go → bccsp/factory/factory_test.go b/core/crypto/bccsp/factory/factory_test.go → bccsp/factory/factory_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
+	"github.com/hyperledger/fabric/bccsp/sw"
 )
 
 func TestGetDefault(t *testing.T) {

diff --git a/core/crypto/bccsp/factory/opts.go → bccsp/factory/opts.go b/core/crypto/bccsp/factory/opts.go → bccsp/factory/opts.go
diff --git a/core/crypto/bccsp/factory/swfactory.go → bccsp/factory/swfactory.go b/core/crypto/bccsp/factory/swfactory.go → bccsp/factory/swfactory.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/sw"
 )
 
 const (

diff --git a/core/crypto/bccsp/hashopts.go → bccsp/hashopts.go b/core/crypto/bccsp/hashopts.go → bccsp/hashopts.go
diff --git a/core/crypto/bccsp/keystore.go → bccsp/keystore.go b/core/crypto/bccsp/keystore.go → bccsp/keystore.go
diff --git a/core/crypto/bccsp/opts.go → bccsp/opts.go b/core/crypto/bccsp/opts.go → bccsp/opts.go
diff --git a/core/crypto/bccsp/rsaopts.go → bccsp/rsaopts.go b/core/crypto/bccsp/rsaopts.go → bccsp/rsaopts.go
diff --git a/core/crypto/bccsp/signer/signer.go → bccsp/signer/signer.go b/core/crypto/bccsp/signer/signer.go → bccsp/signer/signer.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/utils"
 )
 
 // CryptoSigner is the BCCSP-based implementation of a crypto.Signer

diff --git a/core/crypto/bccsp/signer/signer_test.go → bccsp/signer/signer_test.go b/core/crypto/bccsp/signer/signer_test.go → bccsp/signer/signer_test.go
@@ -20,8 +20,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/sw"
 )
 
 var (

diff --git a/core/crypto/bccsp/sw/aes.go → bccsp/sw/aes.go b/core/crypto/bccsp/sw/aes.go → bccsp/sw/aes.go
diff --git a/core/crypto/bccsp/sw/aes_test.go → bccsp/sw/aes_test.go b/core/crypto/bccsp/sw/aes_test.go → bccsp/sw/aes_test.go
@@ -22,7 +22,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
+	"github.com/hyperledger/fabric/bccsp/utils"
 )
 
 // TestCBCPKCS7EncryptCBCPKCS7Decrypt encrypts using CBCPKCS7Encrypt and decrypts using CBCPKCS7Decrypt.

diff --git a/core/crypto/bccsp/sw/aeskey.go → bccsp/sw/aeskey.go b/core/crypto/bccsp/sw/aeskey.go → bccsp/sw/aeskey.go
@@ -20,7 +20,7 @@ import (
 
 	"crypto/sha256"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
+	"github.com/hyperledger/fabric/bccsp"
 )
 
 type aesPrivateKey struct {

diff --git a/core/crypto/bccsp/sw/conf.go → bccsp/sw/conf.go b/core/crypto/bccsp/sw/conf.go → bccsp/sw/conf.go
diff --git a/core/crypto/bccsp/sw/dummyks.go → bccsp/sw/dummyks.go b/core/crypto/bccsp/sw/dummyks.go → bccsp/sw/dummyks.go
@@ -3,7 +3,7 @@ package sw
 import (
 	"errors"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
+	"github.com/hyperledger/fabric/bccsp"
 )
 
 // DummyKeyStore is a read-only KeyStore that neither loads nor stores keys.

diff --git a/core/crypto/bccsp/sw/ecdsa.go → bccsp/sw/ecdsa.go b/core/crypto/bccsp/sw/ecdsa.go → bccsp/sw/ecdsa.go
diff --git a/core/crypto/bccsp/sw/ecdsakey.go → bccsp/sw/ecdsakey.go b/core/crypto/bccsp/sw/ecdsakey.go → bccsp/sw/ecdsakey.go
@@ -26,7 +26,7 @@ import (
 
 	"crypto/elliptic"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
+	"github.com/hyperledger/fabric/bccsp"
 )
 
 type ecdsaPrivateKey struct {

diff --git a/core/crypto/bccsp/sw/fileks.go → bccsp/sw/fileks.go b/core/crypto/bccsp/sw/fileks.go → bccsp/sw/fileks.go
@@ -29,8 +29,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/utils"
 )
 
 // FileBasedKeyStore is a folder-based KeyStore.

diff --git a/core/crypto/bccsp/sw/fileks_test.go → bccsp/sw/fileks_test.go b/core/crypto/bccsp/sw/fileks_test.go → bccsp/sw/fileks_test.go
diff --git a/core/crypto/bccsp/sw/impl.go → bccsp/sw/impl.go b/core/crypto/bccsp/sw/impl.go → bccsp/sw/impl.go
@@ -35,8 +35,8 @@ import (
 	"crypto/sha256"
 	"crypto/sha512"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/utils"
 	"github.com/op/go-logging"
 	"golang.org/x/crypto/sha3"
 )

diff --git a/core/crypto/bccsp/sw/impl_test.go → bccsp/sw/impl_test.go b/core/crypto/bccsp/sw/impl_test.go → bccsp/sw/impl_test.go
@@ -40,9 +40,9 @@ import (
 	"crypto/sha512"
 	"hash"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/signer"
+	"github.com/hyperledger/fabric/bccsp/utils"
 	"golang.org/x/crypto/sha3"
 )
 

diff --git a/core/crypto/bccsp/sw/rsakey.go → bccsp/sw/rsakey.go b/core/crypto/bccsp/sw/rsakey.go → bccsp/sw/rsakey.go
@@ -27,7 +27,7 @@ import (
 	"encoding/asn1"
 	"math/big"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
+	"github.com/hyperledger/fabric/bccsp"
 )
 
 // rsaPublicKey reflects the ASN.1 structure of a PKCS#1 public key.

diff --git a/core/crypto/bccsp/utils/errs.go → bccsp/utils/errs.go b/core/crypto/bccsp/utils/errs.go → bccsp/utils/errs.go
diff --git a/core/crypto/bccsp/utils/io.go → bccsp/utils/io.go b/core/crypto/bccsp/utils/io.go → bccsp/utils/io.go
diff --git a/core/crypto/bccsp/utils/keys.go → bccsp/utils/keys.go b/core/crypto/bccsp/utils/keys.go → bccsp/utils/keys.go
diff --git a/core/crypto/bccsp/utils/keys_test.go → bccsp/utils/keys_test.go b/core/crypto/bccsp/utils/keys_test.go → bccsp/utils/keys_test.go
diff --git a/core/crypto/bccsp/utils/slice.go → bccsp/utils/slice.go b/core/crypto/bccsp/utils/slice.go → bccsp/utils/slice.go
diff --git a/core/crypto/bccsp/utils/x509.go → bccsp/utils/x509.go b/core/crypto/bccsp/utils/x509.go → bccsp/utils/x509.go
diff --git a/msp/identities.go b/msp/identities.go
@@ -26,8 +26,8 @@ import (
 	"errors"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/signer"
 )
 
 type identity struct {

diff --git a/msp/mspimpl.go b/msp/mspimpl.go
@@ -26,9 +26,9 @@ import (
 	"encoding/json"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/signer"
+	"github.com/hyperledger/fabric/bccsp/sw"
 	m "github.com/hyperledger/fabric/protos/msp"
 )
 

diff --git a/protos/utils/txutils.go b/protos/utils/txutils.go
@@ -23,8 +23,8 @@ import (
 	"bytes"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/factory"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/factory"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/peer"