Skip to content

fix crypto.go for 2 issues: #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pckwan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix crypto.go for 2 issues: #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pkg/transaction/crypto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import (
"strings"

"github.com/go-interledger/cryptoconditions"
"github.com/mr-tron/base58/base58"
"github.com/pkg/errors"
"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/sha3"
"github.com/kalaspuffar/base64url"
)

type KeyPair struct {
Expand Down Expand Up @@ -71,9 +72,13 @@ func (t *Transaction) Sign(keyPairs []*KeyPair) error {

bytes_to_sign := []byte(serializedTxn.String())

h3_256 := sha3.New256()
h3_256.Write(bytes_to_sign)
h3_256Hash := h3_256.Sum(nil)

// rand reader is ignored within Sign method; crypto.Hash(0) is sanity check to
// make sure bytes_to_sign is not hashed already - ed25519.PrivateKey cannot sign hashed msg
signature, err := keyPair.PrivateKey.Sign(rand.Reader, bytes_to_sign[:], crypto.Hash(0))
signature, err := keyPair.PrivateKey.Sign(rand.Reader, h3_256Hash, crypto.Hash(0))

// https://tools.ietf.org/html/draft-thomas-crypto-conditions-03#section-8.5
ed25519Fulfillment, err := cryptoconditions.NewEd25519Sha256(keyPair.PublicKey, signature)
Expand All @@ -87,7 +92,7 @@ func (t *Transaction) Sign(keyPairs []*KeyPair) error {
if err != nil {
return err
}
ffSt := base58.Encode(ff)
ffSt := base64url.Encode(ff)
signedTx.Inputs[idx].Fulfillment = &ffSt
}
//Create ID of transaction (hash of body)
Expand Down