diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 07:25:47 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 07:25:47 +0800 |
| commit | 84f7c966f725ef0f5c62b4427857d112c0d1e828 (patch) | |
| tree | 22eb1d46333f5cc32b92cb143599821e9861d462 /whisper | |
| parent | 396f1a0a33aaa0acf0f1381471c37dabb3caa94e (diff) | |
| download | go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.gz go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.bz2 go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.lz go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.xz go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.tar.zst go-tangerine-84f7c966f725ef0f5c62b4427857d112c0d1e828.zip | |
Moved ECIES to repo & added secondary title for webview
* ECIES moved from obscuren to ethereum
* Added html META[name=badge] to reflect menuItem.secondaryTitle
Diffstat (limited to 'whisper')
| -rw-r--r-- | whisper/envelope.go | 2 | ||||
| -rw-r--r-- | whisper/whisper.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/whisper/envelope.go b/whisper/envelope.go index 3c477ad9f..d30397c98 100644 --- a/whisper/envelope.go +++ b/whisper/envelope.go @@ -7,9 +7,9 @@ import ( "time" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto/ecies" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/rlp" - "github.com/obscuren/ecies" ) const ( diff --git a/whisper/whisper.go b/whisper/whisper.go index 066f2c4ea..50c2f98fd 100644 --- a/whisper/whisper.go +++ b/whisper/whisper.go @@ -8,10 +8,10 @@ import ( "time" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto/ecies" "github.com/ethereum/go-ethereum/event/filter" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" - "github.com/obscuren/ecies" "gopkg.in/fatih/set.v0" ) |