Skip to content

Commit

Permalink
[FAB-6983] Moved bccsp from third_party to internal
Browse files Browse the repository at this point in the history 
 - Moved third_party bccsp packages to internal
 - Got rid of config.CSPConfig() which used to return
 bccspfactory opts.
 - CryptoSuite adaptor to generate crypto suite from config
 - CryptoSuite adaptor to generate JSON of factory opts
 -Test coverage 94.7%


Change-Id: Ia56dfea819359e5723aa4b59709fedee79634113
Signed-off-by: Sudesh Shetty <sudesh.shetty@securekey.com>
  • Loading branch information
@sudeshrshetty
sudeshrshetty committed Nov 21, 2017
1 parent 8e17702 commit 59a0a8e
Show file tree
Hide file tree
Showing 80 changed files with 413 additions and 440 deletions.
3 changes: 0 additions & 3 deletions api/apiconfig/configprovider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ package apiconfig
import (
"crypto/x509"
"time"

bccspFactory "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
)

// Config fabric-sdk-go configuration interface
Expand Down Expand Up @@ -45,7 +43,6 @@ type Config interface {
KeyStorePath() string
CAKeyStorePath() string
CryptoConfigPath() string
CSPConfig() *bccspFactory.FactoryOpts
}

// TimeoutType enumerates the different types of outgoing connections
Expand Down
13 changes: 0 additions & 13 deletions api/apiconfig/mocks/mockconfig.gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions api/apifabca/mocks/mockfabriccaclient.gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions def/fabapi/context/defprovider/sdk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
signingMgr "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/signingmgr"
discovery "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/discovery/staticdiscovery"
selection "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/selection/staticselection"
bccspFactory "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
)

// DefaultProviderFactory represents the default SDK provider factory.
Expand Down Expand Up @@ -57,11 +56,7 @@ func (f *DefaultProviderFactory) NewStateStoreProvider(o opt.StateStoreOpts, con

// NewCryptoSuiteProvider returns a new default implementation of BCCSP
func (f *DefaultProviderFactory) NewCryptoSuiteProvider(config apiconfig.Config) (apicryptosuite.CryptoSuite, error) {
bccspProvider, err := bccspFactory.GetBCCSPFromOpts(config.CSPConfig())
if err != nil {
return nil, err
}
return cryptosuite.GetSuite(bccspProvider), nil
return cryptosuite.GetSuiteByConfig(config)
}

// NewSigningManager returns a new default implementation of signing manager
Expand Down
7 changes: 1 addition & 6 deletions def/fabapi/pkgfactory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
ordererImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/orderer"
peerImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/peer"
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/signingmgr"
bccspFactory "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
)

// TODO: Some (or most) of these functions should no longer be exported, as usage should occur via NewSDK
Expand Down Expand Up @@ -148,11 +147,7 @@ func NewKVStore(stateStorePath string) (fab.KeyValueStore, error) {

// NewCryptoSuite returns a new default implementation of CryptoSuite
func NewCryptoSuite(config config.Config) (apicryptosuite.CryptoSuite, error) {
bccsp, err := bccspFactory.GetBCCSPFromOpts(config.CSPConfig())
if err != nil {
return nil, err
}
return cryptosuite.GetSuite(bccsp), nil
return cryptosuite.GetSuiteByConfig(config)
}

// NewSigningManager returns a new default implementation of signing manager
Expand Down
2 changes: 1 addition & 1 deletion internal/github.com/hyperledger/fabric-ca/lib/clientconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package lib
import (
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/lib/tls"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/factory"
)

// ClientConfig is the fabric-ca client's config
Expand Down
2 changes: 1 addition & 1 deletion internal/github.com/hyperledger/fabric-ca/lib/tls/tls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

log "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/logbridge"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/factory"
)

// ServerTLSConfig defines key material for a TLS server
Expand Down
6 changes: 3 additions & 3 deletions internal/github.com/hyperledger/fabric-ca/util/csp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ import (
"github.com/cloudflare/cfssl/csr"
"github.com/cloudflare/cfssl/helpers"
log "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/logbridge"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/factory"
cspsigner "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/signer"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
cryptosuite "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/utils"
)

// InitBCCSP initializes BCCSP
Expand Down
2 changes: 1 addition & 1 deletion internal/github.com/hyperledger/fabric-ca/util/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"golang.org/x/crypto/ocsp"
)

Expand Down
0 ...b.com/hyperledger/fabric/bccsp/aesopts.go → ...b.com/hyperledger/fabric/bccsp/aesopts.go
View file
File renamed without changes.
0 ...hub.com/hyperledger/fabric/bccsp/bccsp.go → ...hub.com/hyperledger/fabric/bccsp/bccsp.go
View file
File renamed without changes.
0 ...com/hyperledger/fabric/bccsp/ecdsaopts.go → ...com/hyperledger/fabric/bccsp/ecdsaopts.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...perledger/fabric/bccsp/factory/factory.go → ...perledger/fabric/bccsp/factory/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ package factory
import (
"sync"

"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
flogging "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/sdkpatch/logbridge"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion ...erledger/fabric/bccsp/factory/nopkcs11.go → ...erledger/fabric/bccsp/factory/nopkcs11.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Please review third_party pinning scripts and patches for more details.
package factory

import (
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
)

// FactoryOpts holds configuration information used to initialize factory implementations
Expand Down
0 .../hyperledger/fabric/bccsp/factory/opts.go → .../hyperledger/fabric/bccsp/factory/opts.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...yperledger/fabric/bccsp/factory/pkcs11.go → ...yperledger/fabric/bccsp/factory/pkcs11.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ Please review third_party pinning scripts and patches for more details.
package factory

import (
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/pkcs11"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/pkcs11"
)

// FactoryOpts holds configuration information used to initialize factory implementations
Expand Down
6 changes: 3 additions & 3 deletions ...ger/fabric/bccsp/factory/pkcs11factory.go → ...ger/fabric/bccsp/factory/pkcs11factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ Please review third_party pinning scripts and patches for more details.
package factory

import (
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/pkcs11"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/pkcs11"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/sw"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...ger/fabric/bccsp/factory/pluginfactory.go → ...ger/fabric/bccsp/factory/pluginfactory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"os"
"plugin"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...actory/sdkpatch_pluginfactory_noplugin.go → ...actory/sdkpatch_pluginfactory_noplugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package factory
import (
"github.com/hyperledger/fabric-sdk-go/pkg/errors"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions ...rledger/fabric/bccsp/factory/swfactory.go → ...rledger/fabric/bccsp/factory/swfactory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Please review third_party pinning scripts and patches for more details.
package factory

import (
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/sw"
)

const (
Expand Down
0 ....com/hyperledger/fabric/bccsp/hashopts.go → ....com/hyperledger/fabric/bccsp/hashopts.go
View file
File renamed without changes.
0 ....com/hyperledger/fabric/bccsp/keystore.go → ....com/hyperledger/fabric/bccsp/keystore.go
View file
File renamed without changes.
0 ...thub.com/hyperledger/fabric/bccsp/opts.go → ...thub.com/hyperledger/fabric/bccsp/opts.go
View file
File renamed without changes.
0 ...m/hyperledger/fabric/bccsp/pkcs11/conf.go → ...m/hyperledger/fabric/bccsp/pkcs11/conf.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../hyperledger/fabric/bccsp/pkcs11/ecdsa.go → .../hyperledger/fabric/bccsp/pkcs11/ecdsa.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"fmt"
"math/big"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

type ecdsaSignature struct {
Expand Down
2 changes: 1 addition & 1 deletion ...perledger/fabric/bccsp/pkcs11/ecdsakey.go → ...perledger/fabric/bccsp/pkcs11/ecdsakey.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"errors"
"fmt"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

type ecdsaPrivateKey struct {
Expand Down
6 changes: 3 additions & 3 deletions ...m/hyperledger/fabric/bccsp/pkcs11/impl.go → ...m/hyperledger/fabric/bccsp/pkcs11/impl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
"math/big"
"os"

"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
flogging "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/sdkpatch/logbridge"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/utils"
"github.com/miekg/pkcs11"
)

Expand Down
0 ...hyperledger/fabric/bccsp/pkcs11/pkcs11.go → ...hyperledger/fabric/bccsp/pkcs11/pkcs11.go
View file
File renamed without changes.
0 ...b.com/hyperledger/fabric/bccsp/rsaopts.go → ...b.com/hyperledger/fabric/bccsp/rsaopts.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/github.com/hyperledger/fabric/bccsp/signer/signer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"io"

"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/utils"
)

// bccspCryptoSigner is the BCCSP-based implementation of a crypto.Signer
Expand Down
2 changes: 1 addition & 1 deletion ...ub.com/hyperledger/fabric/bccsp/sw/aes.go → ...ub.com/hyperledger/fabric/bccsp/sw/aes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"fmt"
"io"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

// GetRandomBytes returns len random looking bytes
Expand Down
2 changes: 1 addition & 1 deletion ...com/hyperledger/fabric/bccsp/sw/aeskey.go → ...com/hyperledger/fabric/bccsp/sw/aeskey.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"crypto/sha256"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

type aesPrivateKey struct {
Expand Down
0 ...b.com/hyperledger/fabric/bccsp/sw/conf.go → ...b.com/hyperledger/fabric/bccsp/sw/conf.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...om/hyperledger/fabric/bccsp/sw/dummyks.go → ...om/hyperledger/fabric/bccsp/sw/dummyks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package sw
import (
"errors"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

// NewDummyKeyStore instantiate a dummy key store
Expand Down
2 changes: 1 addition & 1 deletion ....com/hyperledger/fabric/bccsp/sw/ecdsa.go → ....com/hyperledger/fabric/bccsp/sw/ecdsa.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"fmt"
"math/big"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

type ECDSASignature struct {
Expand Down
2 changes: 1 addition & 1 deletion ...m/hyperledger/fabric/bccsp/sw/ecdsakey.go → ...m/hyperledger/fabric/bccsp/sw/ecdsakey.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

"crypto/elliptic"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

type ecdsaPrivateKey struct {
Expand Down
4 changes: 2 additions & 2 deletions ...com/hyperledger/fabric/bccsp/sw/fileks.go → ...com/hyperledger/fabric/bccsp/sw/fileks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"fmt"
"path/filepath"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/utils"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
)

// NewFileBasedKeyStore instantiated a file-based key store at a given position.
Expand Down
2 changes: 1 addition & 1 deletion ...b.com/hyperledger/fabric/bccsp/sw/hash.go → ...b.com/hyperledger/fabric/bccsp/sw/hash.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package sw
import (
"hash"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

type hasher struct {
Expand Down
2 changes: 1 addition & 1 deletion ...b.com/hyperledger/fabric/bccsp/sw/impl.go → ...b.com/hyperledger/fabric/bccsp/sw/impl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"hash"
"reflect"

"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
flogging "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/sdkpatch/logbridge"
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"golang.org/x/crypto/sha3"
)

Expand Down
2 changes: 1 addition & 1 deletion .../hyperledger/fabric/bccsp/sw/internals.go → .../hyperledger/fabric/bccsp/sw/internals.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package sw
import (
"hash"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

// KeyGenerator is a BCCSP-like interface that provides key generation algorithms
Expand Down
2 changes: 1 addition & 1 deletion ...m/hyperledger/fabric/bccsp/sw/keyderiv.go → ...m/hyperledger/fabric/bccsp/sw/keyderiv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"crypto/hmac"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

type ecdsaPublicKeyKeyDeriver struct{}
Expand Down
2 changes: 1 addition & 1 deletion ...com/hyperledger/fabric/bccsp/sw/keygen.go → ...com/hyperledger/fabric/bccsp/sw/keygen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"crypto/rsa"
"fmt"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
)

type ecdsaKeyGenerator struct {
Expand Down
4 changes: 2 additions & 2 deletions .../hyperledger/fabric/bccsp/sw/keyimport.go → .../hyperledger/fabric/bccsp/sw/keyimport.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"crypto/x509"
"reflect"

"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/utils"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
)

type aes256ImportKeyOptsKeyImporter struct{}
Expand Down
Loading

0 comments on commit 59a0a8e

Please sign in to comment.