@@ -164,7 +164,7 @@ keytoolToAndroidConfig conf = Map.fromList
164164 [ ("storeFile", NValue_Path $ _keytoolConfig_keystore conf)
165165 , ("storePassword", NValue_Text $ T.pack $ _keytoolConfig_storepass conf)
166166 , ("keyAlias", NValue_Text $ T.pack $ _keytoolConfig_alias conf)
167− , ("keyPassword", NValue_Text $ T.pack $ _keytoolConfig_storepass conf)
167+ , ("keyPassword", NValue_Text $ T.pack $ _keytoolConfig_keypass conf)
168168 ]
169169
170170
@@ -189,7 +189,8 @@ deployMobile platform mobileArgs = withProjectRoot "." $ \root -> do
189189 { _keytoolConfig_keystore = keystorePath
190190 , _keytoolConfig_alias = "obelisk"
191191 , _keytoolConfig_storepass = keyStorePassword
192− , _keytoolConfig_dname = "CN=mqttserver.ibm.com, OU=ID, O=IBM, L=Hursley, S=Hants, C=GB" -- TODO Read these from config?
192+ , _keytoolConfig_keypass = keyStorePassword
193+ , _keytoolConfig_dname = "CN=example.com, OU=engineering, O=obelisk, L=LinuxLand, S=NY, C=US" -- TODO Read these from config?
193194 }
194195 createKeystore root $ keyToolConf
195196 liftIO $ BSL.writeFile keytoolConfPath $ encode keyToolConf
@@ -217,6 +218,7 @@ data KeytoolConfig = KeytoolConfig
217218 { _keytoolConfig_keystore :: FilePath
218219 , _keytoolConfig_alias :: String
219220 , _keytoolConfig_storepass :: String
221+ , _keytoolConfig_keypass :: String
220222 , _keytoolConfig_dname :: String
221223 } deriving (Show, Generic)
222224
@@ -232,9 +234,9 @@ createKeystore root config = do
232234 [ "-genkeypair -noprompt"
233235 , "-keystore", _keytoolConfig_keystore config
234236 , "-keyalg RSA -keysize 2048 -validity 10000"
235− , "-storetype pkcs12"
236237 , "-storepass", _keytoolConfig_storepass config
237238 , "-alias", _keytoolConfig_alias config
239+ , "-keypass", _keytoolConfig_keypass config
238240 , "-dname ", quote $ _keytoolConfig_dname config
239241 ]
240242 quote x = "\"" <> x <> "\""