mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

common: fix bug in new SHA-256 signatures for >= android-18

Browse source 
Luckily, this is only used in `fdroid nightly` so far.
This commit is contained in:
Hans-Christoph Steiner 2017-12-22 17:49:36 +01:00
parent 109eb928e8
commit e451ec0079
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -2466,7 +2466,7 @@ def sign_apk(unsigned_path, signed_path, keyalias):
if get_minSdkVersion_aapt(unsigned_path) < 18: if get_minSdkVersion_aapt(unsigned_path) < 18:
signature_algorithm = ['-sigalg', 'SHA1withRSA', '-digestalg', 'SHA1'] signature_algorithm = ['-sigalg', 'SHA1withRSA', '-digestalg', 'SHA1']
else: else:
signature_algorithm = ['-sigalg', 'SHA256withRSA', '-digestalg', 'SHA256'] signature_algorithm = ['-sigalg', 'SHA256withRSA', '-digestalg', 'SHA-256']
p = FDroidPopen([config['jarsigner'], '-keystore', config['keystore'], p = FDroidPopen([config['jarsigner'], '-keystore', config['keystore'],
'-storepass:env', 'FDROID_KEY_STORE_PASS', '-storepass:env', 'FDROID_KEY_STORE_PASS',

12
tests/common.TestCase
View file

@ -521,6 +521,18 @@ class CommonTest(unittest.TestCase):
self.assertFalse(os.path.isfile(unsigned)) self.assertFalse(os.path.isfile(unsigned))
self.assertTrue(fdroidserver.common.verify_apk_signature(signed)) self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
# now sign an APK with minSdkVersion >= 18
unsigned = os.path.join(testdir, 'duplicate.permisssions_9999999-unsigned.apk')
signed = os.path.join(testdir, 'duplicate.permisssions_9999999.apk')
shutil.copy(os.path.join(self.basedir, 'repo', 'duplicate.permisssions_9999999.apk'),
os.path.join(unsigned))
fdroidserver.common.apk_strip_signatures(unsigned, strip_manifest=True)
fdroidserver.common.sign_apk(unsigned, signed, config['keyalias'])
self.assertTrue(os.path.isfile(signed))
self.assertFalse(os.path.isfile(unsigned))
self.assertTrue(fdroidserver.common.verify_apk_signature(signed))
self.assertEqual(18, fdroidserver.common.get_minSdkVersion_aapt(signed))
def test_get_api_id_aapt(self): def test_get_api_id_aapt(self):
config = dict() config = dict()