Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6786

Browse Source 
975ae22 Fix send scalar z in plaintext (grydz)
333ae55 Update minimal Ledger Monero app version (grydz)
0a3c5a6 Update protocol version with Ledger's HW (grydz)
This commit is contained in:
luigi1111 2020-08-31 16:54:51 -05:00
commit 94b056c06e
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/device/device_ledger.cpp
View File

@ -259,7 +259,7 @@ namespace hw {
static int device_id = 0; static int device_id = 0;
#define PROTOCOL_VERSION 3 #define PROTOCOL_VERSION 4
#define INS_NONE 0x00 #define INS_NONE 0x00
#define INS_RESET 0x02 #define INS_RESET 0x02
@ -2126,7 +2126,7 @@ namespace hw {
AUTO_LOCK_CMD(); AUTO_LOCK_CMD();
#ifdef DEBUG_HWDEVICE #ifdef DEBUG_HWDEVICE
const rct::key p_x = hw::ledger::decrypt(p); const rct::key p_x = hw::ledger::decrypt(p);
const rct::key z_x = hw::ledger::decrypt(z); const rct::key z_x = z;
rct::key I_x; rct::key I_x;
rct::key D_x; rct::key D_x;
const rct::key H_x = H; const rct::key H_x = H;
@ -2146,7 +2146,8 @@ namespace hw {
//p //p
this->send_secret(p.bytes, offset); this->send_secret(p.bytes, offset);
//z //z
this->send_secret(z.bytes, offset); memmove(this->buffer_send+offset, z.bytes, 32);
offset += 32;
//H //H
memmove(this->buffer_send+offset, H.bytes, 32); memmove(this->buffer_send+offset, H.bytes, 32);
offset += 32; offset += 32;
@ -2225,7 +2226,7 @@ namespace hw {
const rct::key c_x = c; const rct::key c_x = c;
const rct::key a_x = hw::ledger::decrypt(a); const rct::key a_x = hw::ledger::decrypt(a);
const rct::key p_x = hw::ledger::decrypt(p); const rct::key p_x = hw::ledger::decrypt(p);
const rct::key z_x = hw::ledger::decrypt(z); const rct::key z_x = z;
const rct::key mu_P_x = mu_P; const rct::key mu_P_x = mu_P;
const rct::key mu_C_x = mu_C; const rct::key mu_C_x = mu_C;
rct::key s_x; rct::key s_x;
@ -2249,7 +2250,8 @@ namespace hw {
//p //p
this->send_secret(p.bytes, offset); this->send_secret(p.bytes, offset);
//z //z
this->send_secret(z.bytes, offset); memmove(this->buffer_send+offset, z.bytes, 32);
offset += 32;
//mu_P //mu_P
memmove(this->buffer_send+offset, mu_P.bytes, 32); memmove(this->buffer_send+offset, mu_P.bytes, 32);
offset += 32; offset += 32;

4
src/device/device_ledger.hpp
View File

@ -44,8 +44,8 @@ namespace hw {
/* Minimal supported version */ /* Minimal supported version */
#define MINIMAL_APP_VERSION_MAJOR 1 #define MINIMAL_APP_VERSION_MAJOR 1
#define MINIMAL_APP_VERSION_MINOR 3 #define MINIMAL_APP_VERSION_MINOR 6
#define MINIMAL_APP_VERSION_MICRO 1 #define MINIMAL_APP_VERSION_MICRO 0
#define VERSION(M,m,u) ((M)<<16|(m)<<8|(u)) #define VERSION(M,m,u) ((M)<<16|(m)<<8|(u))
#define VERSION_MAJOR(v) (((v)>>16)&0xFF) #define VERSION_MAJOR(v) (((v)>>16)&0xFF)