diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-01-28 14:32:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-28 14:32:52 +0000 |
| commit | 9c4c5a6ed934490ba0fcce661594975a6f4c2c89 (patch) | |
| tree | 2dbffcd0c85f1d8ae911ed4d759e7acd805e1802 | |
| parent | a034362be4dc69d3432d7587089d371dc871e811 (diff) | |
| parent | 7b9c20d3b2aad8b2f67de9478d3d44cc6deff52c (diff) | |
| download | system_core-9c4c5a6ed934490ba0fcce661594975a6f4c2c89.tar.gz system_core-9c4c5a6ed934490ba0fcce661594975a6f4c2c89.tar.bz2 system_core-9c4c5a6ed934490ba0fcce661594975a6f4c2c89.zip | |
Merge "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 a85919989..1d486676e 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; } |