summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoui Chang <louipc.ist@gmail.com>2009-01-04 16:27:50 -0500
committerLoui Chang <louipc.ist@gmail.com>2009-01-04 16:27:50 -0500
commit6c3e393d4ea2e2d1c518433f5b74a4996dca3404 (patch)
tree6f291797c6c9037f9d045bdebdf4d850d56b84dc
parent207b565f1c05c556f05f4a549afeeb8878a3c372 (diff)
downloadaurweb-6c3e393d4ea2e2d1c518433f5b74a4996dca3404.tar.xz
Correct hashlib.md5 usage in tupkg and tupkgs.
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
-rwxr-xr-xtupkg/client/tupkg2
-rwxr-xr-xtupkg/server/tupkgs8
2 files changed, 5 insertions, 5 deletions
diff --git a/tupkg/client/tupkg b/tupkg/client/tupkg
index f9980e6..af7d054 100755
--- a/tupkg/client/tupkg
+++ b/tupkg/client/tupkg
@@ -35,7 +35,7 @@ class ClientFile:
self.makeMd5()
def makeMd5(self):
- md5sum = md5.new()
+ md5sum = md5()
while self.fd.tell() != self.size:
md5sum.update(self.fd.read(1024))
self.md5 = md5sum.hexdigest()
diff --git a/tupkg/server/tupkgs b/tupkg/server/tupkgs
index f70cb2f..e43f15d 100755
--- a/tupkg/server/tupkgs
+++ b/tupkg/server/tupkgs
@@ -51,14 +51,14 @@ class ClientFile:
self.fd.seek(cur)
def makeMd5(self):
- md5sum = md5.new()
+ m = md5();
cur = self.fd.tell()
self.getSize()
self.fd.seek(0)
while self.fd.tell() != self.size:
- md5sum.update(self.fd.read(1024))
+ m.update(self.fd.read(1024))
self.fd.seek(cur)
- self.md5 = md5sum.hexdigest()
+ self.md5 = m.hexdigest()
def finishDownload(self):
self.fd.close()
@@ -122,7 +122,7 @@ class ClientSocket(threading.Thread):
db=config.get('mysql', 'db'))
q = dbconn.cursor()
- m = md5.new()
+ m = md5();
m.update(authdata['password'][0])
encpw = m.hexdigest()
try: