forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 01:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

whisper: filter with sym & asym keys must try both methods

Browse source 
There is an ongoing discussion whether this is the proper
way to go, as filters implementing both sym and asym keys
will see an unsuccessful attempt at an asymmetric
decryption be followed by an attempt at a symmetric
decription. This is inefficient in that case, which should
not happen too often. The alternative is to forbid using
filters with both options enabled, and will require
updating unit tests.
This commit is contained in:
Guillaume Ballet 2017-11-30 21:47:12 +01:00 committed by Felix Lange
parent 2640164304
commit a0abb7dcfc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
whisper/whisperv6/envelope.go
View file

@ -211,14 +211,14 @@ func (e *Envelope) Open(watcher *Filter) (msg *ReceivedMessage) {
// if the filter has some asymmetric key provided, it will // if the filter has some asymmetric key provided, it will
// attempt to open it asymmetrically. If this fails, then // attempt to open it asymmetrically. If this fails, then
// attempt to open it symmetrically. // attempt to open it symmetrically.
if watcher.KeyAsym != nil { if watcher.expectsAsymmetricEncryption() {
msg, _ = e.OpenAsymmetric(watcher.KeyAsym) msg, _ = e.OpenAsymmetric(watcher.KeyAsym)
if msg != nil { if msg != nil {
msg.Dst = &watcher.KeyAsym.PublicKey msg.Dst = &watcher.KeyAsym.PublicKey
} }
} }
if msg == nil { if msg == nil && watcher.expectsSymmetricEncryption() {
msg, _ = e.OpenSymmetric(watcher.KeySym) msg, _ = e.OpenSymmetric(watcher.KeySym)
if msg != nil { if msg != nil {
msg.SymKeyHash = crypto.Keccak256Hash(watcher.KeySym) msg.SymKeyHash = crypto.Keccak256Hash(watcher.KeySym)