commit b25302e1b0232ac2f9d6ffa441f2ab1ff23a2de3
author Paul Lawrence <paullawrence@google.com> Tue Nov 11 12:26:09 2014 -0800
committer Paul Lawrence <paullawrence@google.com> Tue Dec 02 09:27:37 2014 -0800
tree 9c6ddb442941143ffd3f388f81e0c11f49477d35
parent bb7d9afea9479eabbc98133d3d968225a1e1019e

Do not log passwords returned through vdc

Requires framework change:
  https://googleplex-android-review.git.corp.google.com/#/c/585511/

Bug: 18260068
Change-Id: I95d3bb39404ede7128b8f5d61ce2423a5f09a9b8

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index 4c65959..f135a01 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -710,8 +710,14 @@
         dumpArgs(argc, argv, -1);
         char* password = cryptfs_get_password();
         if (password) {
-            cli->sendMsg(ResponseCode::CommandOkay, password, false);
-            return 0;
+            char* message = 0;
+            int size = asprintf(&message, "{{sensitive}} %s", password);
+            if (size != -1) {
+                cli->sendMsg(ResponseCode::CommandOkay, message, false);
+                memset(message, 0, size);
+                free (message);
+                return 0;
+            }
         }
         rc = -1;
     } else if (!strcmp(argv[1], "clearpw")) {