From 9e57a6c5be9d02ae8b7c1d0824efa590e8714dca Mon Sep 17 00:00:00 2001
From: David Hill <dhill@conformal.com>
Date: Tue, 26 Nov 2013 20:13:31 -0500
Subject: [PATCH] add --notls option to disable connecting with TLS ok oga@

---
 util/btcctl/btcctl.go | 8 ++++----
 util/btcctl/config.go | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go
index e58ce729b..7d9cad935 100644
--- a/util/btcctl/btcctl.go
+++ b/util/btcctl/btcctl.go
@@ -274,7 +274,10 @@ func makeVerifyChain(args []interface{}) (btcjson.Cmd, error) {
 func send(cfg *config, msg []byte) (interface{}, error) {
 	var reply btcjson.Reply
 	var err error
-	if cfg.RPCCert != "" || cfg.TlsSkipVerify {
+	if cfg.NoTls || (cfg.RPCCert == "" && !cfg.TlsSkipVerify) {
+		reply, err = btcjson.RpcCommand(cfg.RPCUser, cfg.RPCPassword,
+			cfg.RPCServer, msg)
+	} else {
 		var pem []byte
 		if cfg.RPCCert != "" {
 			pem, err = ioutil.ReadFile(cfg.RPCCert)
@@ -285,9 +288,6 @@ func send(cfg *config, msg []byte) (interface{}, error) {
 		reply, err = btcjson.TlsRpcCommand(cfg.RPCUser,
 			cfg.RPCPassword, cfg.RPCServer, msg, pem,
 			cfg.TlsSkipVerify)
-	} else {
-		reply, err = btcjson.RpcCommand(cfg.RPCUser, cfg.RPCPassword,
-			cfg.RPCServer, msg)
 	}
 	if err != nil {
 		return nil, err
diff --git a/util/btcctl/config.go b/util/btcctl/config.go
index 6ab3be886..b85a5e86d 100644
--- a/util/btcctl/config.go
+++ b/util/btcctl/config.go
@@ -26,6 +26,7 @@ type config struct {
 	RPCPassword   string `short:"P" long:"rpcpass" default-mask:"-" description:"RPC password"`
 	RPCServer     string `short:"s" long:"rpcserver" description:"RPC server to connect to"`
 	RPCCert       string `short:"c" long:"rpccert" description:"RPC server certificate chain for validation"`
+	NoTls         bool   `long:"notls" description:"Disable TLS"`
 	TlsSkipVerify bool   `long:"skipverify" description:"Do not verify tls certificates (not recommended!)"`
 }