mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

androguard is required, stop using use_androguard()

Browse source
This commit is contained in:
Hans-Christoph Steiner 2024-04-29 12:58:50 +02:00
parent 2fea71a6c7
commit 312f822764
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
fdroidserver/common.py
View file

@ -3190,17 +3190,16 @@ def get_first_signer_certificate(apkpath):
elif len(certs_v1) == 1: elif len(certs_v1) == 1:
cert_encoded_v1 = get_certificate(apk.read(certs_v1[0])) cert_encoded_v1 = get_certificate(apk.read(certs_v1[0]))
if True apkobject = get_androguard_APK(apkpath)
apkobject = get_androguard_APK(apkpath) certs_v2 = apkobject.get_certificates_der_v2()
certs_v2 = apkobject.get_certificates_der_v2() if len(certs_v2) > 0:
if len(certs_v2) > 0: logging.debug(_('Using APK Signature v2'))
logging.debug(_('Using APK Signature v2')) cert_encoded_v2 = certs_v2[0]
cert_encoded_v2 = certs_v2[0]
certs_v3 = apkobject.get_certificates_der_v3() certs_v3 = apkobject.get_certificates_der_v3()
if len(certs_v3) > 0: if len(certs_v3) > 0:
logging.debug(_('Using APK Signature v3')) logging.debug(_('Using APK Signature v3'))
cert_encoded_v3 = certs_v3[0] cert_encoded_v3 = certs_v3[0]
cert_encoded = cert_encoded_v3 or cert_encoded_v2 or cert_encoded_v1 cert_encoded = cert_encoded_v3 or cert_encoded_v2 or cert_encoded_v1
if not cert_encoded: if not cert_encoded: