From da258dad57d9d840f6f3333fcdef4eddd050d701 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 4 Jan 2016 18:36:47 +0100 Subject: [PATCH] Replace md5 with hashlib.md5 --- fdroidserver/publish.py | 8 ++++---- fdroidserver/update.py | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py index 7dda4e8b..376f3f1b 100644 --- a/fdroidserver/publish.py +++ b/fdroidserver/publish.py @@ -20,8 +20,8 @@ import sys import os import shutil -import md5 import glob +import hashlib from argparse import ArgumentParser import logging @@ -90,7 +90,7 @@ def main(): vercodes = common.read_pkg_args(options.appid, True) allaliases = [] for appid in allapps: - m = md5.new() + m = hashlib.md5() m.update(appid) keyalias = m.hexdigest()[:8] if keyalias in allaliases: @@ -155,11 +155,11 @@ def main(): # For this particular app, the key alias is overridden... keyalias = config['keyaliases'][appid] if keyalias.startswith('@'): - m = md5.new() + m = hashlib.md5() m.update(keyalias[1:]) keyalias = m.hexdigest()[:8] else: - m = md5.new() + m = hashlib.md5() m.update(appid) keyalias = m.hexdigest()[:8] logging.info("Key alias: " + keyalias) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index a9fe6738..fdf96536 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -34,7 +34,6 @@ import time from pyasn1.error import PyAsn1Error from pyasn1.codec.der import decoder, encoder from pyasn1_modules import rfc2315 -from hashlib import md5 from binascii import hexlify, unhexlify from PIL import Image @@ -401,7 +400,7 @@ def getsig(apkpath): cert_encoded = encoder.encode(certificates)[4:] - return md5(cert_encoded.encode('hex')).hexdigest() + return hashlib.md5(cert_encoded.encode('hex')).hexdigest() def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False): -- 2.30.2