aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-02-17 20:05:58 +0800
committerFelix Lange <fjl@twurst.com>2015-02-17 20:05:58 +0800
commit119bea22aaf061d5b3e6a9abee9b1b95655b9fbe (patch)
treeb4420225106756fac17bdbc8e148b399afbd6418 /crypto
parentbb346a3ae1b6c250fdcb28b97280d3512a7fe219 (diff)
downloadgo-tangerine-119bea22aaf061d5b3e6a9abee9b1b95655b9fbe.tar
go-tangerine-119bea22aaf061d5b3e6a9abee9b1b95655b9fbe.tar.gz
go-tangerine-119bea22aaf061d5b3e6a9abee9b1b95655b9fbe.tar.bz2
go-tangerine-119bea22aaf061d5b3e6a9abee9b1b95655b9fbe.tar.lz
go-tangerine-119bea22aaf061d5b3e6a9abee9b1b95655b9fbe.tar.xz
go-tangerine-119bea22aaf061d5b3e6a9abee9b1b95655b9fbe.tar.zst
go-tangerine-119bea22aaf061d5b3e6a9abee9b1b95655b9fbe.zip
crypto: switch to golang.org/x/crypto
code.google.com/p/go.crypto is deprecated and will cause problems in future versions of Go.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/crypto.go4
-rw-r--r--crypto/key_store_passphrase.go8
2 files changed, 7 insertions, 5 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go
index e59250eb2..90e2c8939 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -16,12 +16,12 @@ import (
"errors"
"code.google.com/p/go-uuid/uuid"
- "code.google.com/p/go.crypto/pbkdf2"
- "code.google.com/p/go.crypto/ripemd160"
"github.com/ethereum/go-ethereum/crypto/ecies"
"github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/ethereum/go-ethereum/crypto/sha3"
"github.com/ethereum/go-ethereum/ethutil"
+ "golang.org/x/crypto/pbkdf2"
+ "golang.org/x/crypto/ripemd160"
)
func init() {
diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go
index 74408f874..7d21b6604 100644
--- a/crypto/key_store_passphrase.go
+++ b/crypto/key_store_passphrase.go
@@ -20,6 +20,7 @@
* @date 2015
*
*/
+
/*
This key store behaves as KeyStorePlain with the difference that
@@ -64,17 +65,18 @@ package crypto
import (
"bytes"
- "code.google.com/p/go-uuid/uuid"
- "code.google.com/p/go.crypto/scrypt"
"crypto/aes"
"crypto/cipher"
"encoding/hex"
"encoding/json"
"errors"
- "github.com/ethereum/go-ethereum/crypto/randentropy"
"io"
"os"
"path"
+
+ "code.google.com/p/go-uuid/uuid"
+ "github.com/ethereum/go-ethereum/crypto/randentropy"
+ "golang.org/x/crypto/scrypt"
)
const (