Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
4d14750c
Commit
4d14750c
authored
Jul 01, 2021
by
Denis Kasak
Browse files
Move fuzzers under fuzzing/ dir.
parent
e06ac205
Changes
10
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
4d14750c
...
@@ -41,7 +41,7 @@ SOURCES := $(wildcard src/*.cpp) $(wildcard src/*.c) \
...
@@ -41,7 +41,7 @@ SOURCES := $(wildcard src/*.cpp) $(wildcard src/*.c) \
lib/crypto-algorithms/aes.c
\
lib/crypto-algorithms/aes.c
\
lib/curve25519-donna/curve25519-donna.c
lib/curve25519-donna/curve25519-donna.c
FUZZER_SOURCES
:=
$(
wildcard
fuzzers/fuzz_
*
.cpp
)
$(
wildcard
fuzzers/fuzz_
*
.c
)
FUZZER_SOURCES
:=
$(
wildcard
fuzzing/
fuzzers/fuzz_
*
.cpp
)
$(
wildcard
fuzzing/
fuzzers/fuzz_
*
.c
)
TEST_SOURCES
:=
$(
wildcard
tests/test_
*
.cpp
)
$(
wildcard
tests/test_
*
.c
)
TEST_SOURCES
:=
$(
wildcard
tests/test_
*
.cpp
)
$(
wildcard
tests/test_
*
.c
)
OBJECTS
:=
$(
patsubst
%.c,%.o,
$(
patsubst
%.cpp,%.o,
$(SOURCES)
))
OBJECTS
:=
$(
patsubst
%.c,%.o,
$(
patsubst
%.cpp,%.o,
$(SOURCES)
))
...
@@ -50,7 +50,8 @@ DEBUG_OBJECTS := $(addprefix $(BUILD_DIR)/debug/,$(OBJECTS))
...
@@ -50,7 +50,8 @@ DEBUG_OBJECTS := $(addprefix $(BUILD_DIR)/debug/,$(OBJECTS))
FUZZER_OBJECTS
:=
$(
addprefix
$(BUILD_DIR)
/fuzzers/objects/,
$(OBJECTS)
)
FUZZER_OBJECTS
:=
$(
addprefix
$(BUILD_DIR)
/fuzzers/objects/,
$(OBJECTS)
)
FUZZER_ASAN_OBJECTS
:=
$(
addprefix
$(BUILD_DIR)
/fuzzers/objects/,
$(
addprefix
asan_,
$(OBJECTS)
))
FUZZER_ASAN_OBJECTS
:=
$(
addprefix
$(BUILD_DIR)
/fuzzers/objects/,
$(
addprefix
asan_,
$(OBJECTS)
))
FUZZER_MSAN_OBJECTS
:=
$(
addprefix
$(BUILD_DIR)
/fuzzers/objects/,
$(
addprefix
msan_,
$(OBJECTS)
))
FUZZER_MSAN_OBJECTS
:=
$(
addprefix
$(BUILD_DIR)
/fuzzers/objects/,
$(
addprefix
msan_,
$(OBJECTS)
))
FUZZER_BINARIES
:=
$(
addprefix
$(BUILD_DIR)
/,
$(
basename
$(FUZZER_SOURCES)
))
FUZZER_DEBUG_OBJECTS
:=
$(
addprefix
$(BUILD_DIR)
/fuzzers/objects/,
$(
addprefix
debug_,
$(OBJECTS)
))
FUZZER_BINARIES
:=
$(
addprefix
$(BUILD_DIR)
/fuzzers/,
$(
basename
$(
notdir
$(FUZZER_SOURCES)
)))
FUZZER_ASAN_BINARIES
:=
$(
addsuffix
_asan,
$(FUZZER_BINARIES)
)
FUZZER_ASAN_BINARIES
:=
$(
addsuffix
_asan,
$(FUZZER_BINARIES)
)
FUZZER_MSAN_BINARIES
:=
$(
addsuffix
_msan,
$(FUZZER_BINARIES)
)
FUZZER_MSAN_BINARIES
:=
$(
addsuffix
_msan,
$(FUZZER_BINARIES)
)
FUZZER_DEBUG_BINARIES
:=
$(
patsubst
$(BUILD_DIR)
/fuzzers/fuzz_%,
$(BUILD_DIR)
/fuzzers/debug_%,
$(FUZZER_BINARIES)
)
FUZZER_DEBUG_BINARIES
:=
$(
patsubst
$(BUILD_DIR)
/fuzzers/fuzz_%,
$(BUILD_DIR)
/fuzzers/debug_%,
$(FUZZER_BINARIES)
)
...
@@ -143,15 +144,22 @@ $(DEBUG_TARGET): LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS)
...
@@ -143,15 +144,22 @@ $(DEBUG_TARGET): LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS)
$(TEST_BINARIES)
:
CPPFLAGS += -Itests/include
$(TEST_BINARIES)
:
CPPFLAGS += -Itests/include
$(TEST_BINARIES)
:
LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS) -L$(BUILD_DIR)
$(TEST_BINARIES)
:
LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS) -L$(BUILD_DIR)
$(FUZZER_OBJECTS)
:
CFLAGS += $(FUZZER_OPTIMIZE_FLAGS)
$(FUZZER_OBJECTS)
:
CFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -D OLM_FUZZING=1
$(FUZZER_OBJECTS)
:
CXXFLAGS += $(FUZZER_OPTIMIZE_FLAGS)
$(FUZZER_OBJECTS)
:
CXXFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -D OLM_FUZZING=1
$(FUZZER_BINARIES)
:
CPPFLAGS += -Ifuzzers/include
$(FUZZER_DEBUG_OBJECTS)
:
CFLAGS += $(DEBUG_OPTIMIZE_FLAGS) $(CFLAGS_NATIVE) -D OLM_FUZZING=1
$(FUZZER_DEBUG_OBJECTS)
:
CXXFLAGS += $(DEBUG_OPTIMIZE_FLAGS) $(CXXFLAGS_NATIVE) -D OLM_FUZZING=1
$(FUZZER_ASAN_OBJECTS)
:
CFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -D OLM_FUZZING=1
$(FUZZER_ASAN_OBJECTS)
:
CXXFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -D OLM_FUZZING=1
$(FUZZER_MSAN_OBJECTS)
:
CFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -D OLM_FUZZING=1
$(FUZZER_MSAN_OBJECTS)
:
CXXFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -D OLM_FUZZING=1
$(FUZZER_BINARIES)
:
CPPFLAGS += -Ifuzzing/fuzzers/include
$(FUZZER_BINARIES)
:
LDFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -L$(BUILD_DIR) -lstdc++
$(FUZZER_BINARIES)
:
LDFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -L$(BUILD_DIR) -lstdc++
$(FUZZER_ASAN_BINARIES)
:
CPPFLAGS += -Ifuzzers/include
$(FUZZER_ASAN_BINARIES)
:
CPPFLAGS += -I
fuzzing/
fuzzers/include
$(FUZZER_ASAN_BINARIES)
:
LDFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -L$(BUILD_DIR) -lstdc++
$(FUZZER_ASAN_BINARIES)
:
LDFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -L$(BUILD_DIR) -lstdc++
$(FUZZER_MSAN_BINARIES)
:
CPPFLAGS += -Ifuzzers/include
$(FUZZER_MSAN_BINARIES)
:
CPPFLAGS += -I
fuzzing/
fuzzers/include
$(FUZZER_MSAN_BINARIES)
:
LDFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -L$(BUILD_DIR) -lstdc++
$(FUZZER_MSAN_BINARIES)
:
LDFLAGS += $(FUZZER_OPTIMIZE_FLAGS) -L$(BUILD_DIR) -lstdc++
$(FUZZER_DEBUG_BINARIES)
:
CPPFLAGS += -Ifuzzers/include
$(FUZZER_DEBUG_BINARIES)
:
CPPFLAGS += -I
fuzzing/
fuzzers/include
$(FUZZER_DEBUG_BINARIES)
:
LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS) -lstdc++
$(FUZZER_DEBUG_BINARIES)
:
LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS) -lstdc++
$(JS_OBJECTS)
:
CFLAGS += $(JS_OPTIMIZE_FLAGS)
$(JS_OBJECTS)
:
CFLAGS += $(JS_OPTIMIZE_FLAGS)
...
@@ -351,28 +359,37 @@ $(BUILD_DIR)/fuzzers/objects/msan_%.o: %.cpp
...
@@ -351,28 +359,37 @@ $(BUILD_DIR)/fuzzers/objects/msan_%.o: %.cpp
$(
call
mkdir
,
$(
dir
$@
))
$(
call
mkdir
,
$(
dir
$@
))
$(AFL_MSAN.cc)
$(OUTPUT_OPTION)
$<
$(AFL_MSAN.cc)
$(OUTPUT_OPTION)
$<
$(BUILD_DIR)/fuzzers/fuzz_%
:
fuzzers/fuzz_%.c $(FUZZER_OBJECTS)
$(BUILD_DIR)/fuzzers/objects/debug_%.o
:
%.c
$(
call
mkdir
,
$(
dir
$@
))
$(COMPILE.c)
$(OUTPUT_OPTION)
$<
$(BUILD_DIR)/fuzzers/objects/debug_%.o
:
%.cpp
$(
call
mkdir
,
$(
dir
$@
))
$(COMPILE.cc)
$(OUTPUT_OPTION)
$<
$(BUILD_DIR)/fuzzers/fuzz_%
:
fuzzing/fuzzers/fuzz_%.c $(FUZZER_OBJECTS)
$(AFL_LINK.c)
-o
$@
$<
$(FUZZER_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(AFL_LINK.c)
-o
$@
$<
$(FUZZER_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/fuzz_%
:
fuzzers/fuzz_%.cpp $(FUZZER_OBJECTS)
$(BUILD_DIR)/fuzzers/fuzz_%
:
fuzzing/
fuzzers/fuzz_%.cpp $(FUZZER_OBJECTS)
$(AFL_LINK.cc)
-o
$@
$<
$(FUZZER_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(AFL_LINK.cc)
-o
$@
$<
$(FUZZER_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/debug_%
:
fuzzers/fuzz_%.c $(DEBUG_OBJECTS)
$(BUILD_DIR)/fuzzers/debug_%
:
fuzzing/
fuzzers/fuzz_%.c $(
FUZZER_
DEBUG_OBJECTS)
$(LINK.c)
-o
$@
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(LINK.c)
-o
$@
$<
$(
FUZZER_
DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/debug_%
:
fuzzers/fuzz_%.cpp $(DEBUG_OBJECTS)
$(BUILD_DIR)/fuzzers/debug_%
:
fuzzing/
fuzzers/fuzz_%.cpp $(
FUZZER_
DEBUG_OBJECTS)
$(LINK.cc)
-o
$@
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(LINK.cc)
-o
$@
$<
$(
FUZZER_
DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/fuzz_%_asan
:
fuzzers/fuzz_%.c $(FUZZER_ASAN_OBJECTS)
$(BUILD_DIR)/fuzzers/fuzz_%_asan
:
fuzzing/
fuzzers/fuzz_%.c $(FUZZER_ASAN_OBJECTS)
$(AFL_LINK_ASAN.c)
-o
$@
$<
$(FUZZER_ASAN_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(AFL_LINK_ASAN.c)
-o
$@
$<
$(FUZZER_ASAN_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/fuzz_%_asan
:
fuzzers/fuzz_%.cpp $(FUZZER_ASAN_OBJECTS)
$(BUILD_DIR)/fuzzers/fuzz_%_asan
:
fuzzing/
fuzzers/fuzz_%.cpp $(FUZZER_ASAN_OBJECTS)
$(AFL_LINK_ASAN.cc)
-o
$@
$<
$(FUZZER_ASAN_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(AFL_LINK_ASAN.cc)
-o
$@
$<
$(FUZZER_ASAN_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/fuzz_%_msan
:
fuzzers/fuzz_%.c $(FUZZER_MSAN_OBJECTS)
$(BUILD_DIR)/fuzzers/fuzz_%_msan
:
fuzzing/
fuzzers/fuzz_%.c $(FUZZER_MSAN_OBJECTS)
$(AFL_LINK_MSAN.c)
-o
$@
$<
$(FUZZER_MSAN_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(AFL_LINK_MSAN.c)
-o
$@
$<
$(FUZZER_MSAN_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/fuzz_%_msan
:
fuzzers/fuzz_%.cpp $(FUZZER_MSAN_OBJECTS)
$(BUILD_DIR)/fuzzers/fuzz_%_msan
:
fuzzing/
fuzzers/fuzz_%.cpp $(FUZZER_MSAN_OBJECTS)
$(AFL_LINK_MSAN.cc)
-o
$@
$<
$(FUZZER_MSAN_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(AFL_LINK_MSAN.cc)
-o
$@
$<
$(FUZZER_MSAN_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
%.html
:
%.rst
%.html
:
%.rst
...
@@ -385,6 +402,7 @@ $(BUILD_DIR)/fuzzers/fuzz_%_msan: fuzzers/fuzz_%.cpp $(FUZZER_MSAN_OBJECTS)
...
@@ -385,6 +402,7 @@ $(BUILD_DIR)/fuzzers/fuzz_%_msan: fuzzers/fuzz_%.cpp $(FUZZER_MSAN_OBJECTS)
-include
$(JS_OBJECTS:.o=.d)
-include
$(JS_OBJECTS:.o=.d)
-include
$(TEST_BINARIES:=.d)
-include
$(TEST_BINARIES:=.d)
-include
$(FUZZER_OBJECTS:.o=.d)
-include
$(FUZZER_OBJECTS:.o=.d)
-include
$(FUZZER_DEBUG_OBJECTS:.o=.d)
-include
$(FUZZER_ASAN_OBJECTS:.o=.d)
-include
$(FUZZER_ASAN_OBJECTS:.o=.d)
-include
$(FUZZER_MSAN_OBJECTS:.o=.d)
-include
$(FUZZER_MSAN_OBJECTS:.o=.d)
-include
$(FUZZER_BINARIES:=.d)
-include
$(FUZZER_BINARIES:=.d)
...
...
fuzzers/README.rst
→
fuzzing/
fuzzers/README.rst
View file @
4d14750c
File moved
fuzzers/fuzz_decode_message.cpp
→
fuzzing/
fuzzers/fuzz_decode_message.cpp
View file @
4d14750c
File moved
fuzzers/fuzz_decrypt.cpp
→
fuzzing/
fuzzers/fuzz_decrypt.cpp
View file @
4d14750c
File moved
fuzzers/fuzz_group_decrypt.cpp
→
fuzzing/
fuzzers/fuzz_group_decrypt.cpp
View file @
4d14750c
File moved
fuzzers/fuzz_unpickle_account.cpp
→
fuzzing/
fuzzers/fuzz_unpickle_account.cpp
View file @
4d14750c
File moved
fuzzers/fuzz_unpickle_megolm_outbound.c
→
fuzzing/
fuzzers/fuzz_unpickle_megolm_outbound.c
View file @
4d14750c
File moved
fuzzers/fuzz_unpickle_session.cpp
→
fuzzing/
fuzzers/fuzz_unpickle_session.cpp
View file @
4d14750c
File moved
fuzzers/include/fuzzing.h
→
fuzzing/
fuzzers/include/fuzzing.h
View file @
4d14750c
File moved
fuzzers/include/fuzzing.hh
→
fuzzing/
fuzzers/include/fuzzing.hh
View file @
4d14750c
File moved
Denis Kasak
@denisk
mentioned in merge request
!39 (merged)
·
Jul 28, 2021
mentioned in merge request
!39 (merged)
mentioned in merge request !39
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment