commit 47ba10d6d53e0d2e54453fe62324afdfa8d6c78a
author Shawn Willden <swillden@google.com> Wed Sep 03 17:07:06 2014 -0600
committer Shawn Willden <swillden@google.com> Fri Sep 05 10:43:02 2014 -0600
tree e5f0ae326c20fbf9dd6ec5b0f0c4556bd7da5ab5
parent 60dec16c5026d29a52791ad790860d247f47f8f2

Pad object to proper size before signing.

Correct implementations of keymaster should reject using an n-bit
RSA key to sign less than n bits of data, because we specify that
keymaster should not perform padding.

Change-Id: Ibdff1bbfbee84fd5bdbfb3149a124dbbaa7827fc

cryptfs.h

diff --git a/cryptfs.h b/cryptfs.h
index 1cce21e..8aa1d1c 100644
--- a/cryptfs.h
+++ b/cryptfs.h
@@ -72,7 +72,8 @@
 /* Key Derivation Function algorithms */
 #define KDF_PBKDF2 1
 #define KDF_SCRYPT 2
-#define KDF_SCRYPT_KEYMASTER 3
+#define KDF_SCRYPT_KEYMASTER_IMPROPER 3
+#define KDF_SCRYPT_KEYMASTER 4
 
 /* Maximum allowed keymaster blob size. */
 #define KEYMASTER_BLOB_SIZE 2048