From 3fdb29778a0b598d4ddf05ec5ed4593641d0da6e Mon Sep 17 00:00:00 2001
From: Henrik Jonsson <me@hkjn.me>
Date: Wed, 6 Dec 2017 12:47:28 +0000
Subject: Rename rpcuser.py to rpcauth.py

This script creates `rpcauth` entries for bitcoin.conf,
not the deprecated `rpcuser` entry, so this changes the name
of the script to match.
---
 share/rpcauth/README.md  | 10 ++++++++++
 share/rpcauth/rpcauth.py | 41 +++++++++++++++++++++++++++++++++++++++++
 share/rpcuser/README.md  | 10 ----------
 share/rpcuser/rpcuser.py | 41 -----------------------------------------
 4 files changed, 51 insertions(+), 51 deletions(-)
 create mode 100644 share/rpcauth/README.md
 create mode 100755 share/rpcauth/rpcauth.py
 delete mode 100644 share/rpcuser/README.md
 delete mode 100755 share/rpcuser/rpcuser.py

(limited to 'share')

diff --git a/share/rpcauth/README.md b/share/rpcauth/README.md
new file mode 100644
index 0000000000..389278a125
--- /dev/null
+++ b/share/rpcauth/README.md
@@ -0,0 +1,10 @@
+RPC Tools
+---------------------
+
+### [RPCAuth](/share/rpcauth) ###
+
+Create login credentials for a JSON-RPC user.
+
+Usage:
+
+    ./rpcauth.py <username>
diff --git a/share/rpcauth/rpcauth.py b/share/rpcauth/rpcauth.py
new file mode 100755
index 0000000000..6d9b44f699
--- /dev/null
+++ b/share/rpcauth/rpcauth.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying 
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+import hashlib
+import sys
+import os
+from random import SystemRandom
+import base64
+import hmac
+
+if len(sys.argv) < 2:
+    sys.stderr.write('Please include username as an argument.\n')
+    sys.exit(0)
+
+username = sys.argv[1]
+
+#This uses os.urandom() underneath
+cryptogen = SystemRandom()
+
+#Create 16 byte hex salt
+salt_sequence = [cryptogen.randrange(256) for i in range(16)]
+hexseq = list(map(hex, salt_sequence))
+salt = "".join([x[2:] for x in hexseq])
+
+#Create 32 byte b64 password
+password = base64.urlsafe_b64encode(os.urandom(32))
+
+digestmod = hashlib.sha256
+
+if sys.version_info.major >= 3:
+    password = password.decode('utf-8')
+    digestmod = 'SHA256'
+ 
+m = hmac.new(bytearray(salt, 'utf-8'), bytearray(password, 'utf-8'), digestmod)
+result = m.hexdigest()
+
+print("String to be appended to bitcoin.conf:")
+print("rpcauth="+username+":"+salt+"$"+result)
+print("Your password:\n"+password)
diff --git a/share/rpcuser/README.md b/share/rpcuser/README.md
deleted file mode 100644
index 12a8e6fb0c..0000000000
--- a/share/rpcuser/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-RPC Tools
----------------------
-
-### [RPCUser](/share/rpcuser) ###
-
-Create an RPC user login credential.
-
-Usage:
-
-    ./rpcuser.py <username>
diff --git a/share/rpcuser/rpcuser.py b/share/rpcuser/rpcuser.py
deleted file mode 100755
index 6d9b44f699..0000000000
--- a/share/rpcuser/rpcuser.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2015-2016 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying 
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-import hashlib
-import sys
-import os
-from random import SystemRandom
-import base64
-import hmac
-
-if len(sys.argv) < 2:
-    sys.stderr.write('Please include username as an argument.\n')
-    sys.exit(0)
-
-username = sys.argv[1]
-
-#This uses os.urandom() underneath
-cryptogen = SystemRandom()
-
-#Create 16 byte hex salt
-salt_sequence = [cryptogen.randrange(256) for i in range(16)]
-hexseq = list(map(hex, salt_sequence))
-salt = "".join([x[2:] for x in hexseq])
-
-#Create 32 byte b64 password
-password = base64.urlsafe_b64encode(os.urandom(32))
-
-digestmod = hashlib.sha256
-
-if sys.version_info.major >= 3:
-    password = password.decode('utf-8')
-    digestmod = 'SHA256'
- 
-m = hmac.new(bytearray(salt, 'utf-8'), bytearray(password, 'utf-8'), digestmod)
-result = m.hexdigest()
-
-print("String to be appended to bitcoin.conf:")
-print("rpcauth="+username+":"+salt+"$"+result)
-print("Your password:\n"+password)
-- 
cgit v1.2.3