Skip to content

Use null-terminated string for the signed token #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use null-terminated string for the signed token #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
926f73a
Use null-terminated string for the signed token
JeffLIrion Mar 7, 2020
3836225
Use null-terminated string for the signed token
JeffLIrion Jun 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion adb_shell/adb_device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def connect(self, rsa_keys=None, transport_timeout_s=None, auth_timeout_s=consta
raise exceptions.InvalidResponseError('Unknown AUTH response: %s %s %s' % (arg0, arg1, banner))

# 6.2. Sign the last ``banner`` and send it in an ``b'AUTH'`` message
signed_token = rsa_key.Sign(banner)
signed_token = rsa_key.Sign(banner) + b'\0'
msg = AdbMessage(constants.AUTH, constants.AUTH_SIGNATURE, 0, signed_token)
self._send(msg, adb_info)

Expand Down
2 changes: 1 addition & 1 deletion adb_shell/adb_device_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ async def connect(self, rsa_keys=None, transport_timeout_s=None, auth_timeout_s=
raise exceptions.InvalidResponseError('Unknown AUTH response: %s %s %s' % (arg0, arg1, banner))

# 6.2. Sign the last ``banner`` and send it in an ``b'AUTH'`` message
signed_token = rsa_key.Sign(banner)
signed_token = rsa_key.Sign(banner) + b'\0'
msg = AdbMessage(constants.AUTH, constants.AUTH_SIGNATURE, 0, signed_token)
await self._send(msg, adb_info)

Expand Down