turn off chacha on big endian

This commit is contained in:
toddouska
2015-04-02 11:34:17 -07:00
parent 9437a3a303
commit 7552764fbb
4 changed files with 11 additions and 4 deletions

View File

@@ -6,7 +6,7 @@
# #
# #
AC_INIT([wolfssl],[3.4.6],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com]) AC_INIT([wolfssl],[3.4.7],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
@@ -1201,6 +1201,12 @@ AC_ARG_ENABLE([chacha],
[ ENABLED_CHACHA=yes ] [ ENABLED_CHACHA=yes ]
) )
# not ready for big endian yet
if test "x$ac_cv_c_bigendian" = "xyes"
then
ENABLED_CHACHA=no
fi
# lean psk does't need chacha # lean psk does't need chacha
if test "$ENABLED_LEANPSK" = "yes" if test "$ENABLED_LEANPSK" = "yes"
then then

View File

@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: wolfssl Name: wolfssl
Description: wolfssl C library. Description: wolfssl C library.
Version: 3.4.6 Version: 3.4.7
Libs: -L${libdir} -lwolfssl Libs: -L${libdir} -lwolfssl
Cflags: -I${includedir} Cflags: -I${includedir}

View File

@@ -48,6 +48,7 @@
#ifdef BIG_ENDIAN_ORDER #ifdef BIG_ENDIAN_ORDER
#define LITTLE32(x) ByteReverseWord32(x) #define LITTLE32(x) ByteReverseWord32(x)
#error "CHACHA Not ready for Big Endian yet"
#else #else
#define LITTLE32(x) (x) #define LITTLE32(x) (x)
#endif #endif

View File

@@ -26,8 +26,8 @@
extern "C" { extern "C" {
#endif #endif
#define LIBWOLFSSL_VERSION_STRING "3.4.6" #define LIBWOLFSSL_VERSION_STRING "3.4.7"
#define LIBWOLFSSL_VERSION_HEX 0x03004006 #define LIBWOLFSSL_VERSION_HEX 0x03004007
#ifdef __cplusplus #ifdef __cplusplus
} }