Public commit record
47/100 · Thin
What the developer wrote
Authored by Ondřej Vejpustek
refactor(crypto): prefix enums
[no changelog]
✓ Descriptive subject✓ Uses a recognizable type or scope! No meaningful explanatory body
What changed, and why it matters
This commit simply renames two groups of internal status labels (called enums) in the Trezor firmware's cryptographic code. The old names like WAITING_FOR_REQUEST1 were shared between two different parts of the code, so the developer gave them longer, unique names that include which part they belong to. The actual numeric values and program behavior are unchanged. There is no security fix or vulnerability here.
Recommended action
No action required. This is a non-functional naming refactor. Routine code review/merge is sufficient.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The change is a pure refactor of enum constants in crypto/noise_xxpsk3.h and their usages in crypto/noise_xxpsk3.c. Two enums (noise_xxpsk3_responder_handshake_stage_t and noise_xxpsk3_initiator_handshake_stage_t) had members with identical base names (e.g., READY_FOR_REQUEST1). They are now prefixed with NOISE_XXPSK3_RSPN_ and NOISE_XXPSK3_INTR_ respectively. The underlying random 32-bit literal values are identical, and all references are updated consistently. No logic, state machine, or security boundary changed.
Changed components
crypto/noise_xxpsk3.hcrypto/noise_xxpsk3.cInspect captured patch +26 / −22
diff --git a/crypto/noise_xxpsk3.c b/crypto/noise_xxpsk3.c
index 0e4f8c5c..6a4effd8 100644
--- a/crypto/noise_xxpsk3.c
+++ b/crypto/noise_xxpsk3.c
@@ -398,7 +398,7 @@ bool noise_xxpsk3_responder_init(
goto cleanup;
}
- rspn->handshake_stage = WAITING_FOR_REQUEST1;
+ rspn->handshake_stage = NOISE_XXPSK3_RSPN_WAITING_FOR_REQUEST1;
rspn->initialized = true;
rspn->has_transport_state = false;
return true;
@@ -420,7 +420,8 @@ bool noise_xxpsk3_responder_handle_request1(
return false;
}
- if (!rspn->initialized || rspn->handshake_stage != WAITING_FOR_REQUEST1 ||
+ if (!rspn->initialized ||
+ rspn->handshake_stage != NOISE_XXPSK3_RSPN_WAITING_FOR_REQUEST1 ||
request == NULL || (payload == NULL && max_payload_size != 0)) {
goto cleanup;
}
@@ -457,7 +458,7 @@ bool noise_xxpsk3_responder_handle_request1(
*payload_size = ciphertext_len - NOISE_TAG_SIZE_BYTES;
}
- rspn->handshake_stage = READY_FOR_RESPONSE1;
+ rspn->handshake_stage = NOISE_XXPSK3_RSPN_READY_FOR_RESPONSE1;
return true;
cleanup:
@@ -475,7 +476,7 @@ bool noise_xxpsk3_responder_create_response1(
noise_xxpsk3_handshake_state_t *state = &rspn->handshake_state;
if (!rspn->initialized || response == NULL || response_size == NULL ||
- rspn->handshake_stage != READY_FOR_RESPONSE1 ||
+ rspn->handshake_stage != NOISE_XXPSK3_RSPN_READY_FOR_RESPONSE1 ||
!state->has_remote_ephemeral_public ||
(payload == NULL && payload_size != 0)) {
goto cleanup;
@@ -523,7 +524,7 @@ bool noise_xxpsk3_responder_create_response1(
*response_size =
2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES + payload_size;
- rspn->handshake_stage = WAITING_FOR_REQUEST2;
+ rspn->handshake_stage = NOISE_XXPSK3_RSPN_WAITING_FOR_REQUEST2;
return true;
cleanup:
@@ -541,7 +542,7 @@ bool noise_xxpsk3_responder_handle_request2(
noise_xxpsk3_handshake_state_t *state = &rspn->handshake_state;
if (!rspn->initialized || request == NULL ||
- rspn->handshake_stage != WAITING_FOR_REQUEST2 ||
+ rspn->handshake_stage != NOISE_XXPSK3_RSPN_WAITING_FOR_REQUEST2 ||
!state->has_ephemeral_private ||
(payload == NULL && max_payload_size != 0)) {
goto cleanup;
@@ -591,7 +592,7 @@ bool noise_xxpsk3_responder_handle_request2(
memzero(state, sizeof(noise_xxpsk3_handshake_state_t));
rspn->has_transport_state = true;
- rspn->handshake_stage = RSPN_HANDSHAKE_COMPLETE;
+ rspn->handshake_stage = NOISE_XXPSK3_RSPN_HANDSHAKE_COMPLETE;
return true;
cleanup:
@@ -622,7 +623,7 @@ bool noise_xxpsk3_initiator_init(
goto cleanup;
}
- intr->handshake_stage = READY_FOR_REQUEST1;
+ intr->handshake_stage = NOISE_XXPSK3_INTR_READY_FOR_REQUEST1;
intr->initialized = true;
intr->has_transport_state = false;
return true;
@@ -644,7 +645,8 @@ bool noise_xxpsk3_initiator_create_request1(
return false;
}
- if (!intr->initialized || intr->handshake_stage != READY_FOR_REQUEST1 ||
+ if (!intr->initialized ||
+ intr->handshake_stage != NOISE_XXPSK3_INTR_READY_FOR_REQUEST1 ||
(payload == NULL && payload_size != 0) || request == NULL ||
request_size == NULL) {
goto cleanup;
@@ -672,7 +674,7 @@ bool noise_xxpsk3_initiator_create_request1(
}
*request_size = NOISE_XXPSK3_DHLEN + payload_size + NOISE_TAG_SIZE_BYTES;
- intr->handshake_stage = WAITING_FOR_RESPONSE1;
+ intr->handshake_stage = NOISE_XXPSK3_INTR_WAITING_FOR_RESPONSE1;
return true;
cleanup:
@@ -690,7 +692,8 @@ bool noise_xxpsk3_initiator_handle_response1(noise_xxpsk3_initiator_t *intr,
return false;
}
- if (!intr->initialized || intr->handshake_stage != WAITING_FOR_RESPONSE1 ||
+ if (!intr->initialized ||
+ intr->handshake_stage != NOISE_XXPSK3_INTR_WAITING_FOR_RESPONSE1 ||
response == NULL || (payload == NULL && max_payload_size != 0)) {
goto cleanup;
}
@@ -744,7 +747,7 @@ bool noise_xxpsk3_initiator_handle_response1(noise_xxpsk3_initiator_t *intr,
*payload_size = ciphertext_len - NOISE_TAG_SIZE_BYTES;
}
- intr->handshake_stage = READY_FOR_REQUEST2;
+ intr->handshake_stage = NOISE_XXPSK3_INTR_READY_FOR_REQUEST2;
return true;
@@ -760,7 +763,8 @@ bool noise_xxpsk3_initiator_create_request2(
return false;
}
- if (!intr->initialized || intr->handshake_stage != READY_FOR_REQUEST2 ||
+ if (!intr->initialized ||
+ intr->handshake_stage != NOISE_XXPSK3_INTR_READY_FOR_REQUEST2 ||
(payload == NULL && payload_size != 0) || request == NULL ||
request_size == NULL) {
goto cleanup;
@@ -798,7 +802,7 @@ bool noise_xxpsk3_initiator_create_request2(
memzero(state, sizeof(noise_xxpsk3_handshake_state_t));
intr->has_transport_state = true;
- intr->handshake_stage = INTR_HANDSHAKE_COMPLETE;
+ intr->handshake_stage = NOISE_XXPSK3_INTR_HANDSHAKE_COMPLETE;
return true;
diff --git a/crypto/noise_xxpsk3.h b/crypto/noise_xxpsk3.h
index 2345a1d4..4d89d5a3 100644
--- a/crypto/noise_xxpsk3.h
+++ b/crypto/noise_xxpsk3.h
@@ -70,10 +70,10 @@ typedef struct {
// Random values are used for greater resilience agains glitching attacks.
typedef enum {
- WAITING_FOR_REQUEST1 = 0x5091d95c,
- READY_FOR_RESPONSE1 = 0x252d533a,
- WAITING_FOR_REQUEST2 = 0xe3b601eb,
- RSPN_HANDSHAKE_COMPLETE = 0x54acac08
+ NOISE_XXPSK3_RSPN_WAITING_FOR_REQUEST1 = 0x5091d95c,
+ NOISE_XXPSK3_RSPN_READY_FOR_RESPONSE1 = 0x252d533a,
+ NOISE_XXPSK3_RSPN_WAITING_FOR_REQUEST2 = 0xe3b601eb,
+ NOISE_XXPSK3_RSPN_HANDSHAKE_COMPLETE = 0x54acac08
} noise_xxpsk3_responder_handshake_stage_t;
typedef struct {
@@ -90,10 +90,10 @@ typedef struct {
// Random values are used for greater resilience agains glitching attacks.
typedef enum {
- READY_FOR_REQUEST1 = 0x24a23a5e,
- WAITING_FOR_RESPONSE1 = 0xa748a792,
- READY_FOR_REQUEST2 = 0xba244240,
- INTR_HANDSHAKE_COMPLETE = 0xf149f042
+ NOISE_XXPSK3_INTR_READY_FOR_REQUEST1 = 0x24a23a5e,
+ NOISE_XXPSK3_INTR_WAITING_FOR_RESPONSE1 = 0xa748a792,
+ NOISE_XXPSK3_INTR_READY_FOR_REQUEST2 = 0xba244240,
+ NOISE_XXPSK3_INTR_HANDSHAKE_COMPLETE = 0xf149f042
} noise_xxpsk3_initiator_handshake_stage_t;
typedef struct {
Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.