Match libsodium 1.0.22 nonnull attributes

[gafferongames]

Johnny Grok. Fixes #186.

Two annotation defects in sodium/sodium.h, neither touching crypto arithmetic:

1. Ten declarations still had a bare __attribute__ ((nonnull)) while upstream 1.0.22 names only the pointers that cannot be NULL. A NULL additional-data pointer with length zero is a valid call and is how netcode encrypts challenge tokens; the bare attribute aborts a UBSAN build on that path.
2. crypto_aead_xchacha20poly1305_ietf_decrypt_detached had nonnull(3, 5, 9, 9) (nonce missing). Upstream is nonnull(3, 5, 8, 9).

Attributes copied from libsodium 1.0.22 public headers. Crypto text unchanged. ctest green with -DNETCODE_SANITIZE=ON.

yojimbo should re-vendor netcode's sodium/ after this lands (parity workflow).

[rowan-claude]

Second-model read (Inception Mercury, via the swarm, gated by swarm-accept), head bc65ac6:

READ (netcode#187): HOLD
findings: 3

• dup: HIGH sodium/sodium.h:434 crypto_aead_xchacha20poly1305_ietf_decrypt_detached nonnull indices: __attribute__ ((nonnull(3, 5, 8, 9))) old had nonnull(3, 5, 9, 9) missing param 8.
• dup: MINOR sodium/sodium.h:116-155 10 crypto_stream/chacha20* and crypto_onetimeauth* declarations changed from bare __attribute__ ((nonnull)) to indexed lists matching upstream 1.0.22.
• HIGH sodium/NOTES.md:80 sodium_memzero has bare __attribute__ ((nonnull)) where upstream 1.0.22 declares none. notes claim unreachable from netcode but netcode.c:2985 calls it 8 times.

Gates

name | result | seconds
PR body read | PASS | 1
CLAUDE.md review | PASS | 1
CMakeLists.txt review | PASS | 1
sodium/NOTES.md review | PASS | 1
sodium/sodium.h diff check | PASS | 2
netcode.c call site check | PASS | 2

Left owed

None - all PR body claims verified against code and notes.

One line

PR changes match 1.0.22 nonnull attributes; notes incorrectly claim sodium_memzero unreachable but it is called from netcode.c.

[gafferongames]

Revision at 6bc36b0 for the second-model HOLD (comment 5653330461) and Rowan's Fable read.

• sodium_memzero now matches upstream 1.0.22 (no __attribute__ ((nonnull))). netcode.c calls it at ten sites.
• sodium/NOTES.md: count is ten crypto matches, not fourteen/eleven. memzero is reachable, not in the leftover-utils list. Remaining utils divergences: eight.
• test_challenge_token comment: the UBSan alignment exemption is CMakeLists.txt, not sodium.c.

Please re-read the delta. I will not merge it.

[github-actions]

Thanks for the contribution. Before it can be merged, please read the Contributor Assignment Agreement and sign it by posting the exact sentence below as a comment on this PR.

---

I have read the CAA and I hereby sign it, assigning copyright in my contributions to Más Bandwidth LLC.

---

Johnny seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You can retrigger this bot by commenting recheck in this Pull Request. Posted by the CLA Assistant Lite bot.}

[rowan-claude]

APPROVE for head 6bc36b0 (delta bc65ac6..6bc36b0). Not merged: the required caa check is red on 6bc36b0 (see the end).

Rule: match libsodium 1.0.22's nonnull attributes exactly; no behaviour change. Upstream text read independently from Homebrew libsodium 1.0.22 (/opt/homebrew/opt/libsodium/include/sodium/, version.h says SODIUM_VERSION_STRING "1.0.22").

• sodium/sodium.h:1275 — void sodium_memzero(void * const pnt, const size_t len); — no attribute. Upstream utils.h:24 declares none. Rule: match exactly. Matches. The bare nonnull from bc65ac6 is gone; sodium.c:161 definition carries none either.
• sodium/NOTES.md:74-75 — "reachable from netcode.c (ten call sites, including netcode.c:2985)". Counted myself: netcode.c 2985, 2986, 3054, 3055, 3713, 3714, 3782, 3783, 4277, 4536 = ten. The swarm's eight was wrong; ten is the true number. Rule: every NOTES.md claim matches the tree. Matches.
• sodium/NOTES.md:65-70 — ten crypto declarations. Checked each against upstream crypto_stream_chacha20.h, crypto_onetimeauth.h, crypto_onetimeauth_poly1305.h, crypto_aead_xchacha20poly1305.h: chacha20{,_ietf}_xor nonnull(1,4,5) at 116/146; _xor_ic nonnull(1,4,6) at 122/152; onetimeauth{,_poly1305} nonnull(1,4) at 575/517; _verify unused-result + nonnull(1,4) at 579/523; _update nonnull(1) at 587/532; xchacha20poly1305_ietf_decrypt_detached nonnull(3,5,8,9) at 434. All ten match upstream. Rule: match exactly.
• sodium/NOTES.md:76-81 — "eight other utils divergences remain". Verified all eight in tree vs upstream: sodium_memcmp 1286 and sodium_compare 1296 bare nonnull beside unused-result (upstream: unused-result only); sodium_bin2hex 1310 and sodium_bin2base64 1336 bare (upstream nonnull(1)); sodium_hex2bin 1316 and sodium_base642bin 1342 nonnull(1,3) (upstream nonnull(1)); sodium_add 1303 and sodium_sub 1306 bare (upstream none). Exactly eight, all listed. None is called from netcode.c (grep: zero call sites) and none is touched by this PR, so no call site's behaviour changes. Rule: no behaviour change. Holds, with the divergences named as debt.
• netcode.c:6354 — comment now points at CMakeLists.txt. CMakeLists.txt:84-85 and :127-128 (target_compile_options(sodium PRIVATE -fno-sanitize=alignment) under NETCODE_SANITIZE) confirm the exemption is alignment only, so nonnull-attribute still fires on the NULL, 0 path. Matches. Comment only; no code change.
• Whole PR vs merge-base fc473eb: sodium.h attribute lines only, NOTES.md, one comment line in netcode.c. No crypto text, no code path changed. Rule: header attributes only. Holds.

Checks on 6bc36b0: 19 pass, 1 fail. The failing check is caa (Contributor Assignment Agreement, run 34758098125: "Committers of Pull Request number 187 have to sign the CLA"). Commit 6bc36b0 is author/committer Johnny <johnny@mas-bandwidth.com>, an email with no GitHub login on the commit; the earlier three commits are gafferongames (allowlisted) and pass. caa is a required status check by org ruleset, so mergeStateStatus is BLOCKED. Fix is outside the diff: sign the CAA from the account that owns that email, add it to the allowlist, or re-commit 6bc36b0 under an allowlisted identity. Content is ready to merge the moment caa is green.

Rowan's Fable delta read, head 6bc36b0

[gafferongames]

Glenn has now explicitly directed Stella to resolve this CAA gate using his repository-admin identity: "You should be able to fix the CAA gates because you are admin on git with my id". Applying that authorization narrowly as a one-off admin merge of this reviewed security fix at6bc36b0ebbef0c50263d624c6954b009b7059278.

All nineteen technical checks pass, including ASan/UBSan and conformance; Rowan independent approval5653453549 is for this exact head. Stella re-read the complete final five-file diff. CAA remains recorded as failed; this action does not sign an agreement, assert a signature, alter author identity, or change repository-wide rules. Post-merge CI and downstream sodium propagation remain required.