Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f27934e authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "Rename variables in transformUnderWeaverSecret()" into main

parents 19bb0085 f635e792
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -1802,13 +1802,14 @@ class SyntheticPasswordManager {
        return result;
    }

    private byte[] transformUnderWeaverSecret(byte[] data, byte[] secret) {
        final byte[] weaverSecret = SyntheticPasswordCrypto.personalizedHash(
                PERSONALIZATION_WEAVER_PASSWORD, secret);
    private byte[] transformUnderWeaverSecret(byte[] data, byte[] weaverSecret) {
        final byte[] hashedWeaverSecret =
                SyntheticPasswordCrypto.personalizedHash(
                        PERSONALIZATION_WEAVER_PASSWORD, weaverSecret);
        try {
            return secureConcat(data, weaverSecret);
            return secureConcat(data, hashedWeaverSecret);
        } finally {
            ArrayUtils.zeroize(weaverSecret);
            ArrayUtils.zeroize(hashedWeaverSecret);
        }
    }