From c078ee72eb206f0746e251861783c83acc78564b Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Tue, 3 Mar 2015 21:13:05 -0600 Subject: [PATCH] Update golang.org/x/crypto import paths to new location. --- legacy/keystore/keystore.go | 3 +-- snacl/snacl.go | 5 ++--- walletsetup.go | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/legacy/keystore/keystore.go b/legacy/keystore/keystore.go index 7f9f871..bf5cd80 100644 --- a/legacy/keystore/keystore.go +++ b/legacy/keystore/keystore.go @@ -34,14 +34,13 @@ import ( "sync" "time" - "golang.org/x/crypto/ripemd160" - "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/rename" + "github.com/btcsuite/golangcrypto/ripemd160" ) const ( diff --git a/snacl/snacl.go b/snacl/snacl.go index 22da16f..8e8725f 100644 --- a/snacl/snacl.go +++ b/snacl/snacl.go @@ -8,10 +8,9 @@ import ( "io" "runtime/debug" - "golang.org/x/crypto/nacl/secretbox" - "golang.org/x/crypto/scrypt" - "github.com/btcsuite/fastsha256" + "github.com/btcsuite/golangcrypto/nacl/secretbox" + "github.com/btcsuite/golangcrypto/scrypt" ) var ( diff --git a/walletsetup.go b/walletsetup.go index 7774fbd..4374f2b 100644 --- a/walletsetup.go +++ b/walletsetup.go @@ -32,7 +32,7 @@ import ( "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/walletdb" _ "github.com/btcsuite/btcwallet/walletdb/bdb" - "golang.org/x/crypto/ssh/terminal" + "github.com/btcsuite/golangcrypto/ssh/terminal" ) // promptConsoleList prompts the user with the given prefix, list of valid