Revert bcrypto.GenerateFromPassword() to mainline go x/crypto

As per tendermint#3027.
This change is required for go dep -> go mod migration.

Gopkg.toml

@@ -52,11 +52,6 @@
   name = "github.com/btcsuite/btcd"
   revision = "ed77733ec07dfc8a513741138419b8d9d3de9d2d"
 
-[[override]]
-  name = "golang.org/x/crypto"
-  source = "https://github.com/tendermint/crypto"
-  revision = "3764759f34a542a3aef74d6b02e35be7ab893bba"
-
 [[constraint]]
   name = "github.com/cosmos/go-bip39"
   revision = "52158e4697b87de16ed390e1bdaf813e581008fa"
@@ -77,6 +72,10 @@
   name = "github.com/syndtr/goleveldb"
   revision = "c4c61651e9e37fa117f53c5a906d3b63090d8445"
 
+[[override]]
+  name = "github.com/x/crypto"
+  revision = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"
+
 [[override]]
   name = "golang.org/x/sys"
   revision = "4e1fef5609515ec7a2cee7b5de30ba6d9b438cbf"

crypto/keys/mintkey/mintkey.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/armor"
-	"github.com/tendermint/tendermint/crypto/encoding/amino"
+	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/crypto/xsalsa20symmetric"
 
 	cmn "github.com/tendermint/tendermint/libs/common"
@@ -106,7 +106,7 @@ func EncryptArmorPrivKey(privKey crypto.PrivKey, passphrase string) string {
 // encrypted priv key.
 func encryptPrivKey(privKey crypto.PrivKey, passphrase string) (saltBytes []byte, encBytes []byte) {
 	saltBytes = crypto.CRandBytes(16)
-	key, err := bcrypt.GenerateFromPassword(saltBytes, []byte(passphrase), BcryptSecurityParameter)
+	key, err := bcrypt.GenerateFromPassword([]byte(passphrase), BcryptSecurityParameter)
 	if err != nil {
 		cmn.Exit("Error generating bcrypt key from passphrase: " + err.Error())
 	}
@@ -140,7 +140,7 @@ func UnarmorDecryptPrivKey(armorStr string, passphrase string) (crypto.PrivKey,
 }
 
 func decryptPrivKey(saltBytes []byte, encBytes []byte, passphrase string) (privKey crypto.PrivKey, err error) {
-	key, err := bcrypt.GenerateFromPassword(saltBytes, []byte(passphrase), BcryptSecurityParameter)
+	key, err := bcrypt.GenerateFromPassword([]byte(passphrase), BcryptSecurityParameter)
 	if err != nil {
 		cmn.Exit("Error generating bcrypt key from passphrase: " + err.Error())
 	}

crypto/keys/mintkey/mintkey_bench_test.go

@@ -18,7 +18,7 @@ func BenchmarkBcryptGenerateFromPassword(b *testing.B) {
 			saltBytes := crypto.CRandBytes(16)
 			b.ResetTimer()
 			for i := 0; i < b.N; i++ {
-				_, err := bcrypt.GenerateFromPassword(saltBytes, passphrase, param)
+				_, err := bcrypt.GenerateFromPassword(passphrase, param)
 				require.Nil(b, err)
 			}
 		})