From c2dafbbba6630e5d0416466209688c242e4c280c Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Tue, 15 Mar 2016 22:20:59 -0500 Subject: Change to dd for wiping crypto partitions flash_image was spitting an error. We are also specifying a size so that we do not risk writing beyond the partition. Change-Id: Ie3a0d77db96e54357238595934c3df0e3b680823 --- partition.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/partition.cpp b/partition.cpp index 354563466..979272a44 100644 --- a/partition.cpp +++ b/partition.cpp @@ -1611,8 +1611,12 @@ bool TWPartition::Wipe_Encryption() { close(fd); } } else { - string Command = "flash_image " + Crypto_Key_Location + " /dev/zero"; - TWFunc::Exec_Cmd(Command); + if (TWFunc::IOCTL_Get_Block_Size(Crypto_Key_Location.c_str()) >= 16384LLU) { + string Command = "dd of='" + Crypto_Key_Location + "' if=/dev/zero bs=16384 count=1"; + TWFunc::Exec_Cmd(Command); + } else { + LOGINFO("Crypto key location reports size < 16K so not wiping crypto footer.\n"); + } } if (Wipe(Fstab_File_System)) { Has_Data_Media = Save_Data_Media; -- cgit v1.2.3