1540205 - freebl build fails with -DNSS_DISABLE_CHACHAPOLY

Status: RESOLVED FIXED

(NSS :: Build, defect)

Description

[Edouard Oger [:eoger]]

I'm getting:

chacha20poly1305.c:165:9: error: implicit declaration of function 'Hacl_Chacha20_Vec128_chacha20' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
        Hacl_Chacha20_Vec128_chacha20(output, block, len, k, nonce, ctr);
        ^
chacha20poly1305.c:167:9: error: implicit declaration of function 'Hacl_Chacha20_chacha20' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
        Hacl_Chacha20_chacha20(output, block, len, k, nonce, ctr);
        ^

Which is expected since these functions are not declared if NSS_DISABLE_CHACHAPOLY is defined.

All uses of ChaCha20Xor (the function where these implicit declarations happen) are guarded by NSS_DISABLE_CHACHAPOLY, so let's not define ChaCha20Xor at all when the flag is set.

Patch incoming.

Comment 1

[Edouard Oger [:eoger]]

Attachment: Bug 1540205 - Do not define ChaCha20Xor if NSS_DISABLE_CHACHAPOLY is defined.

Comment 2

[J.C. Jones [:jcj] (he/they)]

Very soon, Bug 1537544 should permit landing this via Lando. If it's OK, I'm going to give it until EOD Monday and try and Lando-land this as our verification, and if it's not ready then, I'll land it myself. Thanks Edouard!

Comment 3

[J.C. Jones [:jcj] (he/they)]

https://hg.mozilla.org/projects/nss/rev/e5e10a46b9ad — Edouard Oger — Bug 1540205 - Do not define ChaCha20Xor if NSS_DISABLE_CHACHAPOLY is defined. r=jcj