sharpetronics/liboqs
1
0
Fork 0
mirror of https://github.com/open-quantum-safe/liboqs.git synced 2025-10-09 00:04:26 -04:00
Code Issues Projects Releases Wiki Activity

Silent rule;NTRU build;Darwin test program build updates

Browse Source
This commit is contained in:
Shravan Mishra 2017-02-14 10:41:57 -05:00
parent baab63ab88
commit f6d08ccccb
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis-tests.sh
View File

@ -3,22 +3,23 @@
autoreconf -i autoreconf -i
enable_disable_str= enable_disable_str=
if [[ ${USE_OPENSSL} == 1 ]];then if [[ ${USE_OPENSSL} == 1 ]];then
enable_disable_str="--enable-openssl" enable_disable_str=" --enable-openssl"
fi fi
if [[ ${AES_NI} == 0 ]];then if [[ ${AES_NI} == 0 ]];then
enable_disable_str=${enable_disable_str}" --disable-aes-ni" enable_disable_str+=" --disable-aes-ni"
fi fi
if [[ ${ENABLE_CODE_MCBITS} == 1 ]];then if [[ ${ENABLE_CODE_MCBITS} == 1 ]];then
enable_disable_str="--enable-mcbits" enable_disable_str+=" --enable-mcbits"
fi fi
if [[ ${ENABLE_NTRU} == 1 ]];then if [[ ${ENABLE_NTRU} == 1 ]];then
enable_disable_str="--enable-ntru" enable_disable_str+=" --enable-ntru"
./download-and-build-ntru.sh
fi fi
./configure ${enable_disable_str} ./configure --enable-silent-rules ${enable_disable_str}
make clean make clean
make make
make test make test

14
Makefile.am
View File

@ -67,8 +67,15 @@ endif
endif endif
test: test: clean-tests
$(foreach s,$(ALLDIRS),make test -s -C $(s);) make
if USE_NTRU
if ON_DARWIN
install_name_tool -change `otool -L ./test_kex | grep "/usr/local" | awk -F ' ' '{ print $$1 }'` external/NTRUEncrypt-master/.libs/libntruencrypt.0.dylib ./test_kex
install_name_tool -change `otool -L ./test_aes | grep "/usr/local" | awk -F ' ' '{ print $$1 }'` external/NTRUEncrypt-master/.libs/libntruencrypt.0.dylib ./test_aes
install_name_tool -change `otool -L ./test_rand | grep "/usr/local" | awk -F ' ' '{ print $$1 }'` external/NTRUEncrypt-master/.libs/libntruencrypt.0.dylib ./test_rand
endif
endif
./test_kex ./test_kex
./test_rand ./test_rand
./test_aes ./test_aes
@ -98,6 +105,9 @@ endif
clean-local: clean-local:
rm -f liboqs.a rm -f liboqs.a
clean-tests:
rm -f test_kex test_rand test_aes
prettyprint: prettyprint:
find src -name '*.c' -o -name '*.h' | xargs $(CLANGFORMAT) -style=file -i find src -name '*.c' -o -name '*.h' | xargs $(CLANGFORMAT) -style=file -i

3
configure.ac
View File

@ -77,6 +77,7 @@ AC_CANONICAL_HOST
case $host_os in case $host_os in
darwin* ) darwin* )
OPENSSL_DIR=/usr/local/opt/openssl OPENSSL_DIR=/usr/local/opt/openssl
AM_CONDITIONAL([ON_DARWIN], [test xtrue = xtrue])
;; ;;
linux*) linux*)
OPENSSL_DIR=/usr OPENSSL_DIR=/usr
@ -126,6 +127,8 @@ AC_SUBST(USE_OPENSSL)
AC_SUBST(USE_AES_NI) AC_SUBST(USE_AES_NI)
AC_SUBST(USE_NTRU) AC_SUBST(USE_NTRU)
AC_SUBST(USE_MCBITS) AC_SUBST(USE_MCBITS)
AC_SUBST(ON_DARWIN)
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/common/Makefile src/common/Makefile