Skip to content

Fix for Nano S 1.3.0 (SCP < 2) #6

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
Vedrillan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for Nano S 1.3.0 (SCP < 2) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ledgerwallet/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def delete_app(self, app: Union[str, bytes]):
def install_remote_app(
self, app_path, key_path, url=LEDGER_HSM_URL, key=LEDGER_HSM_KEY
):
script = HsmScript("distributeFirmware11", {"persoKey": key, "scpv2": "dummy"})
script = HsmScript("distributeFirmware11", {"persoKey": key}, self.target_id)
server = HsmServer(script, url)
self.authenticate(server)

Expand All @@ -335,7 +335,7 @@ def upgrade_firmware(
self, firmware_name, firmware_key, url=LEDGER_HSM_URL, key=LEDGER_HSM_KEY
):
script = HsmScript(
"distributeFirmware11_scan", {"persoKey": key, "scpv2": "dummy"}
"distributeFirmware11_scan", {"persoKey": key}, self.target_id
)
server = HsmServer(script, url)
self.authenticate(server)
Expand All @@ -359,7 +359,7 @@ def upgrade_firmware(
offset += 5 + apdu_len

def genuine_check(self, url=LEDGER_HSM_URL, key=LEDGER_HSM_KEY):
script = HsmScript("checkGenuine", {"persoKey": key, "scpv2": "dummy"})
script = HsmScript("checkGenuine", {"persoKey": key}, self.target_id)
server = HsmServer(script, url)
self.authenticate(server)

Expand Down Expand Up @@ -424,7 +424,7 @@ def target_id(self):
return self._target_id

def list_apps_remote(self, url=LEDGER_HSM_URL, key=LEDGER_HSM_KEY):
script = HsmScript("listApps", {"persoKey": key, "scpv2": "dummy"})
script = HsmScript("listApps", {"persoKey": key}, self.target_id)
server = HsmServer(script, url)
self.authenticate(server)

Expand Down
6 changes: 5 additions & 1 deletion ledgerwallet/hsmscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ class HsmScript:


class HsmScript(object):
def __init__(self, name: str, default_params: dict, use_large_stack: bool = True):
def __init__(self, name: str, default_params: dict, target_id: int, use_large_stack: bool = True):
self.name = name
self.default_params = default_params
self.use_large_stack = use_large_stack
if target_id & 0xF <= 2:
self.scpv2 = False
else:
self.scpv2 = True
2 changes: 2 additions & 0 deletions ledgerwallet/hsmserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ def query(self, data=None, params=None) -> bytes:
elif self.script.default_params:
for alias, name in self.script.default_params.items():
self._query_add_param(request, alias, name)
if self.script.scpv2:
self._query_add_param(request, "scpv2", "dummy")

if data is not None:
request.parameters = data
Expand Down