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

fortress ssh build fixes

Browse Source
This commit is contained in:
toddouska
2012-05-07 18:19:48 -07:00
parent 2a817adfcc
commit 968dfc4cf7
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -6,7 +6,7 @@
# #
# #
AC_INIT([cyassl],[2.1.3],[http://www.yassl.com]) AC_INIT([cyassl],[2.1.4],[http://www.yassl.com])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
@ -186,7 +186,7 @@ AC_ARG_ENABLE(fortress,
if test "$ENABLED_FORTRESS" = "yes" if test "$ENABLED_FORTRESS" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DFORTRESS -DOPENSSL_EXTRA -DCYASSL_DES_ECB -DCYASSL_AES_COUNTER -DCYASSL_AES_DIRECT -DCYASSL_DER_LOAD" AM_CFLAGS="$AM_CFLAGS -DFORTRESS -DOPENSSL_EXTRA -DCYASSL_DES_ECB -DCYASSL_AES_COUNTER -DCYASSL_AES_DIRECT -DCYASSL_DER_LOAD -DCYASSL_SHA512 -DCYASSL_SHA34 -DCYASSL_KEY_GEN"
fi fi
@ -336,6 +336,12 @@ then
AM_CFLAGS="$AM_CFLAGS -DCYASSL_SHA512" AM_CFLAGS="$AM_CFLAGS -DCYASSL_SHA512"
fi fi
if test "$ENABLED_FORTRESS" = "yes"
then
ENABLED_SHA512="yes"
fi
AM_CONDITIONAL([BUILD_SHA512], [test "x$ENABLED_SHA512" = "xyes"]) AM_CONDITIONAL([BUILD_SHA512], [test "x$ENABLED_SHA512" = "xyes"])

2
cyassl/openssl/dsa.h
View File

@ -36,6 +36,8 @@ CYASSL_API int CyaSSL_DSA_generate_parameters_ex(CYASSL_DSA*, int bits,
unsigned long* hRet, void* cb); unsigned long* hRet, void* cb);
CYASSL_API int CyaSSL_DSA_LoadDer(CYASSL_DSA*, const unsigned char*, int sz); CYASSL_API int CyaSSL_DSA_LoadDer(CYASSL_DSA*, const unsigned char*, int sz);
CYASSL_API int CyaSSL_DSA_do_sign(const unsigned char* d, unsigned char* sigRet,
CYASSL_DSA* dsa);
#define DSA_new CyaSSL_DSA_new #define DSA_new CyaSSL_DSA_new
#define DSA_free CyaSSL_DSA_free #define DSA_free CyaSSL_DSA_free

1
src/ssl.c
View File

@ -47,6 +47,7 @@
#include <cyassl/openssl/bn.h> #include <cyassl/openssl/bn.h>
#include <cyassl/openssl/dh.h> #include <cyassl/openssl/dh.h>
#include <cyassl/openssl/rsa.h> #include <cyassl/openssl/rsa.h>
#include <cyassl/openssl/pem.h>
/* openssl headers end, cyassl internal headers next */ /* openssl headers end, cyassl internal headers next */
#include <cyassl/ctaocrypt/hmac.h> #include <cyassl/ctaocrypt/hmac.h>
#include <cyassl/ctaocrypt/random.h> #include <cyassl/ctaocrypt/random.h>