aboutsummaryrefslogtreecommitdiff
path: root/init.cpp
diff options
context:
space:
mode:
authorgavinandresen <gavinandresen@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-10-11 18:23:41 +0000
committergavinandresen <gavinandresen@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-10-11 18:23:41 +0000
commited54768f5f90de73c0349684a38df2667f3deae2 (patch)
tree14319d60c8ea188e5857d054318cf49a611a78bc /init.cpp
parent83082f04a47d6540f40dd656d1baed54eb17e76b (diff)
downloadbitcoin-ed54768f5f90de73c0349684a38df2667f3deae2.tar.xz
-rpcssl=1 option, allowing secure HTTPS JSON-RPC connections on OSX/Unix.
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@165 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'init.cpp')
-rw-r--r--init.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/init.cpp b/init.cpp
index 45d79d71ba..94ba99d85f 100644
--- a/init.cpp
+++ b/init.cpp
@@ -175,8 +175,22 @@ bool AppInit2(int argc, char* argv[])
" -connect=<ip> \t " + _("Connect only to the specified node\n") +
" -server \t " + _("Accept command line and JSON-RPC commands\n") +
" -daemon \t " + _("Run in the background as a daemon and accept commands\n") +
+ " -rpcuser \t " + _("Username for JSON-RPC connection\n") +
+ " -rpcpassword \t " + _("Password for JSON-RPC connection\n") +
+ " -rpcport=<port> \t " + _("Listen for JSON-RPC connections on <port>\n") +
+ " -rpcallowip=<ip>\t " + _("Allow JSON-RPC connections from specified IP address\n") +
+ " -rpcconnect=<ip>\t " + _("Send commands to node running on <ip>\n") +
" -? \t " + _("This help message\n");
+#ifdef USE_SSL
+ strUsage += string() +
+ _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)\n") +
+ " -rpcssl=1 \t " + _("Use OpenSSL (https) for JSON-RPC connections\n") +
+ " -rpcsslcertificatchainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)\n") +
+ " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)\n") +
+ " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n");
+#endif
+
#if defined(__WXMSW__) && defined(GUI)
// Tabs make the columns line up in the message box
wxMessageBox(strUsage, "Bitcoin", wxOK);