From e0e781e338a8e9d54f26e76852808bd5e17714e6 Mon Sep 17 00:00:00 2001 From: Johann Westphall Date: Fri, 24 May 2024 11:30:14 -0300 Subject: [PATCH] bump fabric-lib-go to v1.1.3 Signed-off-by: Johann Westphall --- go.mod | 2 +- go.sum | 4 +- .../fabric-lib-go/bccsp/pkcs11/pkcs11.go | 10 +- .../fabric-lib-go/bccsp/sw/ed25519_test.go | 138 ------------------ vendor/modules.txt | 2 +- 5 files changed, 12 insertions(+), 144 deletions(-) delete mode 100644 vendor/github.com/hyperledger/fabric-lib-go/bccsp/sw/ed25519_test.go diff --git a/go.mod b/go.mod index e68145e6433..3afbc2baf8e 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/hyperledger/fabric-chaincode-go v0.0.0-20220713164125-8f0791c989d7 github.com/hyperledger/fabric-config v0.2.1 - github.com/hyperledger/fabric-lib-go v1.1.0 + github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5 github.com/hyperledger/fabric-protos-go v0.3.2 github.com/kr/pretty v0.3.1 github.com/miekg/pkcs11 v1.1.1 diff --git a/go.sum b/go.sum index cdb01cfbc33..ff242499308 100644 --- a/go.sum +++ b/go.sum @@ -324,8 +324,8 @@ github.com/hyperledger/fabric-chaincode-go v0.0.0-20220713164125-8f0791c989d7 h1 github.com/hyperledger/fabric-chaincode-go v0.0.0-20220713164125-8f0791c989d7/go.mod h1:9HhzkKkb8qteXBbHEQ3J/FHBVJRDJAgYIPtKPIl3Dt8= github.com/hyperledger/fabric-config v0.2.1 h1:CsReuxvi5c5NUyKKQOIVbHux32o+XtmDNceYLYjycxo= github.com/hyperledger/fabric-config v0.2.1/go.mod h1:1ZfjDrsuMoM4IPKezQgTByy2vXUj8bgTXaOXaGXK5O4= -github.com/hyperledger/fabric-lib-go v1.1.0 h1:iVjRr0oxqNn2P0SH2UCiOdLak56kqn/YJ6A/wnxNNaU= -github.com/hyperledger/fabric-lib-go v1.1.0/go.mod h1:SHNCq8AB0VpHAmvJEtdbzabv6NNV1F48JdmDihasBjc= +github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5 h1:RPWTL5wxAb+xDOrsCU3QYZP65305F8v3PaOyzdbPVMU= +github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5/go.mod h1:SHNCq8AB0VpHAmvJEtdbzabv6NNV1F48JdmDihasBjc= github.com/hyperledger/fabric-protos-go v0.0.0-20220516090339-9685156fada6/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/hyperledger/fabric-protos-go v0.3.2 h1:mQmbHw3lyDV2+W5b0FitV/SjM4LLDjMTQJWW9taitDM= github.com/hyperledger/fabric-protos-go v0.3.2/go.mod h1:WWnyWP40P2roPmmvxsUXSvVI/CF6vwY1K1UFidnKBys= diff --git a/vendor/github.com/hyperledger/fabric-lib-go/bccsp/pkcs11/pkcs11.go b/vendor/github.com/hyperledger/fabric-lib-go/bccsp/pkcs11/pkcs11.go index 61b8be4f867..a55f63c38bd 100644 --- a/vendor/github.com/hyperledger/fabric-lib-go/bccsp/pkcs11/pkcs11.go +++ b/vendor/github.com/hyperledger/fabric-lib-go/bccsp/pkcs11/pkcs11.go @@ -138,7 +138,7 @@ func (csp *Provider) initialize(opts PKCS11Opts) (*Provider, error) { return nil, fmt.Errorf("pkcs11: instantiation failed for %s", opts.Library) } if err := ctx.Initialize(); err != nil { - logger.Debugf("initialize failed: %v", err) + logger.Warnf("initialize failed: %v", err) } slots, err := ctx.GetSlotList(true) @@ -147,9 +147,15 @@ func (csp *Provider) initialize(opts PKCS11Opts) (*Provider, error) { } for _, s := range slots { info, err := ctx.GetTokenInfo(s) - if err != nil || opts.Label != info.Label { + if err != nil { + logger.Warnf("Failed to get TokenInfo for slot %d: %v", s, err) + continue + } + if opts.Label != info.Label { + logger.Warnw("PKCS11 labels did not match", "slot", s, "configLabel", opts.Label, "tokenLabel", info.Label) continue } + logger.Debugw("Found a matching PKCS11 label to use", "slot", s, "label", info.Label, "pin", opts.Pin) csp.slot = s csp.ctx = ctx diff --git a/vendor/github.com/hyperledger/fabric-lib-go/bccsp/sw/ed25519_test.go b/vendor/github.com/hyperledger/fabric-lib-go/bccsp/sw/ed25519_test.go deleted file mode 100644 index 9d09be86025..00000000000 --- a/vendor/github.com/hyperledger/fabric-lib-go/bccsp/sw/ed25519_test.go +++ /dev/null @@ -1,138 +0,0 @@ -/* -Copyright IBM Corp. All Rights Reserved. - -SPDX-License-Identifier: Apache-2.0 -*/ - -package sw - -import ( - "crypto/ed25519" - "crypto/rand" - "crypto/sha256" - "crypto/x509" - "testing" - - "github.com/stretchr/testify/require" -) - -func TestVerifyED25519(t *testing.T) { - t.Parallel() - - // Generate a key - _, lowLevelKey, err := ed25519.GenerateKey(rand.Reader) - require.NoError(t, err) - - msg := []byte("hello world") - sigma, err := signED25519(&lowLevelKey, msg, nil) - require.NoError(t, err) - - castedKey, _ := lowLevelKey.Public().(ed25519.PublicKey) - valid, err := verifyED25519(&castedKey, sigma, msg, nil) - require.NoError(t, err) - require.True(t, valid) -} - -func TestEd25519SignerSign(t *testing.T) { - t.Parallel() - - signer := &ed25519Signer{} - verifierPrivateKey := &ed25519PrivateKeyVerifier{} - verifierPublicKey := &ed25519PublicKeyKeyVerifier{} - - // Generate a key - _, lowLevelKey, err := ed25519.GenerateKey(rand.Reader) - require.NoError(t, err) - k := &ed25519PrivateKey{&lowLevelKey} - pk, err := k.PublicKey() - require.NoError(t, err) - - // Sign - msg := []byte("Hello World") - sigma, err := signer.Sign(k, msg, nil) - require.NoError(t, err) - require.NotNil(t, sigma) - - // Verify - castedKey, _ := lowLevelKey.Public().(ed25519.PublicKey) - valid, err := verifyED25519(&castedKey, sigma, msg, nil) - require.NoError(t, err) - require.True(t, valid) - - valid, err = verifierPrivateKey.Verify(k, sigma, msg, nil) - require.NoError(t, err) - require.True(t, valid) - - valid, err = verifierPublicKey.Verify(pk, sigma, msg, nil) - require.NoError(t, err) - require.True(t, valid) -} - -func TestEd25519PrivateKey(t *testing.T) { - t.Parallel() - - _, lowLevelKey, err := ed25519.GenerateKey(rand.Reader) - require.NoError(t, err) - k := &ed25519PrivateKey{&lowLevelKey} - - require.False(t, k.Symmetric()) - require.True(t, k.Private()) - - _, err = k.Bytes() - require.Error(t, err) - require.Contains(t, err.Error(), "Not supported.") - - k.privKey = nil - ski := k.SKI() - require.Nil(t, ski) - - k.privKey = &lowLevelKey - ski = k.SKI() - raw := k.privKey.Public().(ed25519.PublicKey) - hash := sha256.New() - hash.Write(raw) - ski2 := hash.Sum(nil) - require.Equal(t, ski2, ski, "SKI is not computed in the right way.") - - pk, err := k.PublicKey() - require.NoError(t, err) - require.NotNil(t, pk) - ed25519PK, ok := pk.(*ed25519PublicKey) - require.True(t, ok) - castedKey, _ := lowLevelKey.Public().(ed25519.PublicKey) - require.Equal(t, &castedKey, ed25519PK.pubKey) -} - -func TestEd25519PublicKey(t *testing.T) { - t.Parallel() - - _, lowLevelKey, err := ed25519.GenerateKey(rand.Reader) - require.NoError(t, err) - castedKey, _ := lowLevelKey.Public().(ed25519.PublicKey) - k := &ed25519PublicKey{&castedKey} - - require.False(t, k.Symmetric()) - require.False(t, k.Private()) - - k.pubKey = nil - ski := k.SKI() - require.Nil(t, ski) - - k.pubKey = &castedKey - ski = k.SKI() - raw := *(k.pubKey) - hash := sha256.New() - hash.Write(raw) - ski2 := hash.Sum(nil) - require.Equal(t, ski, ski2, "SKI is not computed in the right way.") - - pk, err := k.PublicKey() - require.NoError(t, err) - require.Equal(t, k, pk) - - bytes, err := k.Bytes() - require.NoError(t, err) - bytes2, err := x509.MarshalPKIXPublicKey(*k.pubKey) - require.NoError(t, err) - require.Equal(t, bytes2, bytes, "bytes are not computed in the right way.") -} diff --git a/vendor/modules.txt b/vendor/modules.txt index fe3c506eb7b..032801d2603 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -247,7 +247,7 @@ github.com/hyperledger/fabric-config/protolator/protoext/ledger/rwsetext github.com/hyperledger/fabric-config/protolator/protoext/mspext github.com/hyperledger/fabric-config/protolator/protoext/ordererext github.com/hyperledger/fabric-config/protolator/protoext/peerext -# github.com/hyperledger/fabric-lib-go v1.1.0 +# github.com/hyperledger/fabric-lib-go v1.1.3-0.20240523144151-25edd1eaf5f5 ## explicit; go 1.20 github.com/hyperledger/fabric-lib-go/bccsp github.com/hyperledger/fabric-lib-go/bccsp/factory