additional comment out old RSA-related code
This commit is contained in:
parent
1a51c5ceb1
commit
8453b1dd00
|
@ -2552,7 +2552,7 @@ class singleWorker(QThread):
|
||||||
queryreturn = sqlReturnQueue.get()
|
queryreturn = sqlReturnQueue.get()
|
||||||
sqlLock.release()
|
sqlLock.release()
|
||||||
|
|
||||||
elif addressVersionNumber == 1: #This whole section can be taken out soon because we aren't supporting v1 addresses for much longer.
|
"""elif addressVersionNumber == 1: #This whole section can be taken out soon because we aren't supporting v1 addresses for much longer.
|
||||||
messageToTransmit = '\x02' #message encoding type
|
messageToTransmit = '\x02' #message encoding type
|
||||||
messageToTransmit += encodeVarint(len('Subject:' + subject + '\n' + 'Body:' + body)) #Type 2 is simple UTF-8 message encoding.
|
messageToTransmit += encodeVarint(len('Subject:' + subject + '\n' + 'Body:' + body)) #Type 2 is simple UTF-8 message encoding.
|
||||||
messageToTransmit += 'Subject:' + subject + '\n' + 'Body:' + body
|
messageToTransmit += 'Subject:' + subject + '\n' + 'Body:' + body
|
||||||
|
@ -2612,7 +2612,7 @@ class singleWorker(QThread):
|
||||||
sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?')
|
sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?')
|
||||||
sqlSubmitQueue.put(t)
|
sqlSubmitQueue.put(t)
|
||||||
queryreturn = sqlReturnQueue.get()
|
queryreturn = sqlReturnQueue.get()
|
||||||
sqlLock.release()
|
sqlLock.release()"""
|
||||||
else:
|
else:
|
||||||
printLock.acquire()
|
printLock.acquire()
|
||||||
print 'In the singleWorker thread, the sendBroadcast function doesn\'t understand the address version'
|
print 'In the singleWorker thread, the sendBroadcast function doesn\'t understand the address version'
|
||||||
|
@ -2672,7 +2672,7 @@ class singleWorker(QThread):
|
||||||
payload += encodeVarint(len(signature))
|
payload += encodeVarint(len(signature))
|
||||||
payload += signature
|
payload += signature
|
||||||
|
|
||||||
elif fromAddressVersionNumber == 1: #This code is for old version 1 (RSA) addresses. It will soon be removed.
|
"""elif fromAddressVersionNumber == 1: #This code is for old version 1 (RSA) addresses. It will soon be removed.
|
||||||
payload = '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' #this run of nulls allows the true message receiver to identify his message
|
payload = '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' #this run of nulls allows the true message receiver to identify his message
|
||||||
payload += '\x01' #Message version.
|
payload += '\x01' #Message version.
|
||||||
payload += '\x00\x00\x00\x01'
|
payload += '\x00\x00\x00\x01'
|
||||||
|
@ -2705,7 +2705,7 @@ class singleWorker(QThread):
|
||||||
payload += fullAckPayload
|
payload += fullAckPayload
|
||||||
sendersPrivKey = rsa.PrivateKey(config.getint(fromaddress, 'n'),config.getint(fromaddress, 'e'),config.getint(fromaddress, 'd'),config.getint(fromaddress, 'p'),config.getint(fromaddress, 'q'))
|
sendersPrivKey = rsa.PrivateKey(config.getint(fromaddress, 'n'),config.getint(fromaddress, 'e'),config.getint(fromaddress, 'd'),config.getint(fromaddress, 'p'),config.getint(fromaddress, 'q'))
|
||||||
|
|
||||||
payload += rsa.sign(payload,sendersPrivKey,'SHA-512')
|
payload += rsa.sign(payload,sendersPrivKey,'SHA-512')"""
|
||||||
|
|
||||||
#We have assembled the data that will be encrypted. Now let us fetch the recipient's public key out of our database and do the encryption.
|
#We have assembled the data that will be encrypted. Now let us fetch the recipient's public key out of our database and do the encryption.
|
||||||
|
|
||||||
|
@ -2733,7 +2733,7 @@ class singleWorker(QThread):
|
||||||
readPosition += 64
|
readPosition += 64
|
||||||
encrypted = highlevelcrypto.encrypt(payload,"04"+pubEncryptionKeyBase256.encode('hex'))
|
encrypted = highlevelcrypto.encrypt(payload,"04"+pubEncryptionKeyBase256.encode('hex'))
|
||||||
|
|
||||||
elif toAddressVersionNumber == 1:
|
"""elif toAddressVersionNumber == 1:
|
||||||
sqlLock.acquire()
|
sqlLock.acquire()
|
||||||
sqlSubmitQueue.put('SELECT transmitdata FROM pubkeys WHERE hash=?')
|
sqlSubmitQueue.put('SELECT transmitdata FROM pubkeys WHERE hash=?')
|
||||||
sqlSubmitQueue.put((toRipe,))
|
sqlSubmitQueue.put((toRipe,))
|
||||||
|
@ -2766,7 +2766,7 @@ class singleWorker(QThread):
|
||||||
|
|
||||||
encrypted = outfile.getvalue()
|
encrypted = outfile.getvalue()
|
||||||
infile.close()
|
infile.close()
|
||||||
outfile.close()
|
outfile.close()"""
|
||||||
|
|
||||||
nonce = 0
|
nonce = 0
|
||||||
trialValue = 99999999999999999999
|
trialValue = 99999999999999999999
|
||||||
|
|
Loading…
Reference in New Issue
Block a user