diff --git a/configure.ac b/configure.ac index 1f3e8b5e9..16b7cf5d4 100644 --- a/configure.ac +++ b/configure.ac @@ -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) @@ -186,7 +186,7 @@ AC_ARG_ENABLE(fortress, if test "$ENABLED_FORTRESS" = "yes" 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 @@ -336,6 +336,12 @@ then AM_CFLAGS="$AM_CFLAGS -DCYASSL_SHA512" fi +if test "$ENABLED_FORTRESS" = "yes" +then + ENABLED_SHA512="yes" +fi + + AM_CONDITIONAL([BUILD_SHA512], [test "x$ENABLED_SHA512" = "xyes"]) diff --git a/cyassl/openssl/dsa.h b/cyassl/openssl/dsa.h index 8bea7c2cf..817f1fa14 100644 --- a/cyassl/openssl/dsa.h +++ b/cyassl/openssl/dsa.h @@ -36,6 +36,8 @@ CYASSL_API int CyaSSL_DSA_generate_parameters_ex(CYASSL_DSA*, int bits, unsigned long* hRet, void* cb); 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_free CyaSSL_DSA_free diff --git a/src/ssl.c b/src/ssl.c index 312d45b23..cd955dd79 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -47,6 +47,7 @@ #include #include #include + #include /* openssl headers end, cyassl internal headers next */ #include #include