commit d68e691d0a2d65385f08e7e98b1865e72457fdc1
author Eric Biggers <ebiggers@google.com> Wed Jan 17 03:54:11 2024 +0000
committer Eric Biggers <ebiggers@google.com> Wed Jan 17 18:36:57 2024 +0000
tree 43413e8a083da9534ccf4ef344dfc13bb84bf6f4
parent 8e98af6e9f8dc440a99f9f196205f1f760d7bff1

keystore: rename the PBKDF2 functions

Rename Password::derive_key() to Password::derive_key_pbkdf2(), and
rename generateKeyFromPassword() to PBKDF2().  This helps distinguish
these functions from the HKDF functions, including the existing ones as
well as the Password::derive_key_hkdf() added by the next CL.

Bug: 296464083
Bug: 314391626
Test: atest -p --include-subdirs system/security/keystore2
Change-Id: I76e5ee5a5c6452951727be6fce1a43a2322a3950

keystore2/src/crypto/Android.bp

diff --git a/keystore2/src/crypto/Android.bp b/keystore2/src/crypto/Android.bp
index 35fc5a9..c78ae41 100644
--- a/keystore2/src/crypto/Android.bp
+++ b/keystore2/src/crypto/Android.bp
@@ -74,7 +74,7 @@
         "--allowlist-function", "AES_gcm_encrypt",
         "--allowlist-function", "AES_gcm_decrypt",
         "--allowlist-function", "CreateKeyId",
-        "--allowlist-function", "generateKeyFromPassword",
+        "--allowlist-function", "PBKDF2",
         "--allowlist-function", "HKDFExtract",
         "--allowlist-function", "HKDFExpand",
         "--allowlist-function", "ECDHComputeKey",