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.

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 74f162061254f87e20bf6128dfe00058560153b3..1e4fbeb8a92708c7e1ded0496e6cfdcd922c92c3 100644 (file)
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -184,7 +184,7 @@ def main():
             p = FDroidPopen(['jarsigner', '-keystore', config['keystore'],
                              '-storepass:file', config['keystorepassfile'],
                              '-keypass:file', config['keypassfile'], '-sigalg',
-                             'MD5withRSA', '-digestalg', 'SHA1',
+                             'SHA1withRSA', '-digestalg', 'SHA1',
                              apkfile, keyalias])
             # TODO keypass should be sent via stdin
             if p.returncode != 0:

diff --git a/fdroidserver/signindex.py b/fdroidserver/signindex.py
index 9b571a20a4e61de0ec4fca4011b818464dc0b5ec..50a434557497203ac7ff217d6b4499393a8ba279 100644 (file)
--- a/fdroidserver/signindex.py
+++ b/fdroidserver/signindex.py
@@ -55,7 +55,7 @@ def main():
 
             args = ['jarsigner', '-keystore', config['keystore'],
                     '-storepass:file', config['keystorepassfile'],
-                    '-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
+                    '-digestalg', 'SHA1', '-sigalg', 'SHA1withRSA',
                     unsigned, config['repo_keyalias']]
             if config['keystore'] == 'NONE':
                 args += config['smartcardoptions']

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index f4acc67c6f09af0baa19965595f53b2989a6404b..4758e78901350a503bec4b9ecf792a245778f561 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -955,7 +955,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
         else:
             args = ['jarsigner', '-keystore', config['keystore'],
                     '-storepass:file', config['keystorepassfile'],
-                    '-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
+                    '-digestalg', 'SHA1', '-sigalg', 'SHA1withRSA',
                     signed, config['repo_keyalias']]
             if config['keystore'] == 'NONE':
                 args += config['smartcardoptions']