From 44a2a6741771625e1f0947d828deabcf340df646 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Wed, 30 Oct 2019 12:20:30 -0400 Subject: [PATCH] Ensure inf+ log messages are free of private information. --- platform-independent/c/core/src/mpw-marshal-util.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/platform-independent/c/core/src/mpw-marshal-util.c b/platform-independent/c/core/src/mpw-marshal-util.c index ab0884d9..296e2ea2 100644 --- a/platform-independent/c/core/src/mpw-marshal-util.c +++ b/platform-independent/c/core/src/mpw-marshal-util.c @@ -65,13 +65,9 @@ bool mpw_update_master_key(MPMasterKey *masterKey, MPAlgorithmVersion *masterKey mpw_free( masterKey, MPMasterKeySize ); *masterKeyAlgorithm = targetKeyAlgorithm; *masterKey = mpw_master_key( fullName, masterPassword, *masterKeyAlgorithm ); - if (!*masterKey) { - err( "Couldn't derive master key for user %s, algorithm %d.", fullName, *masterKeyAlgorithm ); - return false; - } } - return true; + return masterKey && *masterKey != NULL; } #if MPW_JSON