gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated whisper messages to new crypto api + added tests

Browse Source
This commit is contained in:
obscuren
2014-12-10 14:17:32 +01:00
parent 0f5c6c5e2d
commit dda778eda7
5 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
whisper/message.go
View File

@ -1,6 +1,7 @@
package whisper
import (
"crypto/ecdsa"
"time"
"github.com/ethereum/go-ethereum/crypto"
@ -20,13 +21,17 @@ func (self *Message) hash() []byte {
return crypto.Sha3(append([]byte{self.Flags}, self.Payload...))
}
func (self *Message) sign(key []byte) (err error) {
func (self *Message) sign(key *ecdsa.PrivateKey) (err error) {
self.Flags = 1
self.Signature, err = crypto.Sign(self.hash(), key)
return
}
func (self *Message) Encrypt(from, to []byte) (err error) {
func (self *Message) Recover() *ecdsa.PublicKey {
return crypto.SigToPub(self.hash(), self.Signature)
}
func (self *Message) Encrypt(from *ecdsa.PrivateKey, to *ecdsa.PublicKey) (err error) {
err = self.sign(from)
if err != nil {
return err
@ -45,13 +50,14 @@ func (self *Message) Bytes() []byte {
}
type Opts struct {
From, To []byte // private(sender), public(receiver) key
Ttl time.Duration
Topics [][]byte
From *ecdsa.PrivateKey
To *ecdsa.PublicKey
Ttl time.Duration
Topics [][]byte
}
func (self *Message) Seal(pow time.Duration, opts Opts) (*Envelope, error) {
if len(opts.To) > 0 && len(opts.From) > 0 {
if opts.To != nil && opts.From != nil {
if err := self.Encrypt(opts.From, opts.To); err != nil {
return nil, err
}