mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make rabbit optional with configure option

Browse Source
This commit is contained in:
toddouska 2012-10-22 17:28:46 -07:00
parent 3461c12083
commit aef97af361
9 changed files with 60 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commit-tests.sh
View File

@ -23,7 +23,7 @@ RESULT=$?
# make sure full config is ok
echo -e "\n\nTesting full config as well...\n\n"
./configure --enable-opensslExtra --enable-fastmath --enable-dtls --enable-aesgcm --enable-hc128 --enable-sniffer --enable-psk;
./configure --enable-opensslExtra --enable-fastmath --enable-dtls --enable-aesgcm --enable-hc128 --enable-sniffer --enable-psk --enable-rabbit;
RESULT=$?
[ $RESULT -ne 0 ] && echo -e "\n\nFull config ./configure failed" && exit 1

17
configure.ac
View File

@ -459,6 +459,23 @@ fi
AM_CONDITIONAL([BUILD_HC128], [test "x$ENABLED_HC128" = "xyes"])
# RABBIT
AC_ARG_ENABLE(rabbit,
[ --enable-rabbit Enable RABBIT (default: disabled)],
[ ENABLED_RABBIT=$enableval ],
[ ENABLED_RABBIT=no ]
)
if test "$ENABLED_RABBIT" = "no"
then
AM_CFLAGS="$AM_CFLAGS -DNO_RABBIT"
else
AM_CFLAGS="$AM_CFLAGS -DHAVE_RABBIT"
fi
AM_CONDITIONAL([BUILD_RABBIT], [test "x$ENABLED_RABBIT" = "xyes"])
# PSK
AC_ARG_ENABLE(psk,
[ --enable-psk Enable PSK (default: disabled)],

2
ctaocrypt/src/rabbit.c
View File

@ -39,7 +39,7 @@
#define LITTLE32(x) (x)
#endif
#define U32V(x) (word32)(x)
#define U32V(x) ((word32)(x) & 0xFFFFFFFFU)
/* Square a 32-bit unsigned integer to obtain the 64-bit result and return */

3
m4/ax_harden_compiler_flags.m4
View File

@ -58,7 +58,6 @@
# AX_APPEND_COMPILE_FLAGS([-Wold-style-definition],,[$ax_append_compile_cflags_extra])
# AX_APPEND_COMPILE_FLAGS([-std=c99],,[$ax_append_compile_cflags_extra])
# AX_APPEND_COMPILE_FLAGS([-Wlogical-op],,[$ax_append_compile_cflags_extra])
# AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_cflags_extra])
#serial 4
@ -143,6 +142,7 @@
AX_APPEND_COMPILE_FLAGS([-Wpointer-sign],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes],,[$ax_append_compile_cflags_extra])
@ -205,6 +205,7 @@
AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_cxxflags_extra])

5
src/include.am
View File

@ -23,7 +23,6 @@ src_libcyassl_la_SOURCES = \
ctaocrypt/src/dh.c \
ctaocrypt/src/dsa.c \
ctaocrypt/src/arc4.c \
ctaocrypt/src/rabbit.c \
ctaocrypt/src/pwdbased.c \
ctaocrypt/src/logging.c \
ctaocrypt/src/memory.c
@ -56,6 +55,10 @@ if BUILD_HC128
src_libcyassl_la_SOURCES += ctaocrypt/src/hc128.c
endif
if BUILD_RABBIT
src_libcyassl_la_SOURCES += ctaocrypt/src/rabbit.c
endif
if BUILD_NOINLINE
src_libcyassl_la_SOURCES += ctaocrypt/src/misc.c
endif

11
tests/suites.c
View File

@ -272,6 +272,17 @@ int SuiteTest(void)
}
#endif
#ifdef HAVE_RABBIT
/* add rabbit extra suites */
strcpy(argv0[1], "tests/test-rabbit.conf");
printf("starting rabbit extra cipher suite tests\n");
test_harness(&args);
if (args.return_code != 0) {
printf("error from script %d\n", args.return_code);
exit(EXIT_FAILURE);
}
#endif
#ifndef NO_PSK
/* add psk extra suites */
strcpy(argv0[1], "tests/test-psk.conf");

18
tests/test-dtls.conf
View File

@ -54,14 +54,6 @@
-u
-l AES256-SHA256
# server DTLSv1 RABBIT-SHA
-u
-l RABBIT-SHA
# client DTLSv1 RABBIT-SHA
-u
-l RABBIT-SHA
# server DTLSv1 RC4-SHA NON-BLOCKING
-u
-l RC4-SHA
@ -132,13 +124,3 @@
-l AES256-SHA256
-N
# server DTLSv1 RABBIT-SHA NON-BLOCKING
-u
-l RABBIT-SHA
-N
# client DTLSv1 RABBIT-SHA NON-BLOCKING
-u
-l RABBIT-SHA
-N

24
tests/test-rabbit.conf Normal file
View File

@ -0,0 +1,24 @@
# server TLSv1 RABBIT-SHA
-v 1
-l RABBIT-SHA
# client TLSv1 RABBIT-SHA
-v 1
-l RABBIT-SHA
# server TLSv1.1 RABBIT-SHA
-v 2
-l RABBIT-SHA
# client TLSv1.1 RABBIT-SHA
-v 2
-l RABBIT-SHA
# server TLSv1.2 RABBIT-SHA
-v 3
-l RABBIT-SHA
# client TLSv1.2 RABBIT-SHA
-v 3
-l RABBIT-SHA

54
tests/test.conf
View File

@ -78,14 +78,6 @@
-v 1
-l AES256-SHA256
# server TLSv1 RABBIT-SHA
-v 1
-l RABBIT-SHA
# client TLSv1 RABBIT-SHA
-v 1
-l RABBIT-SHA
# server TLSv1.1 RC4-SHA
-v 2
-l RC4-SHA
@ -142,14 +134,6 @@
-v 2
-l AES256-SHA256
# server TLSv1.1 RABBIT-SHA
-v 2
-l RABBIT-SHA
# client TLSv1.1 RABBIT-SHA
-v 2
-l RABBIT-SHA
# server TLSv1.2 RC4-SHA
-v 3
-l RC4-SHA
@ -206,14 +190,6 @@
-v 3
-l AES256-SHA256
# server TLSv1.2 RABBIT-SHA
-v 3
-l RABBIT-SHA
# client TLSv1.2 RABBIT-SHA
-v 3
-l RABBIT-SHA
# server SSLv3 RC4-SHA NON-BLOCKING
-v 0
-l RC4-SHA
@ -314,16 +290,6 @@
-l AES256-SHA256
-N
# server TLSv1 RABBIT-SHA NON-BLOCKING
-v 1
-l RABBIT-SHA
-N
# client TLSv1 RABBIT-SHA NON-BLOCKING
-v 1
-l RABBIT-SHA
-N
# server TLSv1.1 RC4-SHA NON-BLOCKING
-v 2
-l RC4-SHA
@ -394,16 +360,6 @@
-l AES256-SHA256
-N
# server TLSv1.1 RABBIT-SHA NON-BLOCKING
-v 2
-l RABBIT-SHA
-N
# client TLSv1.1 RABBIT-SHA NON-BLOCKING
-v 2
-l RABBIT-SHA
-N
# server TLSv1.2 RC4-SHA NON-BLOCKING
-v 3
-l RC4-SHA
@ -474,13 +430,3 @@
-l AES256-SHA256
-N
# server TLSv1.2 RABBIT-SHA NON-BLOCKING
-v 3
-l RABBIT-SHA
-N
# client TLSv1.2 RABBIT-SHA NON-BLOCKING
-v 3
-l RABBIT-SHA
-N