 +                StringBuilder logMessage = new StringBuilder();
 +                logMessage.append("DO NOT SUBMIT derivePassword");
 +                logMessage.append(" personalization: ");
-+                logMessage.append(personalization);
++                logMessage.append(SyntheticPasswordCrypto.bytesToHex(personalization));
 +                logMessage.append(" context: ");
 +                logMessage.append(SyntheticPasswordCrypto.bytesToHex(PERSONALISATION_CONTEXT));
 +                byte[] res = (new SP800Derive(syntheticPassword.getBytes()))

 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
index 3c6362000eb..b62843e0a85 100644
--- a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
+++ b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
@@ -156,8 +156,18 @@ public class SyntheticPasswordManager {

From f604dad1927eb2c96213ed7428f8fda116fa8025 Mon Sep 17 00:00:00 2001
From: Paul Crowley <paulcrowley@google.com>
Date: Thu, 6 Aug 2020 22:54:29 -0700
Subject: [PATCH] Add logging for SP800-derived passwords too
