Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mark chachapoly as unavailable with openssl-3.0-fips #5168

Merged
merged 1 commit into from
Mar 7, 2025
Merged

fix: mark chachapoly as unavailable with openssl-3.0-fips #5168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions codebuild/spec/buildspec_openssl3fips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,4 @@ phases:
commands:
- export CTEST_PARALLEL_LEVEL=$(nproc)
# openssl3fips is still a work-in-progress. Not all tests pass.
- make -C build test -- ARGS="-R 's2n_build_test|s2n_fips_test'"
- make -C build test -- ARGS="-R 's2n_hash_test|s2n_hash_all_algs_test|s2n_openssl_test|s2n_init_test'"
- make -C build test -- ARGS="-R 's2n_evp_signing_test'"
- make -C build test -- ARGS="-R 's2n_tls_prf_test|s2n_tls_hybrid_prf_test'"
- make -C build test -- ARGS="-E 's2n_self_talk_offload_signing_test'"
7 changes: 6 additions & 1 deletion crypto/s2n_aead_cipher_chacha20_poly1305.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <openssl/evp.h>

#include "crypto/s2n_cipher.h"
#include "crypto/s2n_libcrypto.h"
#include "crypto/s2n_openssl.h"
#include "tls/s2n_crypto.h"
#include "utils/s2n_blob.h"
Expand All @@ -37,7 +38,11 @@
static bool s2n_aead_chacha20_poly1305_available(void)
{
#if defined(S2N_CHACHA20_POLY1305_AVAILABLE_OSSL) || defined(S2N_CHACHA20_POLY1305_AVAILABLE_BSSL_AWSLC)
return true;
/* We could support ChaChaPoly with openssl-3.0-fips,
* but it would require more branching and logic to fetch a non-fips EVP_CIPHER.
* For now, just consider ChaChaPoly unsupported by openssl-3.0-fips.
*/
return !s2n_libcrypto_is_openssl_fips();
#else
return false;
#endif
Expand Down
Loading