Skip to content

Add cosistency test for fcrypt. #81

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

Merged
besser82 merged 3 commits into from
Feb 6, 2019
Merged

Add cosistency test for fcrypt. #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d62f55f
test-crypt-kat: Add cosistency test for fcrypt.
besser82 Feb 4, 2019
4fe4be1
Restructure parallelism in test-crypt-kat so fcrypt can be tested.
zackw Feb 5, 2019
0a7ada6
Use ASan+UBSan for the Clang checked build on Travis, not Valgrind.
zackw Feb 6, 2019
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
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ matrix:
env:
- CONF="--enable-obsolete-api --enable-hashes=all --enable-valgrind-memcheck"
- VALGRIND=1
- name: "Clang, all hashes, obsolete API, Valgrind"
- name: "Clang, all hashes, obsolete API, ASan+UBSan"
compiler: clang
os: linux
env:
- CONF="--enable-obsolete-api --enable-hashes=all --enable-valgrind-memcheck"
- VALGRIND=1
- CONF="--enable-obsolete-api --enable-hashes=all"
- SANITIZER=1
- name: "GCC, all hashes, static lib"
compiler: gcc
os: linux
Expand Down
17 changes: 13 additions & 4 deletions .travis_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ else
export LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"
fi

MAKE_ARGS=
if [[ "$SANITIZER" == "1" ]]; then
# ASan is incompatible with -z defs.
MAKE_ARGS="UNDEF_FLAG="
export CFLAGS="$CFLAGS -fsanitize=undefined,address"
export CXXFLAGS="$CXXFLAGS -fsanitize=undefined,address"
fi

rm -fr build
mkdir -p build
pushd build
Expand All @@ -118,12 +126,13 @@ log_time preparation
log_time configure

if [[ "$DISTCHECK" == "1" ]]; then
make -j$NPROCS distcheck
make -j$NPROCS $MAKE_ARGS distcheck
log_time distcheck
else
make -j$NPROCS
make -j$NPROCS $MAKE_ARGS all
log_time build
make check -j$NPROCS || (cat test-suite.log && exit 1)
travis_wait 60 \
make -j$NPROCS $MAKE_ARGS check || (cat test-suite.log && exit 1)
log_time test
fi

Expand All @@ -132,7 +141,7 @@ if [[ "$VALGRIND" == "1" ]]; then
# Travis no-output timeout on individual tests, just because
# that's how slow memcheck is.
travis_wait 60 \
make -j$NPROCS check-valgrind-memcheck || \
make -j$NPROCS $MAKE_ARGS check-valgrind-memcheck || \
(cat test-suite-memcheck.log && exit 1)
log_time test-memcheck
fi
Expand Down
1 change: 0 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ AC_CHECK_FUNCS_ONCE([
memset_s
open64
syscall
vasprintf
])

# Disable valgrind tools for checking multithreaded
Expand Down
5 changes: 2 additions & 3 deletions crypt-port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,8 @@ extern void crypt_yescrypt_rn (const char *, size_t, const char *,
size_t, uint8_t *, size_t, void *, size_t);
#endif

/* We need a prototype for fcrypt, when building with stubs for the
deprecated and unsafe functions. */
#if ENABLE_OBSOLETE_API_ENOSYS
/* We need a prototype for fcrypt for some tests. */
#if ENABLE_OBSOLETE_API
char *fcrypt (const char *key, const char *setting);
#endif

Expand Down
Loading