oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace CryptRsa with CryptTor

Browse source
This commit is contained in:
Zola Gonano 2021-12-24 15:15:11 +00:00
parent 39864330d5
commit a0ae8897d7
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Test/TestTor.py
View file

@ -4,7 +4,7 @@ import pytest
import mock import mock
from File import FileServer from File import FileServer
from Crypt import CryptRsa from Crypt import CryptTor
from Config import config from Config import config
@pytest.mark.usefixtures("resetSettings") @pytest.mark.usefixtures("resetSettings")
@ -34,17 +34,17 @@ class TestTor:
address = tor_manager.addOnion() address = tor_manager.addOnion()
# Sign # Sign
sign = CryptRsa.sign(b"hello", tor_manager.getPrivatekey(address)) sign = CryptTor.sign(b"hello", tor_manager.getPrivatekey(address))
assert len(sign) == 128 assert len(sign) == 128
# Verify # Verify
publickey = CryptRsa.privatekeyToPublickey(tor_manager.getPrivatekey(address)) publickey = CryptTor.privatekeyToPublickey(tor_manager.getPrivatekey(address))
assert len(publickey) == 140 assert len(publickey) == 140
assert CryptRsa.verify(b"hello", publickey, sign) assert CryptTor.verify(b"hello", publickey, sign)
assert not CryptRsa.verify(b"not hello", publickey, sign) assert not CryptTor.verify(b"not hello", publickey, sign)
# Pub to address # Pub to address
assert CryptRsa.publickeyToOnion(publickey) == address assert CryptTor.publickeyToOnion(publickey) == address
# Delete # Delete
tor_manager.delOnion(address) tor_manager.delOnion(address)

8
src/Tor/TorManager.py
View file

@ -12,8 +12,10 @@ import atexit
import gevent import gevent
from Config import config from Config import config
from Crypt import CryptEd25519
from Crypt import CryptRsa from lib import Ed25519
from Crypt import CryptTor
from Site import SiteManager from Site import SiteManager
import socks import socks
from gevent.lock import RLock from gevent.lock import RLock
@ -272,7 +274,7 @@ class TorManager(object):
return self.privatekeys[address] return self.privatekeys[address]
def getPublickey(self, address): def getPublickey(self, address):
return CryptRsa.privatekeyToPublickey(self.privatekeys[address]) return CryptTor.privatekeyToPublickey(self.privatekeys[address])
def getOnion(self, site_address): def getOnion(self, site_address):
if not self.enabled: if not self.enabled: