From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 4 Jan 2011 22:45:38 +0000 (+0000)
Subject: Added the ability to override the key alias for specific applications
X-Git-Tag: 0.1~1577
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3a01ce9146e1fdb5bbe127348ecd0a4fe7549422;p=fdroidserver.git

Added the ability to override the key alias for specific applications
---

diff --git a/build.py b/build.py
index 3936a095..e35b0883 100644
--- a/build.py
+++ b/build.py
@@ -220,9 +220,13 @@ for app in apps:
             # If a collision does occur later, we're going to have to
             # come up with a new alogrithm, AND rename all existing keys
             # in the keystore!
-            m = md5.new()
-            m.update(app['id'])
-            keyalias = m.hexdigest()[:8]
+            if keyaliases.has_key(app['id']):
+                # For this particular app, the key alias is overridden...
+                keyalias = keyaliases[app['id']]
+            else:
+                m = md5.new()
+                m.update(app['id'])
+                keyalias = m.hexdigest()[:8]
             print "Key alias: " + keyalias
 
             # See if we already have a key for this application, and
diff --git a/config.sample.py b/config.sample.py
index 089ed55d..50cfb2ef 100644
--- a/config.sample.py
+++ b/config.sample.py
@@ -22,7 +22,12 @@ keystorepass = "foo"
 #The password for keys - the same is used for each auto-generated key.
 keypass = "foo2"
 
-#THe distinguished name used for all keys.
+#The distinguished name used for all keys.
 keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"
-"
+
+#Use this to override the auto-generated key aliases with specific ones
+#for particular applications. Normally, just leave it empty.
+keyaliases = {}
+keyaliases['com.example.app'] = 'example'
+