mirror of https://github.com/wolfSSL/wolfssl.git
fix sniffer and hc128 builds
parent
389077fdfd
commit
5876f4acf2
|
@ -31,6 +31,10 @@ testsuite/testsuite
|
|||
testsuite/*.der
|
||||
testsuite/*.pem
|
||||
testsuite/*.raw
|
||||
cert.der
|
||||
cert.pem
|
||||
othercert.der
|
||||
othercert.pem
|
||||
diff
|
||||
sslSniffer/sslSnifferTest/tracefile.txt
|
||||
*.gz
|
||||
|
|
25
configure.ac
25
configure.ac
|
@ -335,18 +335,19 @@ then
|
|||
fi
|
||||
|
||||
|
||||
# HC128
|
||||
AC_ARG_ENABLE([hc128],
|
||||
[ --enable-hc128 Enable HC-128 (default: disabled)],
|
||||
[case "${enableval}" in
|
||||
yes) BUILD_HC128=true ;;
|
||||
no) BUILD_HC128=false ;;
|
||||
*) AC_MSG_ERROR([bad value ${enableval} for --enable-hc128]) ;;
|
||||
esac],[BUILD_HC128=false])
|
||||
AM_CONDITIONAL([BUILD_HC128], [test x$BUILD_HC128 = xtrue])
|
||||
AS_IF([test "x$BUILD_HC128" = "xyes"],
|
||||
[ AC_DEFINE([HAVE_HC128], [1], [Have hc128])],
|
||||
[ AC_DEFINE([HAVE_HC128], [0], [Have hc128])])
|
||||
# HC128
|
||||
AC_ARG_ENABLE(hc128,
|
||||
[ --enable-certgen Enable HC-128 (default: disabled)],
|
||||
[ ENABLED_HC128=$enableval ],
|
||||
[ ENABLED_HC128=no ]
|
||||
)
|
||||
|
||||
if test "$ENABLED_HC128" = "no"
|
||||
then
|
||||
AM_CFLAGS="$AM_CFLAGS -DNO_HC128"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([BUILD_HC128], [test "x$ENABLED_HC128" = "xyes"])
|
||||
|
||||
|
||||
# PSK
|
||||
|
|
|
@ -182,17 +182,12 @@ void ctaocrypt_test(void* args)
|
|||
else
|
||||
printf( "ARC4 test passed!\n");
|
||||
|
||||
if (HAVE_HC128)
|
||||
{
|
||||
if ( (ret = hc128_test()) )
|
||||
#ifndef NO_HC128
|
||||
if ( (ret = hc128_test()) )
|
||||
err_sys("HC-128 test failed!\n", ret);
|
||||
else
|
||||
printf( "HC-128 test passed!\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
printf( "HC-128 test skipped!\n");
|
||||
}
|
||||
printf( "HC-128 test passed!\n");
|
||||
#endif
|
||||
|
||||
#ifndef NO_RABBIT
|
||||
if ( (ret = rabbit_test()) )
|
||||
|
|
|
@ -20,12 +20,12 @@
|
|||
*/
|
||||
|
||||
|
||||
#if HAVE_HC128
|
||||
#ifndef NO_HC128
|
||||
|
||||
#ifndef CTAO_CRYPT_HC128_H
|
||||
#define CTAO_CRYPT_HC128_H
|
||||
|
||||
#include "ctc_types.h"
|
||||
#include <cyassl/ctaocrypt/ctc_types.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef CYASSL_SNIFFER_H
|
||||
#define CYASSL_SNIFFER_H
|
||||
|
||||
#include "ctc_settings.h"
|
||||
#include <cyassl/ctaocrypt/ctc_settings.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifdef SSL_SNIFFER_EXPORTS
|
||||
|
|
|
@ -38,11 +38,11 @@
|
|||
|
||||
#ifdef CYASSL_SNIFFER
|
||||
|
||||
#include <ssl.h>
|
||||
#include <cyassl_int.h>
|
||||
#include <cyassl_error.h>
|
||||
#include <sniffer.h>
|
||||
#include <sniffer_error.h>
|
||||
#include <cyassl/openssl/ssl.h>
|
||||
#include <cyassl/cyassl_int.h>
|
||||
#include <cyassl/cyassl_error.h>
|
||||
#include <cyassl/sniffer.h>
|
||||
#include <cyassl/sniffer_error.h>
|
||||
|
||||
/* Misc constants */
|
||||
enum {
|
||||
|
|
|
@ -51,7 +51,7 @@ int main()
|
|||
#include <stdlib.h> /* EXIT_SUCCESS */
|
||||
#include <signal.h> /* signal */
|
||||
|
||||
#include "sniffer.h"
|
||||
#include <cyassl/sniffer.h>
|
||||
|
||||
|
||||
#ifndef _WIN32
|
||||
|
|
Loading…
Reference in New Issue