balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Signer/Ledger: hash big payloads on Ledger if supported

Browse Source
This commit is contained in:
Vincent Bernardoff 2018-07-04 19:23:02 +02:00 committed by Benjamin Canou
parent 3dc8b7b605
commit d6fac868ee
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib_signer_backends/ledger.ml
View File

@ -150,10 +150,10 @@ module Ledger = struct
let curves { Ledgerwallet_tezos.Version.major ; minor ; patch ; _ } = let curves { Ledgerwallet_tezos.Version.major ; minor ; patch ; _ } =
let open Ledgerwallet_tezos in let open Ledgerwallet_tezos in
match major, minor, patch with if (major, minor, patch) <= (0, 1, 0) then
| 0, 0, _ [ Ed25519 ; Secp256k1 ]
| 0, 1, 0 -> [ Ed25519 ; Secp256k1 ] else
| _ -> [ Ed25519 ; Secp256k1 ; Secp256r1 ] [ Ed25519 ; Secp256k1 ; Secp256r1 ]
let of_hidapi ?pkh device_info h = let of_hidapi ?pkh device_info h =
let find_ledgers version = let find_ledgers version =
@ -286,7 +286,7 @@ let public_key_hash pk_uri =
let sign ?watermark sk_uri msg = let sign ?watermark sk_uri msg =
pkh_of_sk_uri sk_uri >>=? fun pkh -> pkh_of_sk_uri sk_uri >>=? fun pkh ->
with_ledger pkh begin fun ledger _version _of_curve _of_pkh -> with_ledger pkh begin fun ledger { major; minor; patch; _ } _of_curve _of_pkh ->
let msg = Option.unopt_map watermark let msg = Option.unopt_map watermark
~default:msg ~f:begin fun watermark -> ~default:msg ~f:begin fun watermark ->
MBytes.concat "" [Signature.bytes_of_watermark watermark ; MBytes.concat "" [Signature.bytes_of_watermark watermark ;
@ -296,7 +296,7 @@ let sign ?watermark sk_uri msg =
let path = tezos_root @ path_of_sk_uri sk_uri in let path = tezos_root @ path_of_sk_uri sk_uri in
let msg_len = MBytes.length msg in let msg_len = MBytes.length msg in
wrap_ledger_cmd begin fun pp -> wrap_ledger_cmd begin fun pp ->
if msg_len > 1024 then if msg_len > 1024 && (major, minor, patch) < (1, 1, 0) then
Ledgerwallet_tezos.sign ~hash_on_ledger:false Ledgerwallet_tezos.sign ~hash_on_ledger:false
~pp ledger curve path ~pp ledger curve path
(Cstruct.of_bigarray (Blake2B.(to_bytes (hash_bytes [ msg ])))) (Cstruct.of_bigarray (Blake2B.(to_bytes (hash_bytes [ msg ]))))