Skip to content

Commit 2af8229

Browse files
Donnie-IceDonnie-Ice
authored
Merge pull request #340 from nasa/156-et_dt_validation-auth_encryption_test
156 et dt validation auth encryption test
2 parents 42c9a1c + c616395 commit 2af8229

File tree

10 files changed

+37
-3372
lines changed

10 files changed

+37
-3372
lines changed

‎CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ option(SA_MARIADB "Security Association - MariaDB" OFF)
5656
option(SUPPORT "Support" OFF)
5757
option(SYSTEM_INSTALL "SystemInstall" OFF)
5858
option(TEST "Test" OFF)
59-
option(TEST_ENC "Tests - Encryption" OFF)
59+
# option(TEST_ENC "Tests - Encryption" OFF)
6060
option(SA_FILE "Save Security Association to File" OFF)
6161
option(KEY_VALIDATION "Validate existance of key duplication" OFF)
6262

@@ -150,10 +150,10 @@ elseif(NOT DEFINED CFE_SYSTEM_PSPNAME)
150150
set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/install)
151151
endif()
152152

153-
if(TEST_ENC)
154-
# Can't run an additional set of tests without `TEST` enabled
155-
set(TEST ON)
156-
endif()
153+
# if(TEST_ENC)
154+
# # Can't run an additional set of tests without `TEST` enabled
155+
# set(TEST ON)
156+
# endif()
157157

158158
if(TEST)
159159
include(CTest)

‎support/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ RUN apt-get update -y \
3939
python3-dev \
4040
python3-pip \
4141
unzip \
42-
&& rm -rf /var/lib/apt/lists/* \
43-
&& pip3 install pycryptodome
42+
&& rm -rf /var/lib/apt/lists/*
4443

4544
FROM cl0 AS cl1
4645
ARG GPG_ERROR_VERSION=1.50

‎support/scripts/build_internal.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ source $SCRIPT_DIR/env.sh
1111

1212
rm $BASE_DIR/CMakeCache.txt
1313

14-
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DMC_INTERNAL=1 -DTEST=1 -DTEST_ENC=1 -DSA_FILE=1 -DKEY_VALIDATION=0 && make && make test
14+
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DMC_INTERNAL=1 -DTEST=1 -DSA_FILE=1 -DKEY_VALIDATION=0 && make && make test

‎support/scripts/build_kmc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ source $SCRIPT_DIR/env.sh
1111

1212
rm $BASE_DIR/CMakeCache.txt
1313

14-
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DCRYPTO_KMC=1 -DKEY_KMC=1 -DMC_DISABLED=1 -DSA_MARIADB=1 -DTEST=1 -DTEST_ENC=1 -DKMC_CFFI_EXCLUDE=1 -DSA_FILE=1 -DKMC_MDB_DB=1 && make && make test
14+
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DCRYPTO_KMC=1 -DKEY_KMC=1 -DMC_DISABLED=1 -DSA_MARIADB=1 -DTEST=1 -DKMC_CFFI_EXCLUDE=1 -DSA_FILE=1 -DKMC_MDB_DB=1 && make && make test

‎support/scripts/build_rhel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ source $SCRIPT_DIR/env.sh
1111

1212
rm $BASE_DIR/CMakeCache.txt
1313

14-
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DMC_INTERNAL=1 -DTEST=1 -DTEST_ENC=1 -DSA_FILE=1 && make && make test
14+
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DMC_INTERNAL=1 -DTEST=1 -DSA_FILE=1 && make && make test
1515

‎support/scripts/build_support.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ source $SCRIPT_DIR/env.sh
1111

1212
rm $BASE_DIR/CMakeCache.txt
1313

14-
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DSUPPORT=1 -DTEST=1 -DTEST_ENC=1 && make && make test
14+
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DSUPPORT=1 -DTEST=1 && make && make test

‎support/scripts/build_wolf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ source $SCRIPT_DIR/env.sh
1111

1212
rm $BASE_DIR/CMakeCache.txt
1313

14-
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DCRYPTO_LIBGCRYPT=0 -DCRYPTO_WOLFSSL=1 -DTEST=1 -DTEST_ENC=1 -DSA_FILE=1 && make && make test
14+
cmake $BASE_DIR -DCODECOV=1 -DDEBUG=1 -DCRYPTO_LIBGCRYPT=0 -DCRYPTO_WOLFSSL=1 -DTEST=1 -DSA_FILE=1 && make && make test

‎support/scripts/update_env.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#
66

77
apt-get install -y lcov libcurl4-openssl-dev libmariadb-dev libmariadb-dev-compat python3
8-
pip install pycryptodome
98
curl -LS https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.50.tar.bz2 -o /tmp/libgpg-error-1.50.tar.bz2
109
tar -xjf /tmp/libgpg-error-1.50.tar.bz2 -C /tmp/ && cd /tmp/libgpg-error-1.50 && ./configure && make install
1110
curl -LS https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.11.0.tar.bz2 -o /tmp/libgcrypt-1.11.0.tar.bz2

‎test/CMakeLists.txt

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -121,41 +121,41 @@ endif()
121121
# WORKING_DIRECTORY ${PROJECT_TEST_DIR})
122122
#endif()
123123

124-
if(TEST_ENC)
125-
add_test(NAME ET_DT_VALIDATION
126-
COMMAND ${PROJECT_BINARY_DIR}/bin/et_dt_validation
127-
WORKING_DIRECTORY ${PROJECT_TEST_DIR})
128-
endif()
124+
# if(TEST_ENC)
125+
# add_test(NAME ET_DT_VALIDATION
126+
# COMMAND ${PROJECT_BINARY_DIR}/bin/et_dt_validation
127+
# WORKING_DIRECTORY ${PROJECT_TEST_DIR})
128+
# endif()
129129

130130
include_directories(include)
131131
include_directories(../include)
132132

133-
if(TEST_ENC)
134-
set(Python3_FIND_STRATEGY VERSION)
135-
find_package (Python3 REQUIRED COMPONENTS Interpreter Development)
136-
execute_process(COMMAND pip3 show pycryptodome RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET)
137-
if(NOT ${EXIT_CODE} EQUAL 0)
138-
message(FATAL_ERROR "The \"pycryptodome\" Python3 package is not installed, and is required for TEST_ENC.")
139-
endif()
140-
endif()
133+
# if(TEST_ENC)
134+
# set(Python3_FIND_STRATEGY VERSION)
135+
# find_package (Python3 REQUIRED COMPONENTS Interpreter Development)
136+
# execute_process(COMMAND pip3 show pycryptodome RESULT_VARIABLE EXIT_CODE OUTPUT_QUIET)
137+
# if(NOT ${EXIT_CODE} EQUAL 0)
138+
# message(FATAL_ERROR "The \"pycryptodome\" Python3 package is not installed, and is required for TEST_ENC.")
139+
# endif()
140+
# endif()
141141

142142
file( GLOB UNIT_FILES unit/*.c)
143143
foreach(SOURCE_PATH ${UNIT_FILES})
144144
get_filename_component(EXECUTABLE_NAME ${SOURCE_PATH} NAME_WE)
145145

146-
if((NOT TEST_ENC) AND ${EXECUTABLE_NAME} STREQUAL et_dt_validation)
147-
continue()
148-
else()
149-
add_executable(${EXECUTABLE_NAME} ${SOURCE_PATH})
150-
target_sources(${EXECUTABLE_NAME} PRIVATE core/shared_util.c)
151-
target_link_libraries(${EXECUTABLE_NAME} LINK_PUBLIC crypto pthread)
152-
endif()
153-
154-
if(TEST_ENC AND ${EXECUTABLE_NAME} STREQUAL et_dt_validation)
155-
target_link_libraries(${EXECUTABLE_NAME} PUBLIC ${Python3_LIBRARIES})
156-
target_include_directories(${EXECUTABLE_NAME} PUBLIC ${Python3_INCLUDE_DIRS})
157-
find_library(${Python3_LIBRARIES} pycryptodome)
158-
endif()
146+
# if((NOT TEST_ENC) AND ${EXECUTABLE_NAME} STREQUAL et_dt_validation)
147+
# continue()
148+
# else()
149+
add_executable(${EXECUTABLE_NAME} ${SOURCE_PATH})
150+
target_sources(${EXECUTABLE_NAME} PRIVATE core/shared_util.c)
151+
target_link_libraries(${EXECUTABLE_NAME} LINK_PUBLIC crypto pthread)
152+
# endif()
153+
154+
# if(TEST_ENC AND ${EXECUTABLE_NAME} STREQUAL et_dt_validation)
155+
# target_link_libraries(${EXECUTABLE_NAME} PUBLIC ${Python3_LIBRARIES})
156+
# target_include_directories(${EXECUTABLE_NAME} PUBLIC ${Python3_INCLUDE_DIRS})
157+
# find_library(${Python3_LIBRARIES} pycryptodome)
158+
# endif()
159159

160160
add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
161161
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${EXECUTABLE_NAME}> ${PROJECT_BINARY_DIR}/bin/${EXECUTABLE_NAME}

0 commit comments

Comments
 (0)