network_diagnostics: Anonymize more FF parameters

A few more flimflam data fields now contain PII.  Make sure
network_diag doesn't expose them.

BUG=chromium-os:18517
TEST=Spot test mac_anonymize on (fake) user data.

Change-Id: Id1b0a9fb04f27e621dc59eceef19778b6a2bbb7f
Reviewed-on: http://gerrit.chromium.org/gerrit/5825
Reviewed-by: Ken Mixter <[email protected]>
Tested-by: Paul Stewart <[email protected]>
diff --git a/network_diagnostics b/network_diagnostics
index 6f62140..e0407b8 100755
--- a/network_diagnostics
+++ b/network_diagnostics
@@ -188,7 +188,9 @@
       -e 's/\([^0-9a-fA-F][0-9a-fA-F]\{8,11\}\)[0-9a-fA-F]\{4\}$/\1####/' \
       -e 's/\([^0-9a-fA-F][0-9a-fA-F]\{8\}\)[0-9a-fA-F]\{4\}\([^0-9a-fA-F]\)/\1####\2/' \
       -e 's/\(\/[0-9a-fA-F]\{8\}\)[0-9a-fA-F]\{4\}\([^0-9a-fA-F]\)/\1####\2/' \
-      -e 's/\(\/.*Passphrase \).*/\1[removed]/'
+      -e 's/\(\/.*Passphrase \).*/\1[removed]/' \
+      -e 's/\(\/.*PSK \).*/\1[removed]/' \
+      -e 's/\(\/.*Password \).*/\1[removed]/'
 }
 
 # Read the logs