diff --git a/Makefile.am b/Makefile.am index 72cf64cb9..7a478c2e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,10 +30,12 @@ EXTRA_DIST+= lib/dummy EXTRA_DIST+= cyassl-ntru.vcproj EXTRA_DIST+= cyassl.vcproj +EXTRA_DIST+= cyassl.vcxproj EXTRA_DIST+= cyassl-iphone.xcodeproj/project.pbxproj EXTRA_DIST+= cyassl-ios.xcodeproj/project.pbxproj EXTRA_DIST+= cyassl-ntru.sln EXTRA_DIST+= cyassl.sln +EXTRA_DIST+= cyassl64.sln EXTRA_DIST+= valgrind-error.sh EXTRA_DIST+= gencertbuf.pl EXTRA_DIST+= IDE @@ -81,7 +83,10 @@ TESTS += $(check_PROGRAMS) test: check tests/unit.log: testsuite/testsuite.log -DISTCLEANFILES+= cyassl-config +DISTCLEANFILES+= cyassl-config +# fips files shouldn't be left after make distclean +DISTCLEANFILES+= ctaocrypt/src/fips.c +DISTCLEANFILES+= ctaocrypt/src/fips_test.c maintainer-clean-local: -rm Makefile.in diff --git a/configure.ac b/configure.ac index 7cb4852c6..2b84124cc 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # # -AC_INIT([cyassl],[3.0.0],[https://github.com/cyassl/cyassl/issues],[cyassl],[http://www.wolfssl.com]) +AC_INIT([cyassl],[3.0.2],[https://github.com/cyassl/cyassl/issues],[cyassl],[http://www.wolfssl.com]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/cyassl/version.h b/cyassl/version.h index 9df3246e7..9097bffab 100644 --- a/cyassl/version.h +++ b/cyassl/version.h @@ -26,8 +26,8 @@ extern "C" { #endif -#define LIBCYASSL_VERSION_STRING "3.0.0" -#define LIBCYASSL_VERSION_HEX 0x03000000 +#define LIBCYASSL_VERSION_STRING "3.0.2" +#define LIBCYASSL_VERSION_HEX 0x03000002 #ifdef __cplusplus } diff --git a/examples/client/include.am b/examples/client/include.am index 0d74028c7..8b81e2c47 100644 --- a/examples/client/include.am +++ b/examples/client/include.am @@ -11,6 +11,7 @@ endif EXTRA_DIST += examples/client/client.sln EXTRA_DIST += examples/client/client-ntru.vcproj EXTRA_DIST += examples/client/client.vcproj +EXTRA_DIST += examples/client/client.vcxproj dist_example_DATA+= examples/client/client.c DISTCLEANFILES+= examples/client/.libs/client diff --git a/examples/echoclient/include.am b/examples/echoclient/include.am index d913e663b..210429009 100644 --- a/examples/echoclient/include.am +++ b/examples/echoclient/include.am @@ -13,6 +13,7 @@ endif EXTRA_DIST += examples/echoclient/echoclient.sln EXTRA_DIST += examples/echoclient/echoclient-ntru.vcproj EXTRA_DIST += examples/echoclient/echoclient.vcproj +EXTRA_DIST += examples/echoclient/echoclient.vcxproj dist_example_DATA+= examples/echoclient/echoclient.c DISTCLEANFILES+= examples/echoclient/.libs/echoclient diff --git a/examples/echoserver/include.am b/examples/echoserver/include.am index f207d475f..d0080fd0c 100644 --- a/examples/echoserver/include.am +++ b/examples/echoserver/include.am @@ -13,6 +13,7 @@ endif EXTRA_DIST += examples/echoserver/echoserver.sln EXTRA_DIST += examples/echoserver/echoserver-ntru.vcproj EXTRA_DIST += examples/echoserver/echoserver.vcproj +EXTRA_DIST += examples/echoserver/echoserver.vcxproj dist_example_DATA+= examples/echoserver/echoserver.c DISTCLEANFILES+= examples/echoserver/.libs/echoserver diff --git a/examples/server/include.am b/examples/server/include.am index e39e6b534..181ef05cf 100644 --- a/examples/server/include.am +++ b/examples/server/include.am @@ -13,6 +13,7 @@ endif EXTRA_DIST += examples/server/server.sln EXTRA_DIST += examples/server/server-ntru.vcproj EXTRA_DIST += examples/server/server.vcproj +EXTRA_DIST += examples/server/server.vcxproj dist_example_DATA+= examples/server/server.c DISTCLEANFILES+= examples/server/.libs/server diff --git a/sslSniffer/sslSnifferTest/include.am b/sslSniffer/sslSnifferTest/include.am index d4c90accc..0d3c5a0ca 100644 --- a/sslSniffer/sslSnifferTest/include.am +++ b/sslSniffer/sslSnifferTest/include.am @@ -9,5 +9,6 @@ sslSniffer_sslSnifferTest_snifftest_LDADD = src/libcyassl.la -lpcap sslSniffer_sslSnifferTest_snifftest_DEPENDENCIES = src/libcyassl.la endif EXTRA_DIST += sslSniffer/sslSniffer.vcproj +EXTRA_DIST += sslSniffer/sslSniffer.vcxproj EXTRA_DIST += sslSniffer/sslSnifferTest/sslSniffTest.vcproj DISTCLEANFILES+= sslSniffer/sslSnifferTest/.libs/snifftest diff --git a/testsuite/include.am b/testsuite/include.am index 900ee8d9a..e9c5eb5bd 100644 --- a/testsuite/include.am +++ b/testsuite/include.am @@ -20,6 +20,7 @@ endif EXTRA_DIST += testsuite/testsuite.sln EXTRA_DIST += testsuite/testsuite-ntru.vcproj EXTRA_DIST += testsuite/testsuite.vcproj +EXTRA_DIST += testsuite/testsuite.vcxproj EXTRA_DIST += input EXTRA_DIST += quit DISTCLEANFILES+= testsuite/.libs/testsuite.test