mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-12 01:53:07 +03:00
Merge pull request #1500 from asdwsda/master
espota: fixed remaining python 3.5 incompatibility
This commit is contained in:
@ -104,10 +104,10 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
|
|||||||
if(data.startswith('AUTH')):
|
if(data.startswith('AUTH')):
|
||||||
nonce = data.split()[1]
|
nonce = data.split()[1]
|
||||||
cnonce_text = '%s%u%s%s' % (filename, content_size, file_md5, remoteAddr)
|
cnonce_text = '%s%u%s%s' % (filename, content_size, file_md5, remoteAddr)
|
||||||
cnonce = hashlib.md5(cnonce_text).hexdigest()
|
cnonce = hashlib.md5(cnonce_text.encode()).hexdigest()
|
||||||
passmd5 = hashlib.md5(password).hexdigest()
|
passmd5 = hashlib.md5(password.encode()).hexdigest()
|
||||||
result_text = '%s:%s:%s' % (passmd5 ,nonce, cnonce)
|
result_text = '%s:%s:%s' % (passmd5 ,nonce, cnonce)
|
||||||
result = hashlib.md5(result_text).hexdigest()
|
result = hashlib.md5(result_text.encode()).hexdigest()
|
||||||
sys.stderr.write('Authenticating...')
|
sys.stderr.write('Authenticating...')
|
||||||
sys.stderr.flush()
|
sys.stderr.flush()
|
||||||
message = '%d %s %s\n' % (AUTH, cnonce, result)
|
message = '%d %s %s\n' % (AUTH, cnonce, result)
|
||||||
|
Reference in New Issue
Block a user