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

Merge pull request #102 from Atheros1/master

Browse Source 
added embeddedTime fuzzing to pubkey and getpubkey message assembly
This commit is contained in:
Jonathan Warren 2013-04-02 10:13:12 -07:00
commit a85273a3f4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bitmessagemain.py
View File

@ -2182,7 +2182,7 @@ class singleWorker(QThread):
myAddress = addressInKeysFile myAddress = addressInKeysFile
break break
embeddedTime = int(time.time())+random.randrange(-300, 300) #the current time plus or minus five minutes embeddedTime = int(time.time()+random.randrange(-300, 300)) #the current time plus or minus five minutes
payload = pack('>I',(embeddedTime)) payload = pack('>I',(embeddedTime))
payload += encodeVarint(addressVersionNumber) #Address version number payload += encodeVarint(addressVersionNumber) #Address version number
payload += encodeVarint(streamNumber) payload += encodeVarint(streamNumber)
@ -2471,7 +2471,11 @@ class singleWorker(QThread):
sqlSubmitQueue.put((toRipe,)) sqlSubmitQueue.put((toRipe,))
queryreturn = sqlReturnQueue.get() queryreturn = sqlReturnQueue.get()
sqlLock.release() sqlLock.release()
if queryreturn == []:
printLock.acquire()
sys.stderr.write('(within sendMsg) The needed pubkey was not found. This should never happen. Aborting send.\n')
printLock.release()
return
for row in queryreturn: for row in queryreturn:
pubkeyPayload, = row pubkeyPayload, = row
@ -2567,7 +2571,7 @@ class singleWorker(QThread):
def requestPubKey(self,addressVersionNumber,streamNumber,ripe): def requestPubKey(self,addressVersionNumber,streamNumber,ripe):
payload = pack('>I',int(time.time())) payload = pack('>I',(int(time.time())+random.randrange(-300, 300)))#the current time plus or minus five minutes.
payload += encodeVarint(addressVersionNumber) payload += encodeVarint(addressVersionNumber)
payload += encodeVarint(streamNumber) payload += encodeVarint(streamNumber)
payload += ripe payload += ripe
@ -3896,7 +3900,8 @@ class MyForm(QtGui.QMainWindow):
toAddress = str(self.ui.tableWidgetSent.item(i,0).data(Qt.UserRole).toPyObject()) toAddress = str(self.ui.tableWidgetSent.item(i,0).data(Qt.UserRole).toPyObject())
status,addressVersionNumber,streamNumber,ripe = decodeAddress(toAddress) status,addressVersionNumber,streamNumber,ripe = decodeAddress(toAddress)
if ripe == toRipe: if ripe == toRipe:
self.ui.tableWidgetSent.item(i,3).setText(unicode(textToDisplay,'utf-8')) #self.ui.tableWidgetSent.item(i,3).setText(unicode(textToDisplay,'utf-8'))
self.ui.tableWidgetSent.item(i,3).setText(textToDisplay)
def updateSentItemStatusByAckdata(self,ackdata,textToDisplay): def updateSentItemStatusByAckdata(self,ackdata,textToDisplay):
for i in range(self.ui.tableWidgetSent.rowCount()): for i in range(self.ui.tableWidgetSent.rowCount()):