mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch '513-set-locale-explicitly-when-using-keytool' into 'master'
Resolve "fdroidserver fails on MacOSX while init" Closes #513 See merge request fdroid/fdroidserver!551
This commit is contained in:
commit
09d507839b
@ -2895,10 +2895,9 @@ def genkeystore(localconfig):
|
||||
if not os.path.exists(keystoredir):
|
||||
os.makedirs(keystoredir, mode=0o700)
|
||||
|
||||
env_vars = {
|
||||
'FDROID_KEY_STORE_PASS': localconfig['keystorepass'],
|
||||
'FDROID_KEY_PASS': localconfig['keypass'],
|
||||
}
|
||||
env_vars = {'LC_ALL': 'C.UTF-8',
|
||||
'FDROID_KEY_STORE_PASS': localconfig['keystorepass'],
|
||||
'FDROID_KEY_PASS': localconfig['keypass']}
|
||||
p = FDroidPopen([config['keytool'], '-genkey',
|
||||
'-keystore', localconfig['keystore'],
|
||||
'-alias', localconfig['repo_keyalias'],
|
||||
|
@ -620,7 +620,8 @@ def extract_pubkey():
|
||||
if 'repo_pubkey' in common.config:
|
||||
pubkey = unhexlify(common.config['repo_pubkey'])
|
||||
else:
|
||||
env_vars = {'FDROID_KEY_STORE_PASS': common.config['keystorepass']}
|
||||
env_vars = {'LC_ALL': 'C.UTF-8',
|
||||
'FDROID_KEY_STORE_PASS': common.config['keystorepass']}
|
||||
p = FDroidPopenBytes([common.config['keytool'], '-exportcert',
|
||||
'-alias', common.config['repo_keyalias'],
|
||||
'-keystore', common.config['keystore'],
|
||||
|
@ -59,11 +59,14 @@ def _ssh_key_from_debug_keystore(keystore=KEYSTORE_FILE):
|
||||
'-srcstorepass', PASSWORD, '-srckeypass', PASSWORD,
|
||||
'-destkeystore', p12, '-destalias', KEY_ALIAS,
|
||||
'-deststorepass', PASSWORD, '-destkeypass', PASSWORD,
|
||||
'-deststoretype', 'PKCS12'])
|
||||
'-deststoretype', 'PKCS12'],
|
||||
env={'LC_ALL': 'C.UTF-8'})
|
||||
subprocess.check_call(['openssl', 'pkcs12', '-in', p12, '-out', key_pem,
|
||||
'-passin', 'pass:' + PASSWORD, '-passout', 'pass:' + PASSWORD])
|
||||
'-passin', 'pass:' + PASSWORD, '-passout', 'pass:' + PASSWORD],
|
||||
env={'LC_ALL': 'C.UTF-8'})
|
||||
subprocess.check_call(['openssl', 'rsa', '-in', key_pem, '-out', privkey,
|
||||
'-passin', 'pass:' + PASSWORD])
|
||||
'-passin', 'pass:' + PASSWORD],
|
||||
env={'LC_ALL': 'C.UTF-8'})
|
||||
os.remove(key_pem)
|
||||
os.remove(p12)
|
||||
os.chmod(privkey, 0o600) # os.umask() should cover this, but just in case
|
||||
|
@ -74,7 +74,7 @@ def read_fingerprints_from_keystore():
|
||||
"""Obtain a dictionary containing all singning-key fingerprints which
|
||||
are managed by F-Droid, grouped by appid.
|
||||
"""
|
||||
env_vars = {'LC_ALL': 'C',
|
||||
env_vars = {'LC_ALL': 'C.UTF-8',
|
||||
'FDROID_KEY_STORE_PASS': config['keystorepass'],
|
||||
'FDROID_KEY_PASS': config['keypass']}
|
||||
p = FDroidPopen([config['keytool'], '-list',
|
||||
@ -318,10 +318,9 @@ def main():
|
||||
|
||||
# See if we already have a key for this application, and
|
||||
# if not generate one...
|
||||
env_vars = {
|
||||
'FDROID_KEY_STORE_PASS': config['keystorepass'],
|
||||
'FDROID_KEY_PASS': config['keypass'],
|
||||
}
|
||||
env_vars = {'LC_ALL': 'C.UTF-8',
|
||||
'FDROID_KEY_STORE_PASS': config['keystorepass'],
|
||||
'FDROID_KEY_PASS': config['keypass']}
|
||||
p = FDroidPopen([config['keytool'], '-list',
|
||||
'-alias', keyalias, '-keystore', config['keystore'],
|
||||
'-storepass:env', 'FDROID_KEY_STORE_PASS'], envs=env_vars)
|
||||
|
Loading…
Reference in New Issue
Block a user