Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for V10 protocol with BulletProofV2 and short amount.

This commit is contained in:
cslashm 2019-02-08 16:11:51 +01:00
parent 63cc02c08d
commit 2dbc487ec0
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/device/device_ledger.cpp
View File

@ -1313,7 +1313,10 @@ namespace hw {
this->controle_device->ecdhEncode(unmasked_x, AKout_x, short_amount); this->controle_device->ecdhEncode(unmasked_x, AKout_x, short_amount);
#endif #endif
int offset = set_command_header_noopt(INS_BLIND); int offset = set_command_header(INS_BLIND);
//options
this->buffer_send[offset] = short_amount?0x02:0x00;
offset += 1;
// AKout // AKout
memmove(this->buffer_send+offset, AKout.bytes, 32); memmove(this->buffer_send+offset, AKout.bytes, 32);
offset += 32; offset += 32;
@ -1350,8 +1353,10 @@ namespace hw {
this->controle_device->ecdhDecode(masked_x, AKout_x, short_amount); this->controle_device->ecdhDecode(masked_x, AKout_x, short_amount);
#endif #endif
int offset = set_command_header_noopt(INS_UNBLIND); int offset = set_command_header(INS_UNBLIND);
//options
this->buffer_send[offset] = short_amount?0x02:0x00;
offset += 1;
// AKout // AKout
memmove(this->buffer_send+offset, AKout.bytes, 32); memmove(this->buffer_send+offset, AKout.bytes, 32);
offset += 32; offset += 32;
@ -1447,7 +1452,11 @@ namespace hw {
// ====== Aout, Bout, AKout, C, v, k ====== // ====== Aout, Bout, AKout, C, v, k ======
kv_offset = data_offset; kv_offset = data_offset;
C_offset = kv_offset+ (32*2)*outputs_size; if (type==rct::RCTTypeBulletproof2) {
C_offset = kv_offset+ (8)*outputs_size;
} else {
C_offset = kv_offset+ (32+32)*outputs_size;
}
for ( i = 0; i < outputs_size; i++) { for ( i = 0; i < outputs_size; i++) {
ABPkeys outKeys; ABPkeys outKeys;
bool found; bool found;
@ -1460,6 +1469,7 @@ namespace hw {
offset = set_command_header(INS_VALIDATE, 0x02, i+1); offset = set_command_header(INS_VALIDATE, 0x02, i+1);
//options //options
this->buffer_send[offset] = (i==outputs_size-1)? 0x00:0x80 ; this->buffer_send[offset] = (i==outputs_size-1)? 0x00:0x80 ;
this->buffer_send[offset] |= (type==rct::RCTTypeBulletproof2)?0x02:0x00;
offset += 1; offset += 1;
if (found) { if (found) {
//is_subaddress //is_subaddress
@ -1479,20 +1489,31 @@ namespace hw {
offset+=32; offset+=32;
} else { } else {
// dummy: is_subaddress Aout Bout AKout // dummy: is_subaddress Aout Bout AKout
offset += 1+32*3; offset += 2+32*3;
} }
//C //C
memmove(this->buffer_send+offset, data+C_offset,32); memmove(this->buffer_send+offset, data+C_offset,32);
offset += 32; offset += 32;
C_offset += 32; C_offset += 32;
//k if (type==rct::RCTTypeBulletproof2) {
memmove(this->buffer_send+offset, data+kv_offset,32); //k
offset += 32; memset(this->buffer_send+offset, 0, 32);
kv_offset += 32; offset += 32;
//v //v
memmove(this->buffer_send+offset, data+kv_offset,32); memset(this->buffer_send+offset, 0, 32);
offset += 32; memmove(this->buffer_send+offset, data+kv_offset,8);
kv_offset += 32; offset += 32;
kv_offset += 8;
} else {
//k
memmove(this->buffer_send+offset, data+kv_offset,32);
offset += 32;
kv_offset += 32;
//v
memmove(this->buffer_send+offset, data+kv_offset,32);
offset += 32;
kv_offset += 32;
}
this->buffer_send[4] = offset-5; this->buffer_send[4] = offset-5;
this->length_send = offset; this->length_send = offset;