commit 71c2640ac0c59a76f24805ee0b988f63281d110c
author Eric Biggers <ebiggers@google.com> Tue Jan 29 13:12:23 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 29 13:12:23 2019 -0800
tree fddca2489b011ff62d415d3174775e27f9a6cd68
parent 4b42da8e1ac59692276aea05197fe9bd336cec96
parent 26aaaeaf10a5389d61b03bf9db56c631df199800

Merge "cryptfs: improve logging of dm-crypt device creation" am: f028d279ae
am: 26aaaeaf10

Change-Id: I214cc397a8a20eb3cce0c3f41b069fb4fc4fe3c2

cryptfs.cpp

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 01ac694..7c33449 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -984,7 +984,10 @@
     convert_key_to_hex_ascii(master_key, crypt_ftr->keysize, master_key_ascii);
 
     buff_offset = crypt_params - buffer;
-    SLOGI("Extra parameters for dm_crypt: %s\n", extra_params);
+    SLOGI(
+        "Creating crypto dev \"%s\"; cipher=%s, keysize=%u, real_dev=%s, len=%llu, params=\"%s\"\n",
+        name, crypt_ftr->crypto_type_name, crypt_ftr->keysize, real_blk_name, tgt->length * 512,
+        extra_params);
     snprintf(crypt_params, sizeof(buffer) - buff_offset, "%s %s 0 %s 0 %s",
              crypt_ftr->crypto_type_name, master_key_ascii, real_blk_name, extra_params);
     crypt_params += strlen(crypt_params) + 1;