Mirrors/trezor-suite
2
0
Fork 0
mirror of https://github.com/trezor/trezor-suite.git synced 2026-03-07 07:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(protocol): return unmasked magic from readThpHeader

Browse Source
This commit is contained in:
Szymon Lesisz
2025-12-04 17:39:09 +01:00
committed by Szymon Lesisz
parent b569ad455c
commit 8246ad65a6
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/protocol/src/protocol-thp/decode.ts
View File

@@ -16,7 +16,7 @@ import { crc32 } from './crypto/crc32';
import { getHandshakeHash, getTrezorState } from './crypto/pairing';
import { getIvFromNonce } from './crypto/tools';
import { ThpDeviceProperties, ThpError, ThpMessageResponse } from './messages';
import { clearControlBit, readThpHeader } from './utils';
import { readThpHeader } from './utils';
type ThpMessage = ReturnType<TransportProtocolDecode> & {
magic: number;
@@ -188,8 +188,7 @@ const validateCrc = (decodedMessage: ReturnType<TransportProtocolDecode>) => {
export const decodeSendAck = (decodedMessage: MessageV2) => {
validateCrc(decodedMessage);
const header = readThpHeader(decodedMessage.header);
const magic = clearControlBit(header.magic);
const { magic } = readThpHeader(decodedMessage.header);
if (magic === THP_ERROR_HEADER_BYTE) {
return decodeThpError(decodedMessage.payload);
}
@@ -217,7 +216,7 @@ export const decode = (
thpState,
};
const magic = clearControlBit(message.magic);
const { magic } = header;
if (magic === THP_ERROR_HEADER_BYTE) {
return decodeThpError(message.payload);
}

7
packages/protocol/src/protocol-thp/utils.ts
View File

@@ -48,7 +48,7 @@ export const readThpHeader = (bytes: Buffer) => {
const channel = bytes.subarray(1, 3);
return {
magic,
magic: clearControlBit(magic),
ackBit,
sequenceBit,
channel,
@@ -71,8 +71,7 @@ export const isAckExpected = (bytesOrMagic: Buffer | number[]) => {
// get expected responses from decoded request data
export const getExpectedResponses = (bytes: Buffer) => {
const header = readThpHeader(bytes);
const magic = clearControlBit(header.magic);
const { magic } = readThpHeader(bytes);
if (magic === THP_CREATE_CHANNEL_REQUEST) {
return [THP_CREATE_CHANNEL_RESPONSE];
@@ -121,7 +120,7 @@ export const isExpectedResponse = (bytes: Buffer, state: ThpState) => {
return false;
}
const magic = clearControlBit(header.magic);
const { magic } = header;
if (magic === THP_ERROR_HEADER_BYTE) {
// ThpError is always expected
return true;