mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Replace MD5withRSA with SHA1withRSA. Fixes #26.
Looks to me like we were using SHA1withRSA all along. Tested that everything still works with a test repo. As Hans reports, SHA1withRSA has been the default on Android tools for a long time and it's supported on all Android versions.
This commit is contained in:
parent
84573e4e5c
commit
d88914b466
@ -184,7 +184,7 @@ def main():
|
|||||||
p = FDroidPopen(['jarsigner', '-keystore', config['keystore'],
|
p = FDroidPopen(['jarsigner', '-keystore', config['keystore'],
|
||||||
'-storepass:file', config['keystorepassfile'],
|
'-storepass:file', config['keystorepassfile'],
|
||||||
'-keypass:file', config['keypassfile'], '-sigalg',
|
'-keypass:file', config['keypassfile'], '-sigalg',
|
||||||
'MD5withRSA', '-digestalg', 'SHA1',
|
'SHA1withRSA', '-digestalg', 'SHA1',
|
||||||
apkfile, keyalias])
|
apkfile, keyalias])
|
||||||
# TODO keypass should be sent via stdin
|
# TODO keypass should be sent via stdin
|
||||||
if p.returncode != 0:
|
if p.returncode != 0:
|
||||||
|
@ -55,7 +55,7 @@ def main():
|
|||||||
|
|
||||||
args = ['jarsigner', '-keystore', config['keystore'],
|
args = ['jarsigner', '-keystore', config['keystore'],
|
||||||
'-storepass:file', config['keystorepassfile'],
|
'-storepass:file', config['keystorepassfile'],
|
||||||
'-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
|
'-digestalg', 'SHA1', '-sigalg', 'SHA1withRSA',
|
||||||
unsigned, config['repo_keyalias']]
|
unsigned, config['repo_keyalias']]
|
||||||
if config['keystore'] == 'NONE':
|
if config['keystore'] == 'NONE':
|
||||||
args += config['smartcardoptions']
|
args += config['smartcardoptions']
|
||||||
|
@ -955,7 +955,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
|
|||||||
else:
|
else:
|
||||||
args = ['jarsigner', '-keystore', config['keystore'],
|
args = ['jarsigner', '-keystore', config['keystore'],
|
||||||
'-storepass:file', config['keystorepassfile'],
|
'-storepass:file', config['keystorepassfile'],
|
||||||
'-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
|
'-digestalg', 'SHA1', '-sigalg', 'SHA1withRSA',
|
||||||
signed, config['repo_keyalias']]
|
signed, config['repo_keyalias']]
|
||||||
if config['keystore'] == 'NONE':
|
if config['keystore'] == 'NONE':
|
||||||
args += config['smartcardoptions']
|
args += config['smartcardoptions']
|
||||||
|
Loading…
Reference in New Issue
Block a user