summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-11-18 17:17:59 +0100
committerEthan Yonker <dees_troy@teamw.in>2014-11-18 17:18:14 +0100
commitcceebb8189788457ef3bdee408e285aa8912121a (patch)
tree7eea76e08b6f1e55cd292720d3b54776d55082a5 /crypto
parentMake libmincrypttwrp a shared library (diff)
downloadandroid_bootable_recovery-cceebb8189788457ef3bdee408e285aa8912121a.tar
android_bootable_recovery-cceebb8189788457ef3bdee408e285aa8912121a.tar.gz
android_bootable_recovery-cceebb8189788457ef3bdee408e285aa8912121a.tar.bz2
android_bootable_recovery-cceebb8189788457ef3bdee408e285aa8912121a.tar.lz
android_bootable_recovery-cceebb8189788457ef3bdee408e285aa8912121a.tar.xz
android_bootable_recovery-cceebb8189788457ef3bdee408e285aa8912121a.tar.zst
android_bootable_recovery-cceebb8189788457ef3bdee408e285aa8912121a.zip
Diffstat (limited to 'crypto')
-rw-r--r--crypto/lollipop/cryptfs.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/lollipop/cryptfs.c b/crypto/lollipop/cryptfs.c
index 630fb0ee3..0277c78ef 100644
--- a/crypto/lollipop/cryptfs.c
+++ b/crypto/lollipop/cryptfs.c
@@ -1224,7 +1224,7 @@ static int scrypt_keymaster(const char *passwd, const unsigned char *salt,
unsigned char* master_key = convert_hex_ascii_to_key(passwd, &key_size);
if (!master_key) {
- printf("Failed to convert passwd from hex");
+ printf("Failed to convert passwd from hex\n");
return -1;
}
@@ -1234,13 +1234,13 @@ static int scrypt_keymaster(const char *passwd, const unsigned char *salt,
free(master_key);
if (rc) {
- printf("scrypt failed");
+ printf("scrypt failed\n");
return -1;
}
if (keymaster_sign_object(ftr, ikey, KEY_LEN_BYTES + IV_LEN_BYTES,
&signature, &signature_size)) {
- printf("Signing failed");
+ printf("Signing failed\n");
return -1;
}
@@ -1249,7 +1249,7 @@ static int scrypt_keymaster(const char *passwd, const unsigned char *salt,
free(signature);
if (rc) {
- printf("scrypt failed");
+ printf("scrypt failed\n");
return -1;
}
@@ -1929,12 +1929,12 @@ int check_unmounted_and_get_ftr(struct crypt_mnt_ftr* crypt_ftr)
property_get("ro.crypto.state", encrypted_state, "");
if ( master_key_saved || strcmp(encrypted_state, "encrypted") ) {
printf("encrypted fs already validated or not running with encryption,"
- " aborting");
- return -1;
+ " aborting\n");
+ //return -1;
}
if (get_crypt_ftr_and_key(crypt_ftr)) {
- printf("Error getting crypt footer and key");
+ printf("Error getting crypt footer and key\n");
return -1;
}