Bitmessage/PyBitmessage-2024-12-07
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

support for encoding and decoding variable length addresses #450

Merged
Atheros1 merged 7 commits from master into master 2013-08-26 21:29:30 +02:00
Conversation 0 Commits 7 Files Changed 5 +3 -10
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3e8ce3b82 - Show all commits

13
src/addresses.py
View File

@ -107,13 +107,8 @@ def encodeAddress(version,stream,ripe):
elif version == 4: elif version == 4:
if len(ripe) != 20: if len(ripe) != 20:
raise Exception("Programming error in encodeAddress: The length of a given ripe hash was not 20.") raise Exception("Programming error in encodeAddress: The length of a given ripe hash was not 20.")
emptybitcounter = 0 ripe = ripe.lstrip('\x00')
while True:
if ripe[emptybitcounter] != '\x00':
break
emptybitcounter += 1
ripe = ripe[emptybitcounter:]
a = encodeVarint(version) + encodeVarint(stream) + ripe a = encodeVarint(version) + encodeVarint(stream) + ripe
sha = hashlib.new('sha512') sha = hashlib.new('sha512')
sha.update(a) sha.update(a)
@ -207,9 +202,7 @@ def decodeAddress(address):
elif len(data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4]) < 4: elif len(data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4]) < 4:
return 'ripetooshort',0,0,0 return 'ripetooshort',0,0,0
else: else:
x00string = '' x00string = '\x00' * (20 - len(data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4]))
for i in range(20 - len(data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4])):
x00string += '\x00'
return status,addressVersionNumber,streamNumber,x00string+data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4] return status,addressVersionNumber,streamNumber,x00string+data[bytesUsedByVersionNumber+bytesUsedByStreamNumber:-4]