From ac180275fd838887b6f08a2671db75195e9181d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 20 Sep 2013 21:43:48 +0200
Subject: [PATCH] Set default algorithms to SHA-512 and AES-256

---
 .../org/sufficientlysecure/keychain/helper/Preferences.java   | 2 +-
 .../keychain/service/remote/AppSettings.java                  | 4 ++--
 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;
     }