Provide access to privateKey for non-secp256k1 signing

Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
hyperledger · Aug 1, 2024 · 1e4fa5d · 1e4fa5d
1 parent 083a920
commit 1e4fa5d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/pkg/keystorev3/aes128ctr.go b/pkg/keystorev3/aes128ctr.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/pkg/keystorev3/pbkdf2.go b/pkg/keystorev3/pbkdf2.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -44,9 +44,9 @@ func (w *walletFilePbkdf2) decrypt(password []byte) (err error) {
 
 	derivedKey := pbkdf2.Key(password, w.Crypto.KDFParams.Salt, w.Crypto.KDFParams.C, w.Crypto.KDFParams.DKLen, sha256.New)
 
-	privateKey, err := w.Crypto.decryptCommon(derivedKey)
+	w.privateKey, err = w.Crypto.decryptCommon(derivedKey)
 	if err == nil {
-		w.keypair, err = secp256k1.NewSecp256k1KeyPair(privateKey)
+		w.keypair, err = secp256k1.NewSecp256k1KeyPair(w.privateKey)
 	}
 	return err
 

diff --git a/pkg/keystorev3/scrypt.go b/pkg/keystorev3/scrypt.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -98,9 +98,9 @@ func (w *walletFileScrypt) decrypt(password []byte) error {
 	if err != nil {
 		return fmt.Errorf("invalid scrypt keystore: %s", err)
 	}
-	privateKey, err := w.Crypto.decryptCommon(derivedKey)
+	w.privateKey, err = w.Crypto.decryptCommon(derivedKey)
 	if err == nil {
-		w.keypair, err = secp256k1.NewSecp256k1KeyPair(privateKey)
+		w.keypair, err = secp256k1.NewSecp256k1KeyPair(w.privateKey)
 	}
 	return err
 }
diff --git a/pkg/keystorev3/walletfile.go b/pkg/keystorev3/walletfile.go
@@ -1,4 +1,4 @@
-// Copyright © 2022 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -34,6 +34,7 @@ const (
 )
 
 type WalletFile interface {
+	PrivateKey() []byte
 	KeyPair() *secp256k1.KeyPair
 	JSON() []byte
 }
@@ -80,7 +81,8 @@ type walletFileBase struct {
 	ID      *fftypes.UUID            `json:"id"`
 	Version int                      `json:"version"`
 
-	keypair *secp256k1.KeyPair
+	privateKey []byte
+	keypair    *secp256k1.KeyPair
 }
 
 type walletFileCommon struct {
@@ -102,6 +104,10 @@ func (w *walletFileBase) KeyPair() *secp256k1.KeyPair {
 	return w.keypair
 }
 
+func (w *walletFileBase) PrivateKey() []byte {
+	return w.privateKey
+}
+
 func (w *walletFilePbkdf2) JSON() []byte {
 	b, _ := json.Marshal(w)
 	return b