summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2010-09-30 13:36:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 13:36:55 -0700
commit281d114ce8b380cade7c0ee4f70c7b0fb1f66fb2 (patch)
treefdd2249b5503bef3ac73b88bfc30654779029132 /cmds
parent2e88d0c4bc22412645d115945683ae6d7d2a33e3 (diff)
parentab6327bc9ab70f3b4c1f509d038474982772207e (diff)
downloadframeworks_base-281d114ce8b380cade7c0ee4f70c7b0fb1f66fb2.zip
frameworks_base-281d114ce8b380cade7c0ee4f70c7b0fb1f66fb2.tar.gz
frameworks_base-281d114ce8b380cade7c0ee4f70c7b0fb1f66fb2.tar.bz2
am ab6327bc: am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread
Merge commit 'ab6327bc9ab70f3b4c1f509d038474982772207e' * commit 'ab6327bc9ab70f3b4c1f509d038474982772207e': 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;
}