BiztProtoBois/client
BiztProtoBois/client
3
0
Fork 0
Code Pull Requests Releases Activity

Compare commits

base: BiztProtoBois:206b7ed2f3ad7717f0d84070688ecdb0f9b662ff
Branches Tags
BiztProtoBois:master
...
compare: BiztProtoBois:e37fbd929b5b0223caa4ffe790e1500e1826e50d
Branches Tags
BiztProtoBois:master

2 Commits
206b7ed2f3 ... e37fbd929b

Author SHA1 Message Date
Torma Kristóf
e37fbd929b
Merge branch 'master' of https://git.kmlabz.com/BiztProtoBois/client into master
All checks were successful
continuous-integration/drone/push Build is passing
Details
2021-04-26 00:22:58 +02:00
Torma Kristóf
2fc4a1f752
cipherkey is now 32 characters strong 2021-04-26 00:22:48 +02:00
1 changed files with 5 additions and 1 deletions
Show Stats Expand all files Collapse all files

6
client/netwrapper.py
View File

@ -4,6 +4,7 @@ import string
import json import json
from base64 import b64encode, b64decode from base64 import b64encode, b64decode
import pyDH import pyDH
from Crypto.Hash import SHA512
from Crypto.Cipher import ChaCha20, PKCS1_OAEP from Crypto.Cipher import ChaCha20, PKCS1_OAEP
from Crypto.PublicKey.RSA import RsaKey from Crypto.PublicKey.RSA import RsaKey
from Crypto.Random import get_random_bytes from Crypto.Random import get_random_bytes
@ -61,7 +62,10 @@ class NetWrapper:
decodedmsg = json.loads(msg.decode('UTF-8')) decodedmsg = json.loads(msg.decode('UTF-8'))
cipher_rsa = PKCS1_OAEP.new(self.privateKey) cipher_rsa = PKCS1_OAEP.new(self.privateKey)
serverpubkey = int(cipher_rsa.decrypt(b64decode(decodedmsg['message'])).decode('UTF-8')) serverpubkey = int(cipher_rsa.decrypt(b64decode(decodedmsg['message'])).decode('UTF-8'))
self.cipherkey = dh.gen_shared_key(serverpubkey).encode('UTF-8') cipherkey = dh.gen_shared_key(serverpubkey).encode('UTF-8')
hasher = SHA512.new()
hasher.update(cipherkey)
self.cipherkey = hasher.hexdigest()[:32]
def authenticate(self, password: str): def authenticate(self, password: str):