[projects/pld-ftp-admin] Replace md5 with haslib, md5 is deprecated since 2.5 and gone in python3
baggins
baggins at pld-linux.org
Sun Jan 17 11:46:27 CET 2021
commit 27e913d55ae4e82ac1edb599099a4fa68d9593dd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jan 17 11:31:48 2021 +0100
Replace md5 with haslib, md5 is deprecated since 2.5 and gone in python3
modules/cmds.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/modules/cmds.py b/modules/cmds.py
index e7dc879..80a0ecb 100644
--- a/modules/cmds.py
+++ b/modules/cmds.py
@@ -4,7 +4,7 @@ import os
import time
import config
import common
-import md5
+import hashlib
import ftptree
@@ -115,9 +115,10 @@ def cmd_login_passwd(con, data):
raise BailOut()
login=tmp[0]
passwd=tmp[1]
- md5pass=md5.new(passwd).hexdigest()
- if login in users and users[login]==md5pass:
- cookie=`time.time()`.split('.')[0]+'_'+md5.new(md5pass+salt).hexdigest()
+ md5pass=hashlib.md5(passwd.encode('utf-8')).hexdigest()
+ if login in users and users[login] == md5pass:
+ fullpass = md5pass+salt
+ cookie=repr(time.time()).split('.')[0]+'_'+hashlib.md5(fullpass.encode('utf-8')).hexdigest()
cookies[cookie]=login
write_cookies()
con.username=login
@@ -184,5 +185,5 @@ locks={}
logfile=open(common.ftpadmdir+'/var/log', 'a')
load_creds()
reloadftptree()
-salt=md5.new(`time.time()`).hexdigest()
+salt=hashlib.md5(repr(time.time()).encode('utf-8')).hexdigest()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-ftp-admin.git/commitdiff/7aec4c36547d10c790a119a1ac203eee13755a6d
More information about the pld-cvs-commit
mailing list