Browse Source

Fix includes and complete test_etcp_connection_init build

- Fixed header includes (ll_queue.h, u_async.h, tinycrypt paths)
- Updated Makefile.am with proper CFLAGS and all dependencies
- Test compiles and runs successfully
v2_dev
Evgeny 2 months ago
parent
commit
4a2044973c
  1. 3
      src/etcp.c
  2. 1
      src/etcp.h
  3. 2
      src/etcp_connections.c
  4. 14
      src/secure_channel.c
  5. 10
      tests/Makefile.am

3
src/etcp.c

@ -1,8 +1,9 @@
// etcp.c - ETCP Protocol Implementation
#include "u_async.h"
#include "../lib/u_async.h"
#include "utun_instance.h"
#include "etcp.h"
#include "../lib/debug_config.h"
#include "../lib/ll_queue.h"
#include "crc32.h"
#include "secure_channel.h"
#include <stdlib.h>

1
src/etcp.h

@ -4,7 +4,6 @@
#define ETCP_H
#include "etcp_connections.h"
#include "ll_queue.h"
#include "secure_channel.h"
#include <stdint.h>

2
src/etcp_connections.c

@ -11,7 +11,7 @@
#include "crc32.h"
#include "etcp.h"
#include "../lib/memory_pool.h"
#include "u_async.h"
#include "../lib/u_async.h"
#include <stdlib.h>
#include <time.h>

14
src/secure_channel.c

@ -1,13 +1,13 @@
/* sc_lib.c - Secure Channel library implementation using TinyCrypt */
#include "secure_channel.h"
#include <tinycrypt/ecc.h>
#include <tinycrypt/ecc_dh.h>
#include <tinycrypt/aes.h>
#include <tinycrypt/ccm_mode.h>
#include <tinycrypt/constants.h>
#include <tinycrypt/ecc_platform_specific.h>
#include <tinycrypt/sha256.h>
#include "../tinycrypt/lib/include/tinycrypt/ecc.h"
#include "../tinycrypt/lib/include/tinycrypt/ecc_dh.h"
#include "../tinycrypt/lib/include/tinycrypt/aes.h"
#include "../tinycrypt/lib/include/tinycrypt/ccm_mode.h"
#include "../tinycrypt/lib/include/tinycrypt/constants.h"
#include "../tinycrypt/lib/include/tinycrypt/ecc_platform_specific.h"
#include "../tinycrypt/lib/include/tinycrypt/sha256.h"
#include <string.h>
#include <stddef.h>
#include <sys/types.h>

10
tests/Makefile.am

@ -71,7 +71,11 @@ test_etcp_connections_send_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib
test_etcp_connection_init_SOURCES = test_etcp_connection_init.c
test_etcp_connection_init_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source
# Set CFLAGS for source files compiled from ../src
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source
test_secure_channel_extended_SOURCES = test_secure_channel_extended.c
test_secure_channel_extended_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_srcdir)/tinycrypt/lib/include -I$(top_srcdir)/tinycrypt/lib/source
# Link all tests against the libraries
@ -129,8 +133,12 @@ test_etcp_connection_init_LDADD = \
$(top_builddir)/src/etcp.o \
$(top_builddir)/src/secure_channel.o \
$(top_builddir)/src/utun_instance.o \
$(top_builddir)/src/config_parser.o \
$(top_builddir)/src/config_updater.o \
$(top_builddir)/src/crc32.o \
$(top_builddir)/src/pkt_normalizer.o \
$(top_builddir)/src/routing.o \
$(top_builddir)/src/tun_if.o \
$(top_builddir)/tinycrypt/lib/source/aes_encrypt.o \
$(top_builddir)/tinycrypt/lib/source/aes_decrypt.o \
$(top_builddir)/tinycrypt/lib/source/ccm_mode.o \
@ -139,6 +147,8 @@ test_etcp_connection_init_LDADD = \
$(top_builddir)/tinycrypt/lib/source/ecc.o \
$(top_builddir)/tinycrypt/lib/source/ecc_dh.o \
$(top_builddir)/tinycrypt/lib/source/ecc_dsa.o \
$(top_builddir)/tinycrypt/lib/source/ecc_platform_specific.o \
$(top_builddir)/tinycrypt/lib/source/utils.o \
$(top_builddir)/tinycrypt/lib/source/sha256.o \
$(top_builddir)/lib/libuasync.a \
-lpthread \

Loading…
Cancel
Save