Merge branch 'master' of https://git.kmlabz.com/BiztProtoBois/server into master

fix import
2021-04-25 18:34:09 +02:00 · 2021-04-25 18:33:50 +02:00
1 changed files with 1 additions and 2 deletions
--- a/server/netwrapper.py
+++ b/server/netwrapper.py
@ -3,13 +3,12 @@ import json
 from base64 import b64encode, b64decode
 import pyDH
 from Crypto.Cipher import PKCS1_OAEP
-from Crypto.PublicKey import RSA
 from Crypto.Cipher import ChaCha20
 from Crypto.PublicKey.RSA import RsaKey
 from Crypto.Random import get_random_bytes

 from netsim import network_interface
-from server.server import Server
+from server import Server


 class NetWrapper:
Author	SHA1	Message	Date
Torma Kristóf	3ad96cf71a	Merge branch 'master' of https://git.kmlabz.com/BiztProtoBois/server into master All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-25 18:34:09 +02:00
Torma Kristóf	56a77f9c7e	fix import	2021-04-25 18:33:50 +02:00