Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1."

9 years ago · 0a7e668ebf
parent 5cd32f73d8 bf0d972ab4
commit 0a7e668ebf
1 changed files with 3 additions and 5 deletions
--- a/cryptfs.c
+++ b/cryptfs.c
@ -1253,11 +1253,9 @@ static int pbkdf2(const char *passwd, const unsigned char *salt,
    SLOGI("Using pbkdf2 for cryptfs KDF");

    /* Turn the password into a key and IV that can decrypt the master key */
-    PKCS5_PBKDF2_HMAC_SHA1(passwd, strlen(passwd),
-                           salt, SALT_LEN,
-                           HASH_COUNT, KEY_LEN_BYTES+IV_LEN_BYTES, ikey);
-
-    return 0;
+    return PKCS5_PBKDF2_HMAC_SHA1(passwd, strlen(passwd), salt, SALT_LEN,
+                                  HASH_COUNT, KEY_LEN_BYTES + IV_LEN_BYTES,
+                                  ikey) != 1;
 }

 static int scrypt(const char *passwd, const unsigned char *salt,