diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 11:21:59 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-06 11:21:59 -0700 |
| commit | 2659e77bd2add71883bcf6909487d4cceebc8f9a (patch) | |
| tree | 79130abe159f4edd70def9f7f246ae20590c0b2c /cmds/keystore/keymgmt.h | |
| parent | a244e8cdc984fdbd2a030f73990e541ae3981d27 (diff) | |
| parent | 57643ce5c6662754898f47ee70c655c74c394ead (diff) | |
| download | frameworks_native-2659e77bd2add71883bcf6909487d4cceebc8f9a.zip frameworks_native-2659e77bd2add71883bcf6909487d4cceebc8f9a.tar.gz frameworks_native-2659e77bd2add71883bcf6909487d4cceebc8f9a.tar.bz2 | |
am 24ad29c6: Merge change 6177 into donut
Merge commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625'
* commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625':
Two small checks in keymgmt.
Diffstat (limited to 'cmds/keystore/keymgmt.h')
| -rw-r--r-- | cmds/keystore/keymgmt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/keystore/keymgmt.h b/cmds/keystore/keymgmt.h index 0f10570..0e928db 100644 --- a/cmds/keystore/keymgmt.h +++ b/cmds/keystore/keymgmt.h @@ -27,7 +27,8 @@ #define AES_KEY_LEN 128 #define USER_KEY_LEN (AES_KEY_LEN/8) #define IV_LEN USER_KEY_LEN -#define MAX_RETRY_COUNT 6 +#define MAX_RETRY_COUNT 6 +#define MIN_PASSWD_LENGTH 8 #define gen_key(passwd, key, len) \ PKCS5_PBKDF2_HMAC_SHA1(passwd, strlen(passwd), \ |