summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2010-09-30 10:11:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 10:11:16 -0700
commitab6327bc9ab70f3b4c1f509d038474982772207e (patch)
tree5d44d167659a5a2210bb4e11f2f14ae49d9f277e /cmds
parent2b133fc07533a853f7de23da4f60a766f4233bed (diff)
parent20cb2310cffb787c54016d50b9b5fe320fc5b025 (diff)
downloadframeworks_base-ab6327bc9ab70f3b4c1f509d038474982772207e.zip
frameworks_base-ab6327bc9ab70f3b4c1f509d038474982772207e.tar.gz
frameworks_base-ab6327bc9ab70f3b4c1f509d038474982772207e.tar.bz2
am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread
Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp * commit '20cb2310cffb787c54016d50b9b5fe320fc5b025': KeyStore: Initialize IV correctly.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/keystore/keystore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/keystore/keystore.c b/cmds/keystore/keystore.c
index 60cc521..971a177 100644
--- a/cmds/keystore/keystore.c
+++ b/cmds/keystore/keystore.c
@@ -166,7 +166,7 @@ static int8_t encrypt_blob(char *name, AES_KEY *aes_key)
int length;
int fd;
- if (read(the_entropy, vector, AES_BLOCK_SIZE) != AES_BLOCK_SIZE) {
+ if (read(the_entropy, blob.vector, AES_BLOCK_SIZE) != AES_BLOCK_SIZE) {
return SYSTEM_ERROR;
}