Skip to content

Commit b9ed727

Browse files
committed
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 <[email protected]>
1 parent 4ad8f9e commit b9ed727

34 files changed

+28
-28
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

core/crypto/bccsp/factory/factory.go bccsp/factory/factory.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"os"
2424

25-
"github.com/hyperledger/fabric/core/crypto/bccsp"
26-
"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
25+
"github.com/hyperledger/fabric/bccsp"
26+
"github.com/hyperledger/fabric/bccsp/sw"
2727
)
2828

2929
var (

core/crypto/bccsp/factory/factory_test.go bccsp/factory/factory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"os"
2020
"testing"
2121

22-
"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
22+
"github.com/hyperledger/fabric/bccsp/sw"
2323
)
2424

2525
func TestGetDefault(t *testing.T) {
File renamed without changes.

core/crypto/bccsp/factory/swfactory.go bccsp/factory/swfactory.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"fmt"
2121
"sync"
2222

23-
"github.com/hyperledger/fabric/core/crypto/bccsp"
24-
"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
23+
"github.com/hyperledger/fabric/bccsp"
24+
"github.com/hyperledger/fabric/bccsp/sw"
2525
)
2626

2727
const (
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

core/crypto/bccsp/signer/signer.go bccsp/signer/signer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"fmt"
2222
"io"
2323

24-
"github.com/hyperledger/fabric/core/crypto/bccsp"
25-
"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
24+
"github.com/hyperledger/fabric/bccsp"
25+
"github.com/hyperledger/fabric/bccsp/utils"
2626
)
2727

2828
// CryptoSigner is the BCCSP-based implementation of a crypto.Signer

core/crypto/bccsp/signer/signer_test.go bccsp/signer/signer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"os"
2121
"testing"
2222

23-
"github.com/hyperledger/fabric/core/crypto/bccsp"
24-
"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
23+
"github.com/hyperledger/fabric/bccsp"
24+
"github.com/hyperledger/fabric/bccsp/sw"
2525
)
2626

2727
var (
File renamed without changes.

core/crypto/bccsp/sw/aes_test.go bccsp/sw/aes_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"math/big"
2323
"testing"
2424

25-
"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
25+
"github.com/hyperledger/fabric/bccsp/utils"
2626
)
2727

2828
// TestCBCPKCS7EncryptCBCPKCS7Decrypt encrypts using CBCPKCS7Encrypt and decrypts using CBCPKCS7Decrypt.

core/crypto/bccsp/sw/aeskey.go bccsp/sw/aeskey.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"crypto/sha256"
2222

23-
"github.com/hyperledger/fabric/core/crypto/bccsp"
23+
"github.com/hyperledger/fabric/bccsp"
2424
)
2525

2626
type aesPrivateKey struct {
File renamed without changes.

core/crypto/bccsp/sw/dummyks.go bccsp/sw/dummyks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sw
33
import (
44
"errors"
55

6-
"github.com/hyperledger/fabric/core/crypto/bccsp"
6+
"github.com/hyperledger/fabric/bccsp"
77
)
88

99
// DummyKeyStore is a read-only KeyStore that neither loads nor stores keys.
File renamed without changes.

core/crypto/bccsp/sw/ecdsakey.go bccsp/sw/ecdsakey.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
"crypto/elliptic"
2828

29-
"github.com/hyperledger/fabric/core/crypto/bccsp"
29+
"github.com/hyperledger/fabric/bccsp"
3030
)
3131

3232
type ecdsaPrivateKey struct {

core/crypto/bccsp/sw/fileks.go bccsp/sw/fileks.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"fmt"
3030
"path/filepath"
3131

32-
"github.com/hyperledger/fabric/core/crypto/bccsp"
33-
"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
32+
"github.com/hyperledger/fabric/bccsp"
33+
"github.com/hyperledger/fabric/bccsp/utils"
3434
)
3535

3636
// FileBasedKeyStore is a folder-based KeyStore.
File renamed without changes.

core/crypto/bccsp/sw/impl.go bccsp/sw/impl.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
"crypto/sha256"
3636
"crypto/sha512"
3737

38-
"github.com/hyperledger/fabric/core/crypto/bccsp"
39-
"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
38+
"github.com/hyperledger/fabric/bccsp"
39+
"github.com/hyperledger/fabric/bccsp/utils"
4040
"github.com/op/go-logging"
4141
"golang.org/x/crypto/sha3"
4242
)

core/crypto/bccsp/sw/impl_test.go bccsp/sw/impl_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ import (
4040
"crypto/sha512"
4141
"hash"
4242

43-
"github.com/hyperledger/fabric/core/crypto/bccsp"
44-
"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
45-
"github.com/hyperledger/fabric/core/crypto/bccsp/utils"
43+
"github.com/hyperledger/fabric/bccsp"
44+
"github.com/hyperledger/fabric/bccsp/signer"
45+
"github.com/hyperledger/fabric/bccsp/utils"
4646
"golang.org/x/crypto/sha3"
4747
)
4848

core/crypto/bccsp/sw/rsakey.go bccsp/sw/rsakey.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"encoding/asn1"
2828
"math/big"
2929

30-
"github.com/hyperledger/fabric/core/crypto/bccsp"
30+
"github.com/hyperledger/fabric/bccsp"
3131
)
3232

3333
// rsaPublicKey reflects the ASN.1 structure of a PKCS#1 public key.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

msp/identities.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"errors"
2727

2828
"github.com/golang/protobuf/proto"
29-
"github.com/hyperledger/fabric/core/crypto/bccsp"
30-
"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
29+
"github.com/hyperledger/fabric/bccsp"
30+
"github.com/hyperledger/fabric/bccsp/signer"
3131
)
3232

3333
type identity struct {

msp/mspimpl.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"encoding/json"
2727

2828
"github.com/golang/protobuf/proto"
29-
"github.com/hyperledger/fabric/core/crypto/bccsp"
30-
"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
31-
"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
29+
"github.com/hyperledger/fabric/bccsp"
30+
"github.com/hyperledger/fabric/bccsp/signer"
31+
"github.com/hyperledger/fabric/bccsp/sw"
3232
m "github.com/hyperledger/fabric/protos/msp"
3333
)
3434

protos/utils/txutils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"bytes"
2424

2525
"github.com/golang/protobuf/proto"
26-
"github.com/hyperledger/fabric/core/crypto/bccsp"
27-
"github.com/hyperledger/fabric/core/crypto/bccsp/factory"
26+
"github.com/hyperledger/fabric/bccsp"
27+
"github.com/hyperledger/fabric/bccsp/factory"
2828
"github.com/hyperledger/fabric/msp"
2929
"github.com/hyperledger/fabric/protos/common"
3030
"github.com/hyperledger/fabric/protos/peer"

0 commit comments

Comments
 (0)