Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit a5e3c16

Browse files
sudeshrshettysudeshrshetty
committed
[FAB-6983] replacing BCCSP with cryptosuite adaptor
Replacing all bccsp.BCCSP with CryptoSuite adaptor interface to enable users to use their own BCCSP implementation. NOTE: Integration test will be updated in next code push to use fabric bccsp. Change-Id: I2a60a141cd87e8f3f1dc69239342fe8531da37c4 Signed-off-by: Sudesh Shetty <sudesh.shetty@securekey.com>
1 parent 7006073 commit a5e3c16

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+476
-163
lines changed

‎api/apifabca/fabricca.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ SPDX-License-Identifier: Apache-2.0
77
package apifabca
88

99
import (
10-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
10+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1111
)
1212

1313
// FabricCAClient is the client interface for fabric-ca
1414
type FabricCAClient interface {
1515
CAName() string
16-
Enroll(enrollmentID string, enrollmentSecret string) (bccsp.Key, []byte, error)
16+
Enroll(enrollmentID string, enrollmentSecret string) (apicryptosuite.Key, []byte, error)
1717
// Reenroll to renew user's enrollment certificate
18-
Reenroll(user User) (bccsp.Key, []byte, error)
18+
Reenroll(user User) (apicryptosuite.Key, []byte, error)
1919
Register(registrar User, request *RegistrationRequest) (string, error)
2020
Revoke(registrar User, request *RevocationRequest) error
2121
}

‎api/apifabca/user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
77
package apifabca
88

99
import (
10-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
10+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1111
)
1212

1313
// User represents users that have been enrolled and represented by
@@ -31,7 +31,7 @@ type User interface {
3131

3232
// ECerts
3333
EnrollmentCertificate() []byte
34-
PrivateKey() bccsp.Key
34+
PrivateKey() apicryptosuite.Key
3535

3636
Identity() ([]byte, error)
3737

‎api/apifabclient/credentialmgr.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ SPDX-License-Identifier: Apache-2.0
66

77
package apifabclient
88

9-
import "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
9+
import (
10+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
11+
)
1012

1113
// SigningIdentity is the identity object that encapsulates the user's private key for signing
1214
// and the user's enrollment certificate (identity)
1315
type SigningIdentity struct {
1416
MspID string
1517
EnrollmentCert []byte
16-
PrivateKey bccsp.Key
18+
PrivateKey apicryptosuite.Key
1719
}
1820

1921
// CredentialManager retrieves user's signing identity

‎api/apifabclient/fabricclient.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ package apifabclient
88

99
import (
1010
config "github.com/hyperledger/fabric-sdk-go/api/apiconfig" // TODO: Think about package hierarchy
11+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1112
txn "github.com/hyperledger/fabric-sdk-go/api/apitxn"
12-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
1313
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
1414
pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
1515
)
@@ -40,7 +40,7 @@ type FabricClient interface {
4040
QueryChannelInfo(name string, peers []Peer) (Channel, error)
4141
StateStore() KeyValueStore
4242
SigningManager() SigningManager
43-
CryptoSuite() bccsp.BCCSP
43+
CryptoSuite() apicryptosuite.CryptoSuite
4444
SaveUserToStateStore(user User, skipPersistence bool) error
4545
LoadUserFromStateStore(name string) (User, error)
4646
InstallChaincode(chaincodeName string, chaincodePath string, chaincodeVersion string, chaincodePackage []byte, targets []txn.ProposalProcessor) ([]*txn.TransactionProposalResponse, string, error)

‎api/apifabclient/identity.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ SPDX-License-Identifier: Apache-2.0
66

77
package apifabclient
88

9-
import (
10-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
11-
)
9+
import "github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1210

1311
// User represents users that have been enrolled and represented by
1412
// an enrollment certificate (ECert) and a signing key. The ECert must have
@@ -28,7 +26,7 @@ type User interface {
2826
Name() string
2927
MspID() string
3028
EnrollmentCertificate() []byte
31-
PrivateKey() bccsp.Key
29+
PrivateKey() apicryptosuite.Key
3230
Roles() []string
3331
Identity() ([]byte, error)
3432
}

‎api/apifabclient/signingmgr.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ SPDX-License-Identifier: Apache-2.0
66

77
package apifabclient
88

9-
import "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
9+
import "github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1010

1111
// SigningManager signs object with provided key
1212
type SigningManager interface {
13-
Sign([]byte, bccsp.Key) ([]byte, error)
13+
Sign([]byte, apicryptosuite.Key) ([]byte, error)
1414
}

‎def/fabapi/context/context.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ package context
88

99
import (
1010
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
11+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1112
fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
12-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
1313
)
1414

1515
// SDK represents the configuration context
1616
type SDK interface {
17-
CryptoSuiteProvider() bccsp.BCCSP
17+
CryptoSuiteProvider() apicryptosuite.CryptoSuite
1818
StateStoreProvider() fab.KeyValueStore
1919
ConfigProvider() apiconfig.Config
2020
DiscoveryProvider() fab.DiscoveryProvider

‎def/fabapi/context/defprovider/org.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ package defprovider
88

99
import (
1010
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
11+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1112
fabca "github.com/hyperledger/fabric-sdk-go/api/apifabca"
1213
fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
1314
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
1415
fabricCAClient "github.com/hyperledger/fabric-sdk-go/pkg/fabric-ca-client"
1516
credentialMgr "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/credentialmgr"
16-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
1717
)
1818

1919
// OrgClientFactory represents the default org provider factory.
@@ -36,7 +36,7 @@ func (f *OrgClientFactory) NewMSPClient(orgName string, config apiconfig.Config)
3636
}
3737

3838
// NewCredentialManager returns a new default implmentation of the credential manager
39-
func (f *OrgClientFactory) NewCredentialManager(orgName string, config apiconfig.Config, cryptoProvider bccsp.BCCSP) (fab.CredentialManager, error) {
39+
func (f *OrgClientFactory) NewCredentialManager(orgName string, config apiconfig.Config, cryptoProvider apicryptosuite.CryptoSuite) (fab.CredentialManager, error) {
4040

4141
credentialMgr, err := credentialMgr.NewCredentialManager(orgName, config, cryptoProvider)
4242
if err != nil {

‎def/fabapi/context/defprovider/sdk.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ import (
1010
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
1111
fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
1212

13+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1314
"github.com/hyperledger/fabric-sdk-go/def/fabapi/opt"
1415
configImpl "github.com/hyperledger/fabric-sdk-go/pkg/config"
16+
cryptosuite "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp"
1517
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
1618
kvs "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/keyvaluestore"
1719
signingMgr "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/signingmgr"
1820
discovery "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/discovery/staticdiscovery"
1921
selection "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/selection/staticselection"
20-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
2122
bccspFactory "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
2223
)
2324

@@ -55,12 +56,16 @@ func (f *DefaultProviderFactory) NewStateStoreProvider(o opt.StateStoreOpts, con
5556
}
5657

5758
// NewCryptoSuiteProvider returns a new default implementation of BCCSP
58-
func (f *DefaultProviderFactory) NewCryptoSuiteProvider(config *bccspFactory.FactoryOpts) (bccsp.BCCSP, error) {
59-
return bccspFactory.GetBCCSPFromOpts(config)
59+
func (f *DefaultProviderFactory) NewCryptoSuiteProvider(config apiconfig.Config) (apicryptosuite.CryptoSuite, error) {
60+
bccspProvider, err := bccspFactory.GetBCCSPFromOpts(config.CSPConfig())
61+
if err != nil {
62+
return nil, err
63+
}
64+
return cryptosuite.GetSuite(bccspProvider), nil
6065
}
6166

6267
// NewSigningManager returns a new default implementation of signing manager
63-
func (f *DefaultProviderFactory) NewSigningManager(cryptoProvider bccsp.BCCSP, config apiconfig.Config) (fab.SigningManager, error) {
68+
func (f *DefaultProviderFactory) NewSigningManager(cryptoProvider apicryptosuite.CryptoSuite, config apiconfig.Config) (fab.SigningManager, error) {
6469
return signingMgr.NewSigningManager(cryptoProvider, config)
6570
}
6671

‎def/fabapi/context/provider.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,20 @@ package context
88

99
import (
1010
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
11+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1112
fabca "github.com/hyperledger/fabric-sdk-go/api/apifabca"
1213
fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
1314
txn "github.com/hyperledger/fabric-sdk-go/api/apitxn"
1415
chmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/chmgmtclient"
1516
"github.com/hyperledger/fabric-sdk-go/def/fabapi/opt"
16-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
17-
bccspFactory "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
1817
)
1918

2019
// SDKProviderFactory allows overriding default providers of an SDK
2120
type SDKProviderFactory interface {
2221
NewConfigProvider(o opt.ConfigOpts, a opt.SDKOpts) (apiconfig.Config, error)
2322
NewStateStoreProvider(o opt.StateStoreOpts, config apiconfig.Config) (fab.KeyValueStore, error)
24-
NewCryptoSuiteProvider(config *bccspFactory.FactoryOpts) (bccsp.BCCSP, error)
25-
NewSigningManager(cryptoProvider bccsp.BCCSP, config apiconfig.Config) (fab.SigningManager, error)
23+
NewCryptoSuiteProvider(config apiconfig.Config) (apicryptosuite.CryptoSuite, error)
24+
NewSigningManager(cryptoProvider apicryptosuite.CryptoSuite, config apiconfig.Config) (fab.SigningManager, error)
2625
NewDiscoveryProvider(config apiconfig.Config) (fab.DiscoveryProvider, error)
2726
NewSelectionProvider(config apiconfig.Config) (fab.SelectionProvider, error)
2827
}
@@ -31,7 +30,7 @@ type SDKProviderFactory interface {
3130
// Currently, a context is created for each organization that the client app needs.
3231
type OrgClientFactory interface {
3332
NewMSPClient(orgName string, config apiconfig.Config) (fabca.FabricCAClient, error)
34-
NewCredentialManager(orgName string, config apiconfig.Config, cryptoProvider bccsp.BCCSP) (fab.CredentialManager, error)
33+
NewCredentialManager(orgName string, config apiconfig.Config, cryptoProvider apicryptosuite.CryptoSuite) (fab.CredentialManager, error)
3534
}
3635

3736
// SessionClientFactory allows overriding default clients and providers of a session

‎def/fabapi/fabapi.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import (
1212
"github.com/hyperledger/fabric-sdk-go/api/apifabclient"
1313
"github.com/hyperledger/fabric-sdk-go/api/apitxn"
1414

15+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1516
"github.com/hyperledger/fabric-sdk-go/def/fabapi/context"
1617
"github.com/hyperledger/fabric-sdk-go/def/fabapi/context/defprovider"
1718
"github.com/hyperledger/fabric-sdk-go/def/fabapi/opt"
1819
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
1920
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
2021
"github.com/hyperledger/fabric-sdk-go/pkg/logging/deflogger"
21-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
2222

2323
chmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/chmgmtclient"
2424
)
@@ -48,7 +48,7 @@ type FabricSDK struct {
4848
// Implementations of client functionality (defaults are used if not specified)
4949
configProvider apiconfig.Config
5050
stateStore apifabclient.KeyValueStore
51-
cryptoSuite bccsp.BCCSP // TODO - maybe copy this interface into the API package
51+
cryptoSuite apicryptosuite.CryptoSuite
5252
discoveryProvider apifabclient.DiscoveryProvider
5353
selectionProvider apifabclient.SelectionProvider
5454
signingManager apifabclient.SigningManager
@@ -106,7 +106,7 @@ func NewSDK(options Options) (*FabricSDK, error) {
106106
sdk.configProvider = config
107107

108108
// Initialize crypto provider
109-
cryptosuite, err := sdk.ProviderFactory.NewCryptoSuiteProvider(sdk.configProvider.CSPConfig())
109+
cryptosuite, err := sdk.ProviderFactory.NewCryptoSuiteProvider(sdk.configProvider)
110110
if err != nil {
111111
return nil, errors.WithMessage(err, "failed to initialize crypto suite")
112112
}
@@ -155,7 +155,7 @@ func (sdk *FabricSDK) ConfigProvider() apiconfig.Config {
155155
}
156156

157157
// CryptoSuiteProvider returns the BCCSP provider of sdk.
158-
func (sdk *FabricSDK) CryptoSuiteProvider() bccsp.BCCSP {
158+
func (sdk *FabricSDK) CryptoSuiteProvider() apicryptosuite.CryptoSuite {
159159
return sdk.cryptoSuite
160160
}
161161

‎def/fabapi/pkgfactory.go

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ package fabapi
88

99
import (
1010
config "github.com/hyperledger/fabric-sdk-go/api/apiconfig"
11+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1112
fabca "github.com/hyperledger/fabric-sdk-go/api/apifabca"
1213
fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
1314
configImpl "github.com/hyperledger/fabric-sdk-go/pkg/config"
15+
cryptosuite "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp"
1416
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
1517
fabricCAClient "github.com/hyperledger/fabric-sdk-go/pkg/fabric-ca-client"
1618
clientImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client"
@@ -20,21 +22,17 @@ import (
2022
ordererImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/orderer"
2123
peerImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/peer"
2224
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/signingmgr"
23-
bccsp "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
2425
bccspFactory "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp/factory"
2526
)
2627

2728
// TODO: Some (or most) of these functions should no longer be exported, as usage should occur via NewSDK
2829

2930
// NewClient returns a new default implementation of the Client interface using the config provided.
3031
// It will save the provided user if requested into the state store.
31-
func NewClient(user fabca.User, skipUserPersistence bool, stateStorePath string, cryptosuite bccsp.BCCSP, config config.Config) (fab.FabricClient, error) {
32+
func NewClient(user fabca.User, skipUserPersistence bool, stateStorePath string, cryptosuiteprovider apicryptosuite.CryptoSuite, config config.Config) (fab.FabricClient, error) {
3233
client := clientImpl.NewClient(config)
3334

34-
if cryptosuite == nil {
35-
cryptosuite = bccspFactory.GetDefault()
36-
}
37-
client.SetCryptoSuite(cryptosuite)
35+
client.SetCryptoSuite(cryptosuiteprovider)
3836
if stateStorePath != "" {
3937
stateStore, err := kvs.CreateNewFileKeyValueStore(stateStorePath)
4038
if err != nil {
@@ -44,7 +42,7 @@ func NewClient(user fabca.User, skipUserPersistence bool, stateStorePath string,
4442
}
4543
client.SaveUserToStateStore(user, skipUserPersistence)
4644

47-
signingMgr, err := signingmgr.NewSigningManager(cryptosuite, config)
45+
signingMgr, err := signingmgr.NewSigningManager(cryptosuiteprovider, config)
4846
if err != nil {
4947
return nil, errors.WithMessage(err, "NewSigningManager failed")
5048
}
@@ -57,13 +55,10 @@ func NewClient(user fabca.User, skipUserPersistence bool, stateStorePath string,
5755
// NewClientWithUser returns a new default implementation of the Client interface.
5856
// It creates a default implementation of User, enrolls the user, and saves it to the state store.
5957
func NewClientWithUser(name string, pwd string, orgName string,
60-
stateStorePath string, cryptosuite bccsp.BCCSP, config config.Config, msp fabca.FabricCAClient) (fab.FabricClient, error) {
58+
stateStorePath string, cryptosuiteprovider apicryptosuite.CryptoSuite, config config.Config, msp fabca.FabricCAClient) (fab.FabricClient, error) {
6159
client := clientImpl.NewClient(config)
6260

63-
if cryptosuite == nil {
64-
cryptosuite = bccspFactory.GetDefault()
65-
}
66-
client.SetCryptoSuite(cryptosuite)
61+
client.SetCryptoSuite(cryptosuiteprovider)
6762
stateStore, err := kvs.CreateNewFileKeyValueStore(stateStorePath)
6863
if err != nil {
6964
return nil, errors.WithMessage(err, "CreateNewFileKeyValueStore failed")
@@ -151,13 +146,17 @@ func NewKVStore(stateStorePath string) (fab.KeyValueStore, error) {
151146
return stateStore, nil
152147
}
153148

154-
// NewCryptoSuite returns a new default implementation of BCCSP
155-
func NewCryptoSuite(config *bccspFactory.FactoryOpts) (bccsp.BCCSP, error) {
156-
return bccspFactory.GetBCCSPFromOpts(config)
149+
// NewCryptoSuite returns a new default implementation of CryptoSuite
150+
func NewCryptoSuite(config config.Config) (apicryptosuite.CryptoSuite, error) {
151+
bccsp, err := bccspFactory.GetBCCSPFromOpts(config.CSPConfig())
152+
if err != nil {
153+
return nil, err
154+
}
155+
return cryptosuite.GetSuite(bccsp), nil
157156
}
158157

159158
// NewSigningManager returns a new default implementation of signing manager
160-
func NewSigningManager(cryptoProvider bccsp.BCCSP, config config.Config) (fab.SigningManager, error) {
159+
func NewSigningManager(cryptoProvider apicryptosuite.CryptoSuite, config config.Config) (fab.SigningManager, error) {
161160
return signingmgr.NewSigningManager(cryptoProvider, config)
162161
}
163162

‎internal/github.com/hyperledger/fabric-ca/lib/client.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"strconv"
3434
"strings"
3535

36+
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
3637
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
3738

3839
cfsslapi "github.com/cloudflare/cfssl/api"
@@ -41,7 +42,6 @@ import (
4142
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/lib/tls"
4243
log "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/sdkpatch/logbridge"
4344
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
44-
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
4545
"github.com/mitchellh/mapstructure"
4646
)
4747

@@ -56,7 +56,7 @@ type Client struct {
5656
// File and directory paths
5757
keyFile, certFile, caCertsDir string
5858
// The crypto service provider (BCCSP)
59-
csp bccsp.BCCSP
59+
csp apicryptosuite.CryptoSuite
6060
// HTTP client associated with this Fabric CA client
6161
httpClient *http.Client
6262
}
@@ -210,7 +210,7 @@ func (c *Client) Enroll(req *api.EnrollmentRequest) (*EnrollmentResponse, error)
210210
// @param result The result from server
211211
// @param id Name of identity being enrolled or reenrolled
212212
// @param key The private key which was used to sign the request
213-
func (c *Client) newEnrollmentResponse(result *enrollmentResponseNet, id string, key bccsp.Key) (*EnrollmentResponse, error) {
213+
func (c *Client) newEnrollmentResponse(result *enrollmentResponseNet, id string, key apicryptosuite.Key) (*EnrollmentResponse, error) {
214214
log.Debugf("newEnrollmentResponse %s", id)
215215
certByte, err := util.B64Decode(result.Cert)
216216
if err != nil {
@@ -227,7 +227,7 @@ func (c *Client) newEnrollmentResponse(result *enrollmentResponseNet, id string,
227227
}
228228

229229
// GenCSR generates a CSR (Certificate Signing Request)
230-
func (c *Client) GenCSR(req *api.CSRInfo, id string) ([]byte, bccsp.Key, error) {
230+
func (c *Client) GenCSR(req *api.CSRInfo, id string) ([]byte, apicryptosuite.Key, error) {
231231
log.Debugf("GenCSR %+v", req)
232232

233233
err := c.Init()
@@ -285,7 +285,7 @@ func (c *Client) newCertificateRequest(req *api.CSRInfo) *csr.CertificateRequest
285285
}
286286

287287
// NewIdentity creates a new identity
288-
func (c *Client) NewIdentity(key bccsp.Key, cert []byte) (*Identity, error) {
288+
func (c *Client) NewIdentity(key apicryptosuite.Key, cert []byte) (*Identity, error) {
289289
name, err := util.GetEnrollmentIDFromPEM(cert)
290290
if err != nil {
291291
return nil, err

0 commit comments

Comments
 (0)