forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 22:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 79328a5f01 into 289b30715d

Browse source
This commit is contained in:
Jarrad 2016-10-28 17:50:14 +00:00 committed by GitHub
commit 549d65cbef
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
whisper/api.go
View file

@ -178,6 +178,9 @@ func (s *PublicWhisperAPI) Post(args PostArgs) (bool, error) {
// construct whisper message with transmission options // construct whisper message with transmission options
message := NewMessage(common.FromHex(args.Payload)) message := NewMessage(common.FromHex(args.Payload))
if len(message.Payload) == 0 && len(args.Payload) > 0 {
message.Payload = []byte(args.Payload)
}
options := Options{ options := Options{
To: crypto.ToECDSAPub(common.FromHex(args.To)), To: crypto.ToECDSAPub(common.FromHex(args.To)),
TTL: time.Duration(args.TTL) * time.Second, TTL: time.Duration(args.TTL) * time.Second,

5
whisper/whisper.go
View file

@ -302,10 +302,11 @@ func (self *Whisper) open(envelope *Envelope) *Message {
// Iterate over the keys and try to decrypt the message // Iterate over the keys and try to decrypt the message
for _, key := range self.keys { for _, key := range self.keys {
message, err := envelope.Open(key) message, err := envelope.Open(key)
if err == nil { switch err {
case nil:
message.To = &key.PublicKey message.To = &key.PublicKey
return message return message
} else if err == ecies.ErrInvalidPublicKey { case ecies.ErrInvalidPublicKey:
return message return message
} }
} }