Merge branch 'master' of https://git.kmlabz.com/BiztProtoBois/server
continuous-integration/drone/push Build is passing

This commit is contained in:
2021-04-23 18:13:25 +02:00
2 changed files with 5 additions and 5 deletions
+1 -2
View File
@@ -3,9 +3,8 @@ import logging
import os import os
import shutil import shutil
import sys import sys
import binascii
from base64 import b64encode from base64 import b64encode
from Crypto.PublicKey import RSA
from Crypto.Hash import SHA256 from Crypto.Hash import SHA256
from Crypto.Protocol.KDF import bcrypt, bcrypt_check from Crypto.Protocol.KDF import bcrypt, bcrypt_check
+4 -3
View File
@@ -1,9 +1,10 @@
from authentication import Authetication
from Crypto.PublicKey import RSA
import json import json
import logging
import os import os
from Crypto.PublicKey import RSA
from authentication import Authetication
def generatePrivateKeyForUser(auth: Authetication, username: str, user_passphrase: str, public_server_key='') -> bool: def generatePrivateKeyForUser(auth: Authetication, username: str, user_passphrase: str, public_server_key='') -> bool:
if auth.checkUserExists(username): if auth.checkUserExists(username):