aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-09-20 21:43:48 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2013-09-20 21:43:48 +0200
commitac180275fd838887b6f08a2671db75195e9181d0 (patch)
tree55c36b6e730e3fb4e7428c93a2b5f93b7ea3dc60 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain
parentf4d3d813333c29d42fe6c60abbf757cb13a34618 (diff)
downloadopen-keychain-ac180275fd838887b6f08a2671db75195e9181d0.tar.gz
open-keychain-ac180275fd838887b6f08a2671db75195e9181d0.tar.bz2
open-keychain-ac180275fd838887b6f08a2671db75195e9181d0.zip
Set default algorithms to SHA-512 and AES-256
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java2
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java
index 121bae6ef..493f25707 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java
@@ -88,7 +88,7 @@ public class Preferences {
public int getDefaultHashAlgorithm() {
return mSharedPreferences.getInt(Constants.pref.DEFAULT_HASH_ALGORITHM,
- HashAlgorithmTags.SHA256);
+ HashAlgorithmTags.SHA512);
}
public void setDefaultHashAlgorithm(int value) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java
index 4310e86c4..381a4065c 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettings.java
@@ -36,8 +36,8 @@ public class AppSettings {
super();
this.packageName = packageName;
// defaults:
- this.encryptionAlgorithm = PGPEncryptedData.AES_128;
- this.hashAlgorithm = HashAlgorithmTags.SHA256;
+ this.encryptionAlgorithm = PGPEncryptedData.AES_256;
+ this.hashAlgorithm = HashAlgorithmTags.SHA512;
this.compression = Id.choice.compression.zlib;
}