Hashes passwords with username, not random salt.

Author: Pyva-Group

Mining.py

@@ -47,7 +47,14 @@ def mine(client):
     Edit this function to mine coins.
     Instructions are included with this file.
     '''
-    return
+    import secrets
+    while True:
+        randomStr = secrets.token_urlsafe(64)
+        if hashlib.sha512((randomStr + client.prevHash).encode()).hexdigest().startswith('0' * client.hashZeroes):
+            try:
+                client.send('/mine ' + randomStr, False)
+            except:
+                return
 
 
 

Terms and Conditions.txt

@@ -1,5 +1,5 @@
 
-Python Chatroom v4.0
+Python Chatroom v4.1.0
 v4.0, August 2019
 Made by Bill.
 

_Client v4.0.2.py _Client v4.1.0.py_Client v4.0.2.py renamed to _Client v4.1.0.py

@@ -1,9 +1,9 @@
 
 # Python ChatRoom Client
-# v4.0, August 2019
+# v4.1.0, August 2019
 # Made by Bill.
 # Updates:
-#     Very large clean-up of code.
+#   Now you can log in from other people's computers. 
 
 # Imports first, always.
 import socket
@@ -36,7 +36,7 @@ def write(self, message):
         '''
         pass
 
-sys.stderr = DevNull()
+# sys.stderr = DevNull()
 
 # Let's make a class for handling sockets!
 class Client(tk.Tk):
@@ -64,9 +64,6 @@ def __init__(self, port):
         self.data = json.load(f)
         f.close()
 
-        if not 'salt' in self.data:
-            self.data['salt'] = secrets.token_urlsafe(64)
-
         if not ('publicKey' in self.data and 'privateKey' in self.data):
             print('No keys detected...generating keys. (This may take a while.) ')
             keys = rsa.newkeys(1024)
@@ -240,7 +237,7 @@ def make_account(self, event = None):
             self.ui.configure_cursor('')
         credentials = str(self.publicKey.n) + '\n' + str(self.publicKey.e) + '\n'
         credentials += username + '\n'
-        credentials += hashlib.sha512((password + self.data['salt']).encode()).hexdigest() + '\nnewacc'
+        credentials += hashlib.sha512((password + username).encode()).hexdigest() + '\nnewacc'
         self.server.send(credentials.encode())
 
         message = self.server.recv(2048)
@@ -290,7 +287,7 @@ def login(self, event = None):
             pk1 = self.publicKey.n
             pk2 = self.publicKey.e
             username = self.ui.entries[1].get()
-            password = hashlib.sha512((self.ui.entries[2].get() + self.data['salt']).encode()).hexdigest()
+            password = hashlib.sha512((self.ui.entries[2].get() + username).encode()).hexdigest()
 
             credentials = str(pk1) + '\n' + str(pk2) + '\n' + username + '\n' + password
             self.server.send(credentials.encode())

_ClientUI.py

@@ -1,8 +1,7 @@
 
-# Python ChatRoomClient
-#     ClientUI.py
-# v4.0, August 2019
-# This is for clean-up, mostly.
+# Python ChatRoom Client
+#   ClientUI.py
+# v4.1.0, August 2019
 
 # Agh, imports.
 import ctypes

data.txt

@@ -1 +1 @@
-{"version": "v4.0", "agreedToTaC": false, "money": 0}
+{"version": "v4.1.0", "agreedToTaC": false, "money": 0}