|
|
|
@ -1,14 +1,13 @@
|
|
|
|
|
from trezor import config, loop, ui, wire
|
|
|
|
|
from trezor.messages import FailureType, PinMatrixRequestType
|
|
|
|
|
from trezor.messages import FailureType, wire_types
|
|
|
|
|
from trezor.messages.ButtonRequest import ButtonRequest
|
|
|
|
|
from trezor.messages.ButtonRequestType import Other
|
|
|
|
|
from trezor.messages.Failure import Failure
|
|
|
|
|
from trezor.messages.Success import Success
|
|
|
|
|
from trezor.messages import wire_types
|
|
|
|
|
from trezor.pin import pin_to_int, show_pin_timeout
|
|
|
|
|
from trezor.ui.text import Text
|
|
|
|
|
from apps.common.confirm import require_confirm
|
|
|
|
|
from apps.common.request_pin import request_pin, PinCancelled
|
|
|
|
|
from apps.common.request_pin import PinCancelled, request_pin
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async def change_pin(ctx, msg):
|
|
|
|
@ -18,7 +17,7 @@ async def change_pin(ctx, msg):
|
|
|
|
|
|
|
|
|
|
# get current pin, return failure if invalid
|
|
|
|
|
if config.has_pin():
|
|
|
|
|
curpin = await request_pin_ack(ctx, PinMatrixRequestType.Current)
|
|
|
|
|
curpin = await request_pin_ack(ctx)
|
|
|
|
|
if not config.check_pin(pin_to_int(curpin), show_pin_timeout):
|
|
|
|
|
return Failure(code=FailureType.PinInvalid, message='PIN invalid')
|
|
|
|
|
else:
|
|
|
|
@ -62,26 +61,23 @@ def require_confirm_change_pin(ctx, msg):
|
|
|
|
|
'set new PIN?'))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async def request_pin_ack(ctx, *args, **kwargs):
|
|
|
|
|
# TODO: send PinMatrixRequest here, with specific code?
|
|
|
|
|
await ctx.call(ButtonRequest(code=Other), wire_types.ButtonAck)
|
|
|
|
|
try:
|
|
|
|
|
return await ctx.wait(request_pin(*args, **kwargs))
|
|
|
|
|
except PinCancelled:
|
|
|
|
|
raise wire.FailureError(FailureType.ActionCancelled, 'Cancelled')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async def request_pin_confirm(ctx, *args, **kwargs):
|
|
|
|
|
while True:
|
|
|
|
|
pin1 = await request_pin_ack(
|
|
|
|
|
ctx, code=PinMatrixRequestType.NewFirst, *args, **kwargs)
|
|
|
|
|
pin2 = await request_pin_ack(
|
|
|
|
|
ctx, code=PinMatrixRequestType.NewSecond, *args, **kwargs)
|
|
|
|
|
pin1 = await request_pin_ack(ctx, 'Enter new PIN', *args, **kwargs)
|
|
|
|
|
pin2 = await request_pin_ack(ctx, 'Re-enter new PIN', *args, **kwargs)
|
|
|
|
|
if pin1 == pin2:
|
|
|
|
|
return pin1
|
|
|
|
|
await pin_mismatch()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async def request_pin_ack(ctx, *args, **kwargs):
|
|
|
|
|
try:
|
|
|
|
|
await ctx.call(ButtonRequest(code=Other), wire_types.ButtonAck)
|
|
|
|
|
return await ctx.wait(request_pin(*args, **kwargs))
|
|
|
|
|
except PinCancelled:
|
|
|
|
|
raise wire.FailureError(FailureType.ActionCancelled, 'Cancelled')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ui.layout
|
|
|
|
|
async def pin_mismatch():
|
|
|
|
|
text = Text(
|
|
|
|
|