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

Jump to bottom

Fix nonstandard C++ in headers #7194

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
+23 −17
Open

Fix nonstandard C++ in headers #7194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8943610
Fix PAKE structure initializers to work in C++11
gilles-peskine-arm Mar 1, 2023
7b4eff9
Build cpp_dummy_build in C++11 pedantic mode
gilles-peskine-arm Mar 1, 2023
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
29 changes: 15 additions & 14 deletions include/psa/crypto_extra.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,18 +1823,6 @@ psa_status_t psa_pake_abort(psa_pake_operation_t *operation);
*/
#define PSA_PAKE_CIPHER_SUITE_INIT { PSA_ALG_NONE, 0, 0, 0, PSA_ALG_NONE }

/** Returns a suitable initializer for a PAKE operation object of type
* psa_pake_operation_t.
*/
#if defined(MBEDTLS_PSA_BUILTIN_PAKE)
#define PSA_PAKE_OPERATION_INIT { PSA_ALG_NONE, 0, 0, 0, 0, \
NULL, 0, \
PSA_PAKE_ROLE_NONE, { 0 }, 0, 0, \
{ .dummy = 0 } }
#else
#define PSA_PAKE_OPERATION_INIT { PSA_ALG_NONE, 0, 0, { 0 } }
#endif

struct psa_pake_cipher_suite_s {
psa_algorithm_t algorithm;
psa_pake_primitive_type_t type;
Expand Down Expand Up @@ -1927,14 +1915,27 @@ struct psa_pake_operation_s {
size_t MBEDTLS_PRIVATE(buffer_offset);
#endif
union {
/* A variant that's easy to initialize.
* Also, make the union non-empty even with no supported algorithms. */
uint8_t dummy;
#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
mbedtls_ecjpake_context ecjpake;
#endif
/* Make the union non-empty even with no supported algorithms. */
uint8_t dummy;
} MBEDTLS_PRIVATE(ctx);
};

/** Returns a suitable initializer for a PAKE operation object of type
* psa_pake_operation_t.
*/
#if defined(MBEDTLS_PSA_BUILTIN_PAKE)
#define PSA_PAKE_OPERATION_INIT \
{ PSA_ALG_NONE, 0, 0, \
0, 0, NULL, 0, 0, { 0 } , 0, 0, \
{ 0 } }
#else
#define PSA_PAKE_OPERATION_INIT { PSA_ALG_NONE, 0, 0, { 0 } }
#endif

static inline struct psa_pake_cipher_suite_s psa_pake_cipher_suite_init(void)
{
const struct psa_pake_cipher_suite_s v = PSA_PAKE_CIPHER_SUITE_INIT;
Expand Down
11 changes: 8 additions & 3 deletions tests/scripts/all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3196,7 +3196,7 @@ component_test_cmake_shared () {
}

test_build_opt () {
info=$1 cc=$2; shift 2
info=$1 cc=$2 cxx=$3; shift 3
for opt in "$@"; do
msg "build/test: $cc $opt, $info" # ~ 30s
make CC="$cc" CFLAGS="$opt -std=c99 -pedantic -Wall -Wextra -Werror"
Expand All @@ -3205,18 +3205,23 @@ test_build_opt () {
# optimizations use inline assembly whereas runs with -O0
# skip inline assembly.
make test # ~30s

if [ -n "$cxx" ]; then
make TEST_CPP=1 CXX="$cxx" CFLAGS="$opt -std=c++11 -pedantic -Wall -Wextra -Werror"
programs/test/cpp_dummy_build
fi
make clean
done
}

component_test_clang_opt () {
scripts/config.py full
test_build_opt 'full config' clang -O0 -Os -O2
test_build_opt 'full config' clang clang++ -O0 -Os -O2
}

component_test_gcc_opt () {
scripts/config.py full
test_build_opt 'full config' gcc -O0 -Os -O2
test_build_opt 'full config' gcc g++ -O0 -Os -O2
}

component_build_mbedtls_config_file () {
Expand Down