Switch to upstream golang.org/x/crypto (decred#608)

* Switch to upstream golang.org/x/crypto * Update dcrutil to move to upstream crypto there too
dnldd · Mar 8, 2017 · 72673d9 · 72673d9
1 parent f7d1882
commit 72673d9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/chainindexer.go b/chainindexer.go
@@ -19,7 +19,7 @@ import (
 	"github.com/decred/dcrd/wire"
 	"github.com/decred/dcrutil"
 
-	"github.com/btcsuite/golangcrypto/ripemd160"
+	"golang.org/x/crypto/ripemd160"
 )
 
 TODO Replace this with a new addrindexer

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -5,9 +5,6 @@ import:
 - package: github.com/btcsuite/go-socks
   subpackages:
   - socks
-- package: github.com/btcsuite/golangcrypto
-  subpackages:
-  - ripemd160
 - package: github.com/btcsuite/goleveldb
   subpackages:
   - leveldb
@@ -36,6 +33,9 @@ import:
 - package: github.com/decred/ed25519
   subpackages:
   - edwards25519
+- package: golang.org/x/crypto
+  subpackages:
+  - ripemd160
 testImport:
 - package: github.com/stretchr/testify
   version: ^1.1.0

diff --git a/rpcwebsocket.go b/rpcwebsocket.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/btcsuite/golangcrypto/ripemd160"
 	"github.com/btcsuite/websocket"
+	"golang.org/x/crypto/ripemd160"
 
 	"github.com/decred/dcrd/blockchain"
 	"github.com/decred/dcrd/blockchain/stake"

diff --git a/txscript/opcode.go b/txscript/opcode.go
@@ -13,7 +13,7 @@ import (
 	"fmt"
 	"hash"
 
-	"github.com/btcsuite/golangcrypto/ripemd160"
+	"golang.org/x/crypto/ripemd160"
 
 	"github.com/decred/dcrd/chaincfg"
 	"github.com/decred/dcrd/chaincfg/chainec"