Split the API into the three distinct phases of the mpw algorithm.

2017-08-01 08:31:39 -04:00
parent 13107063df
commit 3c5cb1673a
15 changed files with 163 additions and 92 deletions
--- a/core/c/mpw-marshall-util.c
+++ b/core/c/mpw-marshall-util.c
@@ -102,7 +102,7 @@ bool mpw_update_masterKey(MPMasterKey *masterKey, MPAlgorithmVersion *masterKeyA
    if (*masterKeyAlgorithm != targetKeyAlgorithm) {
        mpw_free( *masterKey, MPMasterKeySize );
        *masterKeyAlgorithm = targetKeyAlgorithm;
-        *masterKey = mpw_masterKeyForUser(
+        *masterKey = mpw_masterKey(
                fullName, masterPassword, *masterKeyAlgorithm );
        if (!*masterKey) {
            err( "Couldn't derive master key for user %s, algorithm %d.\n", fullName, *masterKeyAlgorithm );