From 72673d94d381464b502aa692dcc90d0df3b49cc5 Mon Sep 17 00:00:00 2001
From: "John C. Vernaleo" <john@netpurgatory.com>
Date: Wed, 8 Mar 2017 11:22:02 -0500
Subject: [PATCH] Switch to upstream golang.org/x/crypto (#608)

* Switch to upstream golang.org/x/crypto

* Update dcrutil to move to upstream crypto there too
---
 chainindexer.go    |  2 +-
 glide.lock         | 14 +++++++-------
 glide.yaml         |  6 +++---
 rpcwebsocket.go    |  2 +-
 txscript/opcode.go |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/chainindexer.go b/chainindexer.go
index 32b38eebbe..5e820a7e1c 100644
--- 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
index df8f8b5aa4..4d168512d0 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 89ed7e73f1c55de07eaf8c44717dd9919291b8ea2ab16bf76674324057ea583a
-updated: 2017-02-16T20:42:39.426024619Z
+hash: 807209320ff3d80af89663d3407f7d3fef4cfa67e52750c4ffa58bae790f8a16
+updated: 2017-03-08T11:08:04.404189759-05:00
 imports:
 - name: github.com/btcsuite/btclog
   version: 73889fb79bd687870312b6e40effcecffbd57d30
@@ -9,10 +9,6 @@ imports:
   version: 4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f
   subpackages:
   - socks
-- name: github.com/btcsuite/golangcrypto
-  version: 53f62d9b43e87a6c56975cf862af7edf33a8d0df
-  subpackages:
-  - ripemd160
 - name: github.com/btcsuite/goleveldb
   version: 7834afc9e8cd15233b6c3d97e12674a31ca24602
   subpackages:
@@ -53,7 +49,7 @@ imports:
 - name: github.com/decred/dcrrpcclient
   version: 0a9e95ce9a20a0fbf535fdc2c79169b30d613378
 - name: github.com/decred/dcrutil
-  version: ba0a5f399a43abc0e1a0a0442509c36f35321bce
+  version: 2646ed56075e905782d7342ccaefbb8243ffcdc4
   subpackages:
   - base58
   - bloom
@@ -61,6 +57,10 @@ imports:
   version: b0909d3f798b97a03c9e77023f97a5301a2a7900
   subpackages:
   - edwards25519
+- name: golang.org/x/crypto
+  version: 728b753d0135da6801d45a38e6f43ff55779c5c2
+  subpackages:
+  - ripemd160
 testImports:
 - name: github.com/pmezard/go-difflib
   version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
diff --git a/glide.yaml b/glide.yaml
index c4521aa142..5685b23e94 100644
--- 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
index 311c327ee8..53ad1c32be 100644
--- 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
index 3a8b9d6edf..7d65670d89 100644
--- 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"