commit f763b2fc07ee79045ca6c47e54d09dec90694e6c
author The Android Open Source Project <initial-contribution@android.com> Thu Aug 16 18:59:13 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 16 18:59:13 2012 -0700
tree b7764606ec9511b54a1adba75c491a92f31f24b0
parent 4fe053e1b406b41b5a60707523b389530619d953
parent 7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f

am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f':

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index e1c177d..cebe625 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1365,12 +1365,12 @@
     } else {
         char value[PROPERTY_VALUE_MAX];
 
-        property_get("ro.vold.wipe_on_cyrypt_fail", value, "0");
+        property_get("ro.vold.wipe_on_crypt_fail", value, "0");
         if (!strcmp(value, "1")) {
             /* wipe data if encryption failed */
             SLOGE("encryption failed - rebooting into recovery to wipe data\n");
             mkdir("/cache/recovery", 0700);
-            int fd = open("/cache/recovery/command", O_RDWR|O_CREAT|O_TRUNC);
+            int fd = open("/cache/recovery/command", O_RDWR|O_CREAT|O_TRUNC, 0600);
             if (fd >= 0) {
                 write(fd, "--wipe_data", strlen("--wipe_data") + 1);
                 close(fd);