← Watch feed
chore(crypto): remove NOISE_TAG_SIZE_BYTES define
Public commit record
72/100 · Adequate
What the developer wrote
Authored by M1nd3r
chore(crypto): remove NOISE_TAG_SIZE_BYTES define
- Replaced by NOISE_XXPSK3_TAG_SIZE.
[no changelog]
✓ Descriptive subject✓ Names a concrete action or component✓ Uses a recognizable type or scope✓ Provides an explanatory body
What changed, and why it matters
This is a simple code cleanup: the developer removed a local alias named NOISE_TAG_SIZE_BYTES and replaced every use of it with the existing official constant NOISE_XXPSK3_TAG_SIZE. The numeric value and behavior of the code are unchanged, so there is no security impact.
Recommended action
No action needed; this is a non-functional refactor.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit deletes the #define NOISE_TAG_SIZE_BYTES NOISE_XXPSK3_TAG_SIZE macro and substitutes NOISE_XXPSK3_TAG_SIZE throughout crypto/noise_xxpsk3.c. Because the macro was defined as exactly the same value, all length checks, buffer size calculations, encryption/decryption calls, and hash operations remain semantically identical. No logic, bounds, or cryptographic behavior changed.
Changed components
crypto/noise_xxpsk3.cInspect captured patch +41 / −42
### crypto/noise_xxpsk3.c
@@ -33,7 +33,6 @@
// https://tsapps.nist.gov/publication/get_pdf.cfm?pub_id=51288
#define NONCE_LIMIT 0x1000000000000ULL // 2^48
#define NONCE_ARRAY_SIZE_BYTES 12
-#define NOISE_TAG_SIZE_BYTES NOISE_XXPSK3_TAG_SIZE
/**
* @brief translate nonce into 12 byte big-endian array with
@@ -203,7 +202,7 @@ static void generate_keypair(uint8_t (*private_key)[NOISE_XXPSK3_DHLEN],
* `plaintext_len`
* @param plaintext_len size of the plaintext
* @param ciphertext pointer to the ciphertext output of size defined
- * by `plaintext_len + NOISE_TAG_SIZE_BYTES`
+ * by `plaintext_len + NOISE_XXPSK3_TAG_SIZE`
* @return bool;
*/
static bool encrypt_with_ad(noise_xxpsk3_cipher_state_t *cs, const uint8_t *ad,
@@ -232,11 +231,11 @@ static bool encrypt_with_ad(noise_xxpsk3_cipher_state_t *cs, const uint8_t *ad,
if (gcm_encrypt_message(nonce_bytes, NONCE_ARRAY_SIZE_BYTES, ad, ad_len,
ciphertext, plaintext_len,
- ciphertext + plaintext_len, NOISE_TAG_SIZE_BYTES,
+ ciphertext + plaintext_len, NOISE_XXPSK3_TAG_SIZE,
&ctx) != RETURN_GOOD) {
memzero(&ctx, sizeof(ctx));
if (ciphertext != NULL) {
- memzero(ciphertext, plaintext_len + NOISE_TAG_SIZE_BYTES);
+ memzero(ciphertext, plaintext_len + NOISE_XXPSK3_TAG_SIZE);
}
memzero(nonce_bytes, sizeof(nonce_bytes));
return false;
@@ -260,7 +259,7 @@ static bool encrypt_with_ad(noise_xxpsk3_cipher_state_t *cs, const uint8_t *ad,
* by `ciphertext_len`
* @param ciphertext_len size of the ciphertext
* @param plaintext pointer to the plaintext output of size defined
- * by `ciphertext_len - NOISE_TAG_SIZE_BYTES`
+ * by `ciphertext_len - NOISE_XXPSK3_TAG_SIZE`
* @return bool;
*/
static bool decrypt_with_ad(noise_xxpsk3_cipher_state_t *cs, const uint8_t *ad,
@@ -271,7 +270,7 @@ static bool decrypt_with_ad(noise_xxpsk3_cipher_state_t *cs, const uint8_t *ad,
memzero(cs->key, NOISE_XXPSK3_HASHLEN);
return false;
} else {
- if (ciphertext_len < NOISE_TAG_SIZE_BYTES) {
+ if (ciphertext_len < NOISE_XXPSK3_TAG_SIZE) {
// encrypted message is too short to contain the auth. tag
return false;
}
@@ -287,15 +286,15 @@ static bool decrypt_with_ad(noise_xxpsk3_cipher_state_t *cs, const uint8_t *ad,
nonce_to_bytes(cs->nonce, &nonce_bytes);
// decrypted message is shorter by auth. tag
- size_t plaintext_len = ciphertext_len - NOISE_TAG_SIZE_BYTES;
+ size_t plaintext_len = ciphertext_len - NOISE_XXPSK3_TAG_SIZE;
if (plaintext != NULL && ciphertext != NULL) { // to suppress asan warning
memcpy(plaintext, ciphertext, plaintext_len);
}
if (gcm_decrypt_message(nonce_bytes, NONCE_ARRAY_SIZE_BYTES, ad, ad_len,
plaintext, plaintext_len,
- ciphertext + plaintext_len, NOISE_TAG_SIZE_BYTES,
+ ciphertext + plaintext_len, NOISE_XXPSK3_TAG_SIZE,
&ctx) != RETURN_GOOD) {
memzero(&ctx, sizeof(ctx));
if (plaintext != NULL) {
@@ -321,7 +320,7 @@ static bool decrypt_with_ad(noise_xxpsk3_cipher_state_t *cs, const uint8_t *ad,
* `plaintext_len`
* @param plaintext_len size of the plaintext
* @param ciphertext pointer to the ciphertext output of size defined by
- * `plaintext_len + NOISE_TAG_SIZE_BYTES`
+ * `plaintext_len + NOISE_XXPSK3_TAG_SIZE`
* @return bool;
*/
static bool ss_encrypt_and_hash(noise_xxpsk3_symmetric_state_t *ss,
@@ -333,7 +332,7 @@ static bool ss_encrypt_and_hash(noise_xxpsk3_symmetric_state_t *ss,
return false;
}
- ss_mix_hash(ss, ciphertext, plaintext_len + NOISE_TAG_SIZE_BYTES);
+ ss_mix_hash(ss, ciphertext, plaintext_len + NOISE_XXPSK3_TAG_SIZE);
return true;
}
@@ -346,7 +345,7 @@ static bool ss_encrypt_and_hash(noise_xxpsk3_symmetric_state_t *ss,
* `ciphertext_len`
* @param ciphertext_len size of the ciphertext
* @param plaintext pointer to the plaintext output of size defined by
- * `ciphertext_len - NOISE_TAG_SIZE_BYTES`
+ * `ciphertext_len - NOISE_XXPSK3_TAG_SIZE`
* @return bool;
*/
static bool ss_decrypt_and_hash(noise_xxpsk3_symmetric_state_t *ss,
@@ -443,7 +442,7 @@ bool noise_xxpsk3_responder_handle_request1(
goto cleanup;
}
- if (request_len < NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES ||
+ if (request_len < NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE ||
request_len > NOISE_XXPSK3_MAX_MESSAGE_SIZE) {
goto cleanup;
}
@@ -461,7 +460,7 @@ bool noise_xxpsk3_responder_handle_request1(
size_t ciphertext_len = request_len - NOISE_XXPSK3_DHLEN;
- if (max_payload_size < ciphertext_len - NOISE_TAG_SIZE_BYTES) {
+ if (max_payload_size < ciphertext_len - NOISE_XXPSK3_TAG_SIZE) {
goto cleanup;
}
@@ -473,7 +472,7 @@ bool noise_xxpsk3_responder_handle_request1(
}
if (payload_size != NULL) {
- *payload_size = ciphertext_len - NOISE_TAG_SIZE_BYTES;
+ *payload_size = ciphertext_len - NOISE_XXPSK3_TAG_SIZE;
}
rspn->handshake_stage = NOISE_XXPSK3_RSPN_READY_FOR_RESPONSE1;
@@ -501,13 +500,13 @@ bool noise_xxpsk3_responder_create_response1(
}
if (payload_size > NOISE_XXPSK3_MAX_MESSAGE_SIZE -
- (2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES)) {
+ (2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_XXPSK3_TAG_SIZE)) {
goto cleanup;
}
// Check if response buffer is large enough to hold the response
if (max_response_size <
- (2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES + payload_size)) {
+ (2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_XXPSK3_TAG_SIZE + payload_size)) {
goto cleanup;
}
@@ -540,12 +539,12 @@ bool noise_xxpsk3_responder_create_response1(
// Encrypt payload
if (!ss_encrypt_and_hash(
&state->symmetric_state, payload, payload_size,
- response + (2 * NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES))) {
+ response + (2 * NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE))) {
goto cleanup;
}
*response_size =
- 2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES + payload_size;
+ 2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_XXPSK3_TAG_SIZE + payload_size;
rspn->handshake_stage = NOISE_XXPSK3_RSPN_WAITING_FOR_REQUEST2;
return true;
@@ -574,13 +573,13 @@ bool noise_xxpsk3_responder_handle_request2(
}
// Check if message is large enough to contain the encrypted remote static
// public key and at least empty encrypted payload (just NOISE_TAG)
- if (request_len < (NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES) ||
+ if (request_len < (NOISE_XXPSK3_DHLEN + 2 * NOISE_XXPSK3_TAG_SIZE) ||
request_len > NOISE_XXPSK3_MAX_MESSAGE_SIZE) {
goto cleanup;
}
if (!ss_decrypt_and_hash(&state->symmetric_state, request,
- NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES,
+ NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE,
remote_static_public_key)) {
goto cleanup;
}
@@ -595,20 +594,20 @@ bool noise_xxpsk3_responder_handle_request2(
ss_mix_key_and_hash(&state->symmetric_state, &state->psk);
size_t ciphertext_len =
- request_len - (NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES);
+ request_len - (NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE);
- if (max_payload_size < ciphertext_len - NOISE_TAG_SIZE_BYTES) {
+ if (max_payload_size < ciphertext_len - NOISE_XXPSK3_TAG_SIZE) {
goto cleanup;
}
if (!ss_decrypt_and_hash(&state->symmetric_state,
- request + NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES,
+ request + NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE,
ciphertext_len, payload)) {
goto cleanup;
}
if (payload_size != NULL) {
- *payload_size = ciphertext_len - NOISE_TAG_SIZE_BYTES;
+ *payload_size = ciphertext_len - NOISE_XXPSK3_TAG_SIZE;
}
ss_ts_split(&state->symmetric_state, &rspn->transport_state, false);
@@ -685,12 +684,12 @@ bool noise_xxpsk3_initiator_create_request1(
}
if (payload_size > NOISE_XXPSK3_MAX_MESSAGE_SIZE -
- (NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES)) {
+ (NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE)) {
goto cleanup;
}
if (max_request_size <
- (NOISE_XXPSK3_DHLEN + payload_size + NOISE_TAG_SIZE_BYTES)) {
+ (NOISE_XXPSK3_DHLEN + payload_size + NOISE_XXPSK3_TAG_SIZE)) {
goto cleanup;
}
@@ -710,7 +709,7 @@ bool noise_xxpsk3_initiator_create_request1(
goto cleanup;
}
- *request_size = NOISE_XXPSK3_DHLEN + payload_size + NOISE_TAG_SIZE_BYTES;
+ *request_size = NOISE_XXPSK3_DHLEN + payload_size + NOISE_XXPSK3_TAG_SIZE;
intr->handshake_stage = NOISE_XXPSK3_INTR_WAITING_FOR_RESPONSE1;
return true;
@@ -734,7 +733,7 @@ bool noise_xxpsk3_initiator_handle_response1(
goto cleanup;
}
- if (response_len < 2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES ||
+ if (response_len < 2 * NOISE_XXPSK3_DHLEN + 2 * NOISE_XXPSK3_TAG_SIZE ||
response_len > NOISE_XXPSK3_MAX_MESSAGE_SIZE) {
goto cleanup;
}
@@ -755,7 +754,7 @@ bool noise_xxpsk3_initiator_handle_response1(
if (!ss_decrypt_and_hash(&state->symmetric_state,
response + NOISE_XXPSK3_DHLEN,
- NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES,
+ NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE,
remote_static_public_key)) {
goto cleanup;
}
@@ -767,21 +766,21 @@ bool noise_xxpsk3_initiator_handle_response1(
memzero(input_key_material, sizeof(input_key_material));
size_t ciphertext_len =
- response_len - (2 * NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES);
+ response_len - (2 * NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE);
- if (max_payload_size < ciphertext_len - NOISE_TAG_SIZE_BYTES) {
+ if (max_payload_size < ciphertext_len - NOISE_XXPSK3_TAG_SIZE) {
goto cleanup;
}
if (!ss_decrypt_and_hash(
&state->symmetric_state,
- response + (2 * NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES),
+ response + (2 * NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE),
ciphertext_len, payload)) {
goto cleanup;
}
if (payload_size != NULL) {
- *payload_size = ciphertext_len - NOISE_TAG_SIZE_BYTES;
+ *payload_size = ciphertext_len - NOISE_XXPSK3_TAG_SIZE;
}
intr->handshake_stage = NOISE_XXPSK3_INTR_READY_FOR_REQUEST2;
@@ -811,12 +810,12 @@ bool noise_xxpsk3_initiator_create_request2(
}
if (payload_size > NOISE_XXPSK3_MAX_MESSAGE_SIZE -
- (NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES)) {
+ (NOISE_XXPSK3_DHLEN + 2 * NOISE_XXPSK3_TAG_SIZE)) {
goto cleanup;
}
if (max_request_size <
- (NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES + payload_size)) {
+ (NOISE_XXPSK3_DHLEN + 2 * NOISE_XXPSK3_TAG_SIZE + payload_size)) {
goto cleanup;
}
@@ -837,11 +836,11 @@ bool noise_xxpsk3_initiator_create_request2(
if (!ss_encrypt_and_hash(
&state->symmetric_state, payload, payload_size,
- request + NOISE_XXPSK3_DHLEN + NOISE_TAG_SIZE_BYTES)) {
+ request + NOISE_XXPSK3_DHLEN + NOISE_XXPSK3_TAG_SIZE)) {
goto cleanup;
}
- *request_size = NOISE_XXPSK3_DHLEN + 2 * NOISE_TAG_SIZE_BYTES + payload_size;
+ *request_size = NOISE_XXPSK3_DHLEN + 2 * NOISE_XXPSK3_TAG_SIZE + payload_size;
ss_ts_split(&state->symmetric_state, &intr->transport_state, true);
memzero(state, sizeof(noise_xxpsk3_handshake_state_t));
@@ -871,7 +870,7 @@ bool noise_xxpsk3_send_message(noise_xxpsk3_transport_state_t *ts,
return false;
}
- if (max_ciphertext_size < payload_size + NOISE_TAG_SIZE_BYTES) {
+ if (max_ciphertext_size < payload_size + NOISE_XXPSK3_TAG_SIZE) {
return false;
}
@@ -880,7 +879,7 @@ bool noise_xxpsk3_send_message(noise_xxpsk3_transport_state_t *ts,
return false;
}
- *ciphertext_size = payload_size + NOISE_TAG_SIZE_BYTES;
+ *ciphertext_size = payload_size + NOISE_XXPSK3_TAG_SIZE;
return true;
}
@@ -893,14 +892,14 @@ bool noise_xxpsk3_receive_message(noise_xxpsk3_transport_state_t *ts,
payload_size == NULL) {
return false;
}
- if (ciphertext_size < NOISE_TAG_SIZE_BYTES) {
+ if (ciphertext_size < NOISE_XXPSK3_TAG_SIZE) {
return false;
}
if (ciphertext_size > NOISE_XXPSK3_MAX_MESSAGE_SIZE) {
return false;
}
// The tag length check above rules out underflow
- if (ciphertext_size - NOISE_TAG_SIZE_BYTES > max_payload_size) {
+ if (ciphertext_size - NOISE_XXPSK3_TAG_SIZE > max_payload_size) {
return false;
}
@@ -909,6 +908,6 @@ bool noise_xxpsk3_receive_message(noise_xxpsk3_transport_state_t *ts,
return false;
}
- *payload_size = ciphertext_size - NOISE_TAG_SIZE_BYTES;
+ *payload_size = ciphertext_size - NOISE_XXPSK3_TAG_SIZE;
return true;
}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.