diff options
author | Sami Tolvanen <samitolvanen@google.com> | 2015-01-28 14:43:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 14:43:10 +0000 |
commit | 42f058f7e867ccb7b3a3dc955b83ee6e236c031f (patch) | |
tree | b6f12e7f1773685195f6c5df7b1567c0e1b5934f | |
parent | 0e90714ae7fda2b84caa37ce46982d28c0801943 (diff) | |
parent | 9c4c5a6ed934490ba0fcce661594975a6f4c2c89 (diff) | |
download | system_core-42f058f7e867ccb7b3a3dc955b83ee6e236c031f.zip system_core-42f058f7e867ccb7b3a3dc955b83ee6e236c031f.tar.gz system_core-42f058f7e867ccb7b3a3dc955b83ee6e236c031f.tar.bz2 |
am 9c4c5a6e: Merge "Verify token length before adb signs it"
* commit '9c4c5a6ed934490ba0fcce661594975a6f4c2c89':
Verify token length before adb signs it
-rw-r--r-- | adb/adb_auth_host.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/adb/adb_auth_host.c b/adb/adb_auth_host.c index a859199..1d48667 100644 --- a/adb/adb_auth_host.c +++ b/adb/adb_auth_host.c @@ -395,6 +395,11 @@ int adb_auth_sign(void *node, void *token, size_t token_size, void *sig) unsigned int len; struct adb_private_key *key = node_to_item(node, struct adb_private_key, node); + if (token_size != TOKEN_SIZE) { + D("Unexpected token size %zd\n", token_size); + return 0; + } + if (!RSA_sign(NID_sha1, token, token_size, sig, &len, key->rsa)) { return 0; } |