wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pulled in patches from Debian package.

Browse Source
This commit is contained in:
David Garske
2016-11-22 11:25:40 -08:00
committed by jrblixt
parent c313d97579
commit d3195d0b75
4 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -0,0 +1 @@
Please see the file 'README' in this directory.

37
Makefile.am
View File

@@ -100,23 +100,28 @@ include testsuite/include.am
include tests/include.am include tests/include.am
include sslSniffer/sslSnifferTest/include.am include sslSniffer/sslSnifferTest/include.am
include rpm/include.am include rpm/include.am
include mqx/util_lib/Sources/include.am
include mqx/wolfcrypt_benchmark/Sources/include.am if BUILD_DISTRO
include mqx/wolfcrypt_test/Sources/include.am # Exclude references to non-DFSG sources from build files
include mqx/wolfssl/include.am else
include mqx/wolfssl_client/Sources/include.am include mqx/util_lib/Sources/include.am
include mplabx/include.am include mqx/wolfcrypt_benchmark/Sources/include.am
include mplabx/wolfcrypt_benchmark.X/nbproject/include.am include mqx/wolfcrypt_test/Sources/include.am
include mplabx/wolfcrypt_test.X/nbproject/include.am include mqx/wolfssl/include.am
include mplabx/wolfssl.X/nbproject/include.am include mqx/wolfssl_client/Sources/include.am
include mcapi/include.am include mplabx/include.am
include mcapi/wolfcrypt_mcapi.X/nbproject/include.am include mplabx/wolfcrypt_benchmark.X/nbproject/include.am
include mcapi/wolfcrypt_test.X/nbproject/include.am include mplabx/wolfcrypt_test.X/nbproject/include.am
include mcapi/wolfssl.X/nbproject/include.am include mplabx/wolfssl.X/nbproject/include.am
include mcapi/zlib.X/nbproject/include.am include mcapi/include.am
include tirtos/include.am include mcapi/wolfcrypt_mcapi.X/nbproject/include.am
include mcapi/wolfcrypt_test.X/nbproject/include.am
include mcapi/wolfssl.X/nbproject/include.am
include mcapi/zlib.X/nbproject/include.am
include tirtos/include.am
include IDE/include.am
endif
include scripts/include.am include scripts/include.am
include IDE/include.am
if USE_VALGRIND if USE_VALGRIND
TESTS_ENVIRONMENT=./valgrind-error.sh TESTS_ENVIRONMENT=./valgrind-error.sh

18
configure.ac
View File

@@ -192,6 +192,7 @@ then
enable_stunnel=yes enable_stunnel=yes
enable_pwdbased=yes enable_pwdbased=yes
fi fi
AM_CONDITIONAL([BUILD_DISTRO], [test "x$ENABLED_DISTRO" = "xyes"])
# SINGLE THREADED # SINGLE THREADED
@@ -2183,7 +2184,7 @@ then
ENABLED_ECC="yes" ENABLED_ECC="yes"
AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256" AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256"
AM_CONDITIONAL([BUILD_ECC], [test "x$ENABLED_ECC" = "xyes"]) AM_CONDITIONAL([BUILD_ECC], [test "x$ENABLED_ECC" = "xyes"])
if test "$ENABLED_ECC_SHAMIR" = "yes" if test "$ENABLED_ECC_SHAMIR" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR" AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"
@@ -2256,7 +2257,7 @@ then
ENABLED_ECC="yes" ENABLED_ECC="yes"
AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256" AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256"
AM_CONDITIONAL([BUILD_ECC], [test "x$ENABLED_ECC" = "xyes"]) AM_CONDITIONAL([BUILD_ECC], [test "x$ENABLED_ECC" = "xyes"])
if test "$ENABLED_ECC_SHAMIR" = "yes" if test "$ENABLED_ECC_SHAMIR" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR" AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"
@@ -2360,7 +2361,7 @@ then
ENABLED_ECC="yes" ENABLED_ECC="yes"
AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256" AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256"
AM_CONDITIONAL([BUILD_ECC], [test "x$ENABLED_ECC" = "xyes"]) AM_CONDITIONAL([BUILD_ECC], [test "x$ENABLED_ECC" = "xyes"])
if test "$ENABLED_ECC_SHAMIR" = "yes" if test "$ENABLED_ECC_SHAMIR" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR" AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"
@@ -2875,7 +2876,7 @@ AC_ARG_ENABLE([asynccrypt],
if test "$ENABLED_ASYNCCRYPT" = "yes" if test "$ENABLED_ASYNCCRYPT" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ASYNC_CRYPT -DHAVE_WOLF_EVENT" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ASYNC_CRYPT -DHAVE_WOLF_EVENT"
# if Cavium not enabled the use async simulator for testing # if Cavium not enabled the use async simulator for testing
if test "x$ENABLED_CAVIUM" = "xno" if test "x$ENABLED_CAVIUM" = "xno"
then then
@@ -3082,7 +3083,8 @@ AS_IF([test "x$ENABLED_DTLS" = "xno" && \
################################################################################ ################################################################################
# OPTIMIZE FLAGS # OPTIMIZE FLAGS
if test "$GCC" = "yes" # For distro disable custom build options that interfere with symbol generation
if test "$GCC" = "yes" && test "$ENABLED_DISTRO" = "no"
then then
AM_CFLAGS="$AM_CFLAGS -Wall -Wno-unused" AM_CFLAGS="$AM_CFLAGS -Wall -Wno-unused"
if test "$ax_enable_debug" = "no" if test "$ax_enable_debug" = "no"
@@ -3131,7 +3133,11 @@ case $host_os in
esac esac
# add user C_EXTRA_FLAGS back # add user C_EXTRA_FLAGS back
CFLAGS="$CFLAGS $USER_C_EXTRA_FLAGS" # For distro disable custom build options that interfere with symbol generation
if test "$ENABLED_DISTRO" = "no"
then
CFLAGS="$CFLAGS $USER_C_EXTRA_FLAGS"
fi
OPTION_FLAGS="$USER_CFLAGS $USER_C_EXTRA_FLAGS $AM_CFLAGS" OPTION_FLAGS="$USER_CFLAGS $USER_C_EXTRA_FLAGS $AM_CFLAGS"
CREATE_HEX_VERSION CREATE_HEX_VERSION

6
wolfcrypt/src/aes_asm.s
View File

@@ -1205,7 +1205,7 @@ pslldq $4, %xmm4
pxor %xmm4, %xmm3 pxor %xmm4, %xmm3
pxor %xmm2, %xmm3 pxor %xmm2, %xmm3
ret ret
/* /*
void AES_256_Key_Expansion (const unsigned char *userkey, void AES_256_Key_Expansion (const unsigned char *userkey,
@@ -1372,3 +1372,7 @@ gfmul:
ret ret
#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits
#endif