diff options
author | gluk256 <gluk256@users.noreply.github.com> | 2018-01-30 16:55:08 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2018-01-30 16:55:08 +0800 |
commit | a9e4a90d57d3c072fb727ee62b71002325e23934 (patch) | |
tree | 45b0cd4885ebfb562fe0dbeb8b8b9d6859875401 /whisper/whisperv6/api.go | |
parent | 59a852e4188e18e587b6d54f646a6780f4d1f12c (diff) | |
download | dexon-a9e4a90d57d3c072fb727ee62b71002325e23934.tar dexon-a9e4a90d57d3c072fb727ee62b71002325e23934.tar.gz dexon-a9e4a90d57d3c072fb727ee62b71002325e23934.tar.bz2 dexon-a9e4a90d57d3c072fb727ee62b71002325e23934.tar.lz dexon-a9e4a90d57d3c072fb727ee62b71002325e23934.tar.xz dexon-a9e4a90d57d3c072fb727ee62b71002325e23934.tar.zst dexon-a9e4a90d57d3c072fb727ee62b71002325e23934.zip |
whisper: change the whisper message format so as to add the payload size (#15870)
* whisper: message format changed
* whisper: tests fixed
* whisper: style fixes
* whisper: fixed names, fixed failing tests
* whisper: fix merge issue in #15870
Occured while using the github online merge tool. Lesson learned.
* whisper: fix a gofmt error for #15870
Diffstat (limited to 'whisper/whisperv6/api.go')
-rw-r--r-- | whisper/whisperv6/api.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index 6cbce26f0..8ae2882e1 100644 --- a/whisper/whisperv6/api.go +++ b/whisper/whisperv6/api.go @@ -278,7 +278,7 @@ func (api *PublicWhisperAPI) Post(ctx context.Context, req NewMessage) (bool, er if params.KeySym, err = api.w.GetSymKey(req.SymKeyID); err != nil { return false, err } - if !validateSymmetricKey(params.KeySym) { + if !validateDataIntegrity(params.KeySym, aesKeyLength) { return false, ErrInvalidSymmetricKey } } @@ -384,7 +384,7 @@ func (api *PublicWhisperAPI) Messages(ctx context.Context, crit Criteria) (*rpc. if err != nil { return nil, err } - if !validateSymmetricKey(key) { + if !validateDataIntegrity(key, aesKeyLength) { return nil, ErrInvalidSymmetricKey } filter.KeySym = key @@ -556,7 +556,7 @@ func (api *PublicWhisperAPI) NewMessageFilter(req Criteria) (string, error) { if keySym, err = api.w.GetSymKey(req.SymKeyID); err != nil { return "", err } - if !validateSymmetricKey(keySym) { + if !validateDataIntegrity(keySym, aesKeyLength) { return "", ErrInvalidSymmetricKey } } |