Skip to content

Commit e7fc139

Browse files
committed
lib: monkey: upgrade to v1.8.2
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
1 parent ef94fce commit e7fc139

File tree

162 files changed

+88516
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+88516
-2
lines changed

lib/monkey/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif()
2323
# Monkey Version
2424
set(MK_VERSION_MAJOR 1)
2525
set(MK_VERSION_MINOR 8)
26-
set(MK_VERSION_PATCH 1)
26+
set(MK_VERSION_PATCH 2)
2727
set(MK_VERSION_STR "${MK_VERSION_MAJOR}.${MK_VERSION_MINOR}.${MK_VERSION_PATCH}")
2828

2929
# Output paths
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
CMakeCache.txt
2+
CMakeFiles
3+
CTestTestfile.cmake
4+
cmake_install.cmake
5+
Testing
6+
Coverage
7+
*.gcno
8+
*.gcda
9+
10+
# generated by scripts/memory.sh
11+
massif-*
12+
13+
# MSVC files generated by CMake:
14+
/*.sln
15+
/*.vcxproj
16+
/*.filters
17+
18+
# MSVC build artifacts:
19+
*.exe
20+
*.pdb
21+
*.ilk
22+
*.lib
23+
24+
# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those:
25+
*.dir/
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
language: c
2+
compiler:
3+
- clang
4+
- gcc
5+
sudo: false
6+
cache: ccache
7+
script:
8+
- tests/scripts/recursion.pl library/*.c
9+
- tests/scripts/check-generated-files.sh
10+
- tests/scripts/check-doxy-blocks.pl
11+
- tests/scripts/check-names.sh
12+
- tests/scripts/doxygen.sh
13+
- cmake -D CMAKE_BUILD_TYPE:String="Check" .
14+
- make
15+
- make test
16+
- programs/test/selftest
17+
- OSSL_NO_DTLS=1 tests/compat.sh
18+
- tests/ssl-opt.sh -e '\(DTLS\|SCSV\).*openssl'
19+
- tests/scripts/test-ref-configs.pl
20+
- tests/scripts/curves.pl
21+
- tests/scripts/key-exchanges.pl
22+
after_failure:
23+
- tests/scripts/travis-log-failure.sh
24+
env:
25+
global:
26+
secure: "barHldniAfXyoWOD/vcO+E6/Xm4fmcaUoC9BeKW+LwsHqlDMLvugaJnmLXkSpkbYhVL61Hzf3bo0KPJn88AFc5Rkf8oYHPjH4adMnVXkf3B9ghHCgznqHsAH3choo6tnPxaFgOwOYmLGb382nQxfE5lUdvnM/W/psQjWt66A1+k="
27+
28+
addons:
29+
apt:
30+
packages:
31+
- doxygen
32+
- graphviz
33+
coverity_scan:
34+
project:
35+
name: "ARMmbed/mbedtls"
36+
notification_email: p.j.bakker@polarssl.org
37+
build_command_prepend:
38+
build_command: make
39+
branch_pattern: coverity_scan
Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
cmake_minimum_required(VERSION 2.6)
2+
project("mbed TLS" C)
3+
4+
option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF)
5+
option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)
6+
7+
option(ENABLE_PROGRAMS "Build mbed TLS programs." ON)
8+
9+
option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF)
10+
11+
# the test suites currently have compile errors with MSVC
12+
if(MSVC)
13+
option(ENABLE_TESTING "Build mbed TLS tests." OFF)
14+
else()
15+
option(ENABLE_TESTING "Build mbed TLS tests." ON)
16+
endif()
17+
18+
# Warning string - created as a list for compatibility with CMake 2.8
19+
set(WARNING_BORDER "*******************************************************\n")
20+
set(NULL_ENTROPY_WARN_L1 "**** WARNING! MBEDTLS_TEST_NULL_ENTROPY defined!\n")
21+
set(NULL_ENTROPY_WARN_L2 "**** THIS BUILD HAS NO DEFINED ENTROPY SOURCES\n")
22+
set(NULL_ENTROPY_WARN_L3 "**** AND IS *NOT* SUITABLE FOR PRODUCTION USE\n")
23+
24+
set(NULL_ENTROPY_WARNING "${WARNING_BORDER}"
25+
"${NULL_ENTROPY_WARN_L1}"
26+
"${NULL_ENTROPY_WARN_L2}"
27+
"${NULL_ENTROPY_WARN_L3}"
28+
"${WARNING_BORDER}")
29+
30+
find_package(Perl)
31+
if(PERL_FOUND)
32+
33+
# If NULL Entropy is configured, display an appropriate warning
34+
execute_process(COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/config.pl -f ${CMAKE_SOURCE_DIR}/include/mbedtls/config.h get MBEDTLS_TEST_NULL_ENTROPY
35+
RESULT_VARIABLE result)
36+
if(${result} EQUAL 0)
37+
message(WARNING ${NULL_ENTROPY_WARNING})
38+
39+
if(NOT UNSAFE_BUILD)
40+
message(FATAL_ERROR "\
41+
\n\
42+
Warning! You have enabled MBEDTLS_TEST_NULL_ENTROPY. \
43+
This option is not safe for production use and negates all security \
44+
It is intended for development use only. \
45+
\n\
46+
To confirm you want to build with this option, re-run cmake with the \
47+
option: \n\
48+
cmake -DUNSAFE_BUILD=ON ")
49+
50+
return()
51+
endif()
52+
endif()
53+
endif()
54+
55+
set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}
56+
CACHE STRING "Choose the type of build: None Debug Release Coverage ASan ASanDbg MemSan MemSanDbg Check CheckFull"
57+
FORCE)
58+
59+
string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
60+
61+
if(CMAKE_COMPILER_IS_GNUCC)
62+
# some warnings we want are not available with old GCC versions
63+
# note: starting with CMake 2.8 we could use CMAKE_C_COMPILER_VERSION
64+
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
65+
OUTPUT_VARIABLE GCC_VERSION)
66+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings")
67+
if (GCC_VERSION VERSION_GREATER 4.5 OR GCC_VERSION VERSION_EQUAL 4.5)
68+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op")
69+
endif()
70+
if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
71+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
72+
endif()
73+
set(CMAKE_C_FLAGS_RELEASE "-O2")
74+
set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
75+
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
76+
set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -O3")
77+
set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls ")
78+
set(CMAKE_C_FLAGS_CHECK "-Werror -Os")
79+
set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual")
80+
endif(CMAKE_COMPILER_IS_GNUCC)
81+
82+
if(CMAKE_COMPILER_IS_CLANG)
83+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow")
84+
set(CMAKE_C_FLAGS_RELEASE "-O2")
85+
set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
86+
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
87+
set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover -O3")
88+
set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls ")
89+
set(CMAKE_C_FLAGS_MEMSAN "-Werror -fsanitize=memory -O3")
90+
set(CMAKE_C_FLAGS_MEMSANDBG "-Werror -fsanitize=memory -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2")
91+
set(CMAKE_C_FLAGS_CHECK "-Werror -Os")
92+
endif(CMAKE_COMPILER_IS_CLANG)
93+
94+
if(MSVC)
95+
# Strictest warnings, and treat as errors
96+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
97+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
98+
endif(MSVC)
99+
100+
if(CMAKE_BUILD_TYPE STREQUAL "Coverage")
101+
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
102+
set(CMAKE_SHARED_LINKER_FLAGS "--coverage")
103+
endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
104+
endif(CMAKE_BUILD_TYPE STREQUAL "Coverage")
105+
106+
if(LIB_INSTALL_DIR)
107+
else()
108+
set(LIB_INSTALL_DIR lib)
109+
endif()
110+
111+
include_directories(include/)
112+
113+
if(ENABLE_ZLIB_SUPPORT)
114+
find_package(ZLIB)
115+
116+
if(ZLIB_FOUND)
117+
include_directories(${ZLIB_INCLUDE_DIR})
118+
endif(ZLIB_FOUND)
119+
endif(ENABLE_ZLIB_SUPPORT)
120+
121+
add_subdirectory(library)
122+
add_subdirectory(include)
123+
124+
if(ENABLE_PROGRAMS)
125+
add_subdirectory(programs)
126+
endif()
127+
128+
ADD_CUSTOM_TARGET(apidoc
129+
COMMAND doxygen doxygen/mbedtls.doxyfile
130+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
131+
132+
if(ENABLE_TESTING)
133+
enable_testing()
134+
135+
add_subdirectory(tests)
136+
137+
# additional convenience targets for Unix only
138+
if(UNIX)
139+
140+
ADD_CUSTOM_TARGET(covtest
141+
COMMAND make test
142+
COMMAND programs/test/selftest
143+
COMMAND tests/compat.sh
144+
COMMAND tests/ssl-opt.sh
145+
)
146+
147+
ADD_CUSTOM_TARGET(lcov
148+
COMMAND rm -rf Coverage
149+
COMMAND lcov --capture --initial --directory library/CMakeFiles/mbedtls.dir -o files.info
150+
COMMAND lcov --capture --directory library/CMakeFiles/mbedtls.dir -o tests.info
151+
COMMAND lcov --add-tracefile files.info --add-tracefile tests.info -o all.info
152+
COMMAND lcov --remove all.info -o final.info '*.h'
153+
COMMAND gendesc tests/Descriptions.txt -o descriptions
154+
COMMAND genhtml --title "mbed TLS" --description-file descriptions --keep-descriptions --legend --no-branch-coverage -o Coverage final.info
155+
COMMAND rm -f files.info tests.info all.info final.info descriptions
156+
)
157+
158+
ADD_CUSTOM_TARGET(memcheck
159+
COMMAND sed -i.bak s+/usr/bin/valgrind+`which valgrind`+ DartConfiguration.tcl
160+
COMMAND ctest -O memcheck.log -D ExperimentalMemCheck
161+
COMMAND tail -n1 memcheck.log | grep 'Memory checking results:' > /dev/null
162+
COMMAND rm -f memcheck.log
163+
COMMAND mv DartConfiguration.tcl.bak DartConfiguration.tcl
164+
)
165+
endif(UNIX)
166+
endif()

0 commit comments

Comments
 (0)