feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add --enable-sha and build, disables examples for now since certs still use sha, when add --disable-certs add more thorough check

Browse Source
This commit is contained in:
toddouska
2013-03-11 17:53:38 -07:00
parent 7914938e60
commit 1628b6f83f
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
configure.ac
View File

@@ -201,7 +201,7 @@ AC_ARG_ENABLE([leanpsk],
if test "$ENABLED_LEANPSK" = "yes" if test "$ENABLED_LEANPSK" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DCYASSL_LEANPSK -DHAVE_NULL_CIPHER -DSINGLE_THREADED -DNO_AES -DNO_FILESYSTEM -DNO_RABBIT -DNO_RSA -DNO_DSA -DNO_DH -DNO_CERTS -DNO_PWDBASED -DNO_DES3 -DNO_MD4 -DNO_MD5 -DNO_ERROR_STRINGS -DNO_OLD_TLS -DNO_RC4 -DNO_WRITEV -DNO_SESSION_CACHE -DNO_DEV_RANDOM -DCYASSL_USER_IO -DUSE_SLOW_SHA" AM_CFLAGS="$AM_CFLAGS -DCYASSL_LEANPSK -DHAVE_NULL_CIPHER -DSINGLE_THREADED -DNO_AES -DNO_FILESYSTEM -DNO_RABBIT -DNO_RSA -DNO_DSA -DNO_DH -DNO_CERTS -DNO_PWDBASED -DNO_DES3 -DNO_MD4 -DNO_MD5 -DNO_ERROR_STRINGS -DNO_OLD_TLS -DNO_RC4 -DNO_WRITEV -DNO_SESSION_CACHE -DNO_DEV_RANDOM -DCYASSL_USER_IO -DNO_SHA -DUSE_SLOW_SHA"
ENABLED_SLOWMATH="no" ENABLED_SLOWMATH="no"
ENABLED_SINGLETHREADED="yes" ENABLED_SINGLETHREADED="yes"
fi fi
@@ -573,6 +573,28 @@ fi
AM_CONDITIONAL([BUILD_MD5], [test "x$ENABLED_MD5" = "xyes"]) AM_CONDITIONAL([BUILD_MD5], [test "x$ENABLED_MD5" = "xyes"])
# SHA
AC_ARG_ENABLE([sha],
[ --enable-sha Enable SHA (default: enabled)],
[ ENABLED_SHA=$enableval ],
[ ENABLED_SHA=yes ]
)
if test "$ENABLED_SHA" = "no"
then
AM_CFLAGS="$AM_CFLAGS -DNO_SHA -DNO_OLD_TLS"
else
# turn off SHA if leanpsk on
if test "$ENABLED_LEANPSK" = "yes"
then
AM_CFLAGS="$AM_CFLAGS -DNO_SHA -DNO_OLD_TLS"
ENABLED_SHA=no
fi
fi
AM_CONDITIONAL([BUILD_SHA], [test "x$ENABLED_SHA" = "xyes"])
# MD4 # MD4
AC_ARG_ENABLE([md4], AC_ARG_ENABLE([md4],
[ --enable-md4 Enable MD4 (default: disabled)], [ --enable-md4 Enable MD4 (default: disabled)],
@@ -851,6 +873,8 @@ AC_ARG_ENABLE([examples],
AS_IF([test "x$ENABLED_SINGLETHREADED" = "xyes"], [ENABLED_EXAMPLES="no"]) AS_IF([test "x$ENABLED_SINGLETHREADED" = "xyes"], [ENABLED_EXAMPLES="no"])
AS_IF([test "x$ENABLED_NOFILESYSTEM" = "xyes"], [ENABLED_EXAMPLES="no"]) AS_IF([test "x$ENABLED_NOFILESYSTEM" = "xyes"], [ENABLED_EXAMPLES="no"])
# certs still have sha signatures for now
AS_IF([test "x$ENABLED_SHA" = "xno"], [ENABLED_EXAMPLES="no"])
AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"]) AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"])
@@ -1009,6 +1033,7 @@ echo " * AES-CCM: $ENABLED_AESCCM"
echo " * Camellia: $ENABLED_CAMELLIA" echo " * Camellia: $ENABLED_CAMELLIA"
echo " * MD5: $ENABLED_MD5" echo " * MD5: $ENABLED_MD5"
echo " * RIPEMD: $ENABLED_RIPEMD" echo " * RIPEMD: $ENABLED_RIPEMD"
echo " * SHA: $ENABLED_SHA"
echo " * SHA-512: $ENABLED_SHA512" echo " * SHA-512: $ENABLED_SHA512"
echo " * keygen: $ENABLED_KEYGEN" echo " * keygen: $ENABLED_KEYGEN"
echo " * certgen: $ENABLED_CERTGEN" echo " * certgen: $ENABLED_CERTGEN"

5
src/include.am
View File

@@ -11,7 +11,6 @@ src_libcyassl_la_SOURCES = \
src/tls.c \ src/tls.c \
ctaocrypt/src/hmac.c \ ctaocrypt/src/hmac.c \
ctaocrypt/src/random.c \ ctaocrypt/src/random.c \
ctaocrypt/src/sha.c \
ctaocrypt/src/sha256.c \ ctaocrypt/src/sha256.c \
ctaocrypt/src/logging.c \ ctaocrypt/src/logging.c \
ctaocrypt/src/error.c ctaocrypt/src/error.c
@@ -36,6 +35,10 @@ if BUILD_AES
src_libcyassl_la_SOURCES += ctaocrypt/src/aes.c src_libcyassl_la_SOURCES += ctaocrypt/src/aes.c
endif endif
if BUILD_SHA
src_libcyassl_la_SOURCES += ctaocrypt/src/sha.c
endif
if BUILD_RC4 if BUILD_RC4
src_libcyassl_la_SOURCES += ctaocrypt/src/arc4.c src_libcyassl_la_SOURCES += ctaocrypt/src/arc4.c
endif endif