mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:wolfSSL/wolfssl

Browse Source
This commit is contained in:
John Safranek 2015-01-09 11:22:38 -08:00
commit 2be9d8f5c6
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -45,14 +45,14 @@ ACLOCAL_AMFLAGS= -I m4
EXTRA_DIST+= lib/dummy EXTRA_DIST+= lib/dummy
EXTRA_DIST+= cyassl-ntru.vcproj EXTRA_DIST+= wolfssl-ntru.vcproj
EXTRA_DIST+= cyassl.vcproj EXTRA_DIST+= wolfssl.vcproj
EXTRA_DIST+= cyassl.vcxproj EXTRA_DIST+= wolfssl.vcxproj
EXTRA_DIST+= cyassl-iphone.xcodeproj/project.pbxproj EXTRA_DIST+= wolfssl-iphone.xcodeproj/project.pbxproj
EXTRA_DIST+= cyassl-ios.xcodeproj/project.pbxproj EXTRA_DIST+= wolfssl-ios.xcodeproj/project.pbxproj
EXTRA_DIST+= cyassl-ntru.sln EXTRA_DIST+= wolfssl-ntru.sln
EXTRA_DIST+= cyassl.sln EXTRA_DIST+= wolfssl.sln
EXTRA_DIST+= cyassl64.sln EXTRA_DIST+= wolfssl64.sln
EXTRA_DIST+= valgrind-error.sh EXTRA_DIST+= valgrind-error.sh
EXTRA_DIST+= gencertbuf.pl EXTRA_DIST+= gencertbuf.pl
EXTRA_DIST+= IDE EXTRA_DIST+= IDE

3
src/sniffer.c
View File

@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/* Name change compatibility layer */
//#include <cyassl/ssl.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif