Skip to content

Commit 119bea2

Browse files
committed
crypto: switch to golang.org/x/crypto
code.google.com/p/go.crypto is deprecated and will cause problems in future versions of Go.
1 parent bb346a3 commit 119bea2

File tree

10 files changed

+15
-254
lines changed

10 files changed

+15
-254
lines changed

Godeps/Godeps.json

Lines changed: 8 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/code.google.com/p/go.crypto/pbkdf2/pbkdf2.go

Lines changed: 0 additions & 77 deletions
This file was deleted.

Godeps/_workspace/src/code.google.com/p/go.crypto/pbkdf2/pbkdf2_test.go

Lines changed: 0 additions & 157 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

crypto/crypto.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import (
1616
"errors"
1717

1818
"code.google.com/p/go-uuid/uuid"
19-
"code.google.com/p/go.crypto/pbkdf2"
20-
"code.google.com/p/go.crypto/ripemd160"
2119
"github.com/ethereum/go-ethereum/crypto/ecies"
2220
"github.com/ethereum/go-ethereum/crypto/secp256k1"
2321
"github.com/ethereum/go-ethereum/crypto/sha3"
2422
"github.com/ethereum/go-ethereum/ethutil"
23+
"golang.org/x/crypto/pbkdf2"
24+
"golang.org/x/crypto/ripemd160"
2525
)
2626

2727
func init() {

crypto/key_store_passphrase.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* @date 2015
2121
*
2222
*/
23+
2324
/*
2425
2526
This key store behaves as KeyStorePlain with the difference that
@@ -64,17 +65,18 @@ package crypto
6465

6566
import (
6667
"bytes"
67-
"code.google.com/p/go-uuid/uuid"
68-
"code.google.com/p/go.crypto/scrypt"
6968
"crypto/aes"
7069
"crypto/cipher"
7170
"encoding/hex"
7271
"encoding/json"
7372
"errors"
74-
"github.com/ethereum/go-ethereum/crypto/randentropy"
7573
"io"
7674
"os"
7775
"path"
76+
77+
"code.google.com/p/go-uuid/uuid"
78+
"github.com/ethereum/go-ethereum/crypto/randentropy"
79+
"golang.org/x/crypto/scrypt"
7880
)
7981

8082
const (

0 commit comments

Comments
 (0)