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

onion-v3 support fix (partial)

Browse source 
thanks @anonymoose
This commit is contained in:
caryoscelus 2021-12-25 18:19:07 +00:00
parent fbe18bb1e1
commit 023ec7706f
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Crypt/CryptRsa.py
View file

@ -52,9 +52,17 @@ def privatekeyToPublickey(privatekey):
pub = rsa.PublicKey(priv.n, priv.e) pub = rsa.PublicKey(priv.n, priv.e)
return pub.save_pkcs1("DER") return pub.save_pkcs1("DER")
# adopted by @anonymoose & @caryoscelus from https://gitweb.torproject.org/stem.git/tree/stem/descriptor/hidden_service.py @ address_from_identity_key
def publickeyToOnionV3Address(key):
CHECKSUM_CONSTANT = b'.onion checksum'
version = b'\x03' # v3
checksum = hashlib.sha3_256(CHECKSUM_CONSTANT + key + version).digest()[:2]
onion_address = base64.b32encode(key + checksum + version)
return onion_address.decode('utf-8', 'replace').lower()
def publickeyToOnion(publickey): def publickeyToOnion(publickey):
# !ONION v3!
if len(publickey) == 32: if len(publickey) == 32:
addr = ed25519.publickey_to_onionaddress(publickey)[:-6] # !ONION v3!
return addr return publickeyToOnionV3Address(publickey)
return base64.b32encode(hashlib.sha1(publickey).digest()[:10]).lower().decode("ascii") else:
return base64.b32encode(hashlib.sha1(publickey).digest()[:10]).lower().decode("ascii")