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

fix sniffer and hc128 builds

Browse Source
This commit is contained in:
Todd A Ouska
2011-08-24 17:39:23 -07:00
parent 389077fdfd
commit 5876f4acf2
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -31,6 +31,10 @@ testsuite/testsuite
testsuite/*.der testsuite/*.der
testsuite/*.pem testsuite/*.pem
testsuite/*.raw testsuite/*.raw
cert.der
cert.pem
othercert.der
othercert.pem
diff diff
sslSniffer/sslSnifferTest/tracefile.txt sslSniffer/sslSnifferTest/tracefile.txt
*.gz *.gz

25
configure.ac
View File

@ -335,18 +335,19 @@ then
fi fi
# HC128 # HC128
AC_ARG_ENABLE([hc128], AC_ARG_ENABLE(hc128,
[ --enable-hc128 Enable HC-128 (default: disabled)], [ --enable-certgen Enable HC-128 (default: disabled)],
[case "${enableval}" in [ ENABLED_HC128=$enableval ],
yes) BUILD_HC128=true ;; [ ENABLED_HC128=no ]
no) BUILD_HC128=false ;; )
*) AC_MSG_ERROR([bad value ${enableval} for --enable-hc128]) ;;
esac],[BUILD_HC128=false]) if test "$ENABLED_HC128" = "no"
AM_CONDITIONAL([BUILD_HC128], [test x$BUILD_HC128 = xtrue]) then
AS_IF([test "x$BUILD_HC128" = "xyes"], AM_CFLAGS="$AM_CFLAGS -DNO_HC128"
[ AC_DEFINE([HAVE_HC128], [1], [Have hc128])], fi
[ AC_DEFINE([HAVE_HC128], [0], [Have hc128])])
AM_CONDITIONAL([BUILD_HC128], [test "x$ENABLED_HC128" = "xyes"])
# PSK # PSK

13
ctaocrypt/test/test.c
View File

@ -182,17 +182,12 @@ void ctaocrypt_test(void* args)
else else
printf( "ARC4 test passed!\n"); printf( "ARC4 test passed!\n");
if (HAVE_HC128) #ifndef NO_HC128
{ if ( (ret = hc128_test()) )
if ( (ret = hc128_test()) )
err_sys("HC-128 test failed!\n", ret); err_sys("HC-128 test failed!\n", ret);
else
printf( "HC-128 test passed!\n");
}
else else
{ printf( "HC-128 test passed!\n");
printf( "HC-128 test skipped!\n"); #endif
}
#ifndef NO_RABBIT #ifndef NO_RABBIT
if ( (ret = rabbit_test()) ) if ( (ret = rabbit_test()) )

4
cyassl/ctaocrypt/ctc_hc128.h
View File

@ -20,12 +20,12 @@
*/ */
#if HAVE_HC128 #ifndef NO_HC128
#ifndef CTAO_CRYPT_HC128_H #ifndef CTAO_CRYPT_HC128_H
#define CTAO_CRYPT_HC128_H #define CTAO_CRYPT_HC128_H
#include "ctc_types.h" #include <cyassl/ctaocrypt/ctc_types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
cyassl/sniffer.h
View File

@ -23,7 +23,7 @@
#ifndef CYASSL_SNIFFER_H #ifndef CYASSL_SNIFFER_H
#define CYASSL_SNIFFER_H #define CYASSL_SNIFFER_H
#include "ctc_settings.h" #include <cyassl/ctaocrypt/ctc_settings.h>
#ifdef _WIN32 #ifdef _WIN32
#ifdef SSL_SNIFFER_EXPORTS #ifdef SSL_SNIFFER_EXPORTS

10
src/sniffer.c
View File

@ -38,11 +38,11 @@
#ifdef CYASSL_SNIFFER #ifdef CYASSL_SNIFFER
#include <ssl.h> #include <cyassl/openssl/ssl.h>
#include <cyassl_int.h> #include <cyassl/cyassl_int.h>
#include <cyassl_error.h> #include <cyassl/cyassl_error.h>
#include <sniffer.h> #include <cyassl/sniffer.h>
#include <sniffer_error.h> #include <cyassl/sniffer_error.h>
/* Misc constants */ /* Misc constants */
enum { enum {

2
sslSniffer/sslSnifferTest/snifftest.c
View File

@ -51,7 +51,7 @@ int main()
#include <stdlib.h> /* EXIT_SUCCESS */ #include <stdlib.h> /* EXIT_SUCCESS */
#include <signal.h> /* signal */ #include <signal.h> /* signal */
#include "sniffer.h" #include <cyassl/sniffer.h>
#ifndef _WIN32 #ifndef _WIN32