add libdict to repo

.github/workflows/build.yml

@@ -21,14 +21,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Download RtBrick libdict
-      shell: bash
-      run: wget https://github.com/rtbrick/libdict/releases/download/1.0.3/libdict-${{matrix.os}}.zip
-
-    - name: Install RtBrick libdict
-      shell: bash
-      run: unzip libdict-${{matrix.os}}.zip; sudo dpkg -i libdict_1.0.3_amd64.deb; sudo dpkg -i libdict-dev_1.0.3_amd64.deb
-
     - name: Install Dependencies
       shell: bash
       run: sudo apt install -y libcunit1-dev libncurses-dev libssl-dev libjansson-dev libcmocka-dev libpcap-dev

.github/workflows/codeql-analysis.yml

@@ -47,14 +47,6 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Download RtBrick libdict
-      shell: bash
-      run: wget https://github.com/rtbrick/libdict/releases/download/1.0.3/libdict-ubuntu-22.04.zip
-
-    - name: Install RtBrick libdict
-      shell: bash
-      run: unzip libdict-ubuntu-22.04.zip; sudo dpkg -i libdict_1.0.3_amd64.deb; sudo dpkg -i libdict-dev_1.0.3_amd64.deb
-
     - name: Install Dependencies
       shell: bash
       run: sudo apt install -y libcunit1-dev libncurses5-dev libssl-dev libjansson-dev libcmocka-dev libpcap-dev

.github/workflows/release.yml

@@ -38,14 +38,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Download RtBrick libdict
-      shell: bash
-      run: wget https://github.com/rtbrick/libdict/releases/download/1.0.3/libdict-${{matrix.os}}.zip
-
-    - name: Install RtBrick libdict
-      shell: bash
-      run: unzip libdict-${{matrix.os}}.zip; sudo dpkg -i libdict_1.0.3_amd64.deb; sudo dpkg -i libdict-dev_1.0.3_amd64.deb
-
     - name: Install Dependencies
       shell: bash
       run: sudo apt install -y libcunit1-dev libncurses-dev libssl-dev libjansson-dev libcmocka-dev libpcap-dev

CMakeLists.txt

@@ -38,9 +38,6 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE)
 endif()
 
-# libdict will be statically linked
-find_library(libdict NAMES libdict.a REQUIRED)
-
 if(BNGBLASTER_TESTS)
     include(CTest)
 endif()

code/CMakeLists.txt

@@ -1,7 +1,9 @@
 include_directories("common/src/")
+include_directories("libdict/include/")
 
 add_subdirectory(common)
 add_subdirectory(lwip)
+add_subdirectory(libdict)
 add_subdirectory(bngblaster)
 add_subdirectory(lspgen)
 

code/README.md

@@ -14,6 +14,12 @@ support.
 
 https://savannah.nongnu.org/projects/lwip/
 
+### libdict
+
+Local fork of libdict:
+
+https://github.com/fmela/libdict 
+
 ### bngblaster
 
 BNG Blaster directory.

code/bngblaster/CMakeLists.txt

@@ -8,7 +8,7 @@ foreach(_file ${BBL_SOURCES})
     set_property(SOURCE ${_file} APPEND_STRING PROPERTY COMPILE_FLAGS "-frandom-seed=0x${checksum}")
 endforeach()
 
-add_executable(bngblaster ${COMMON_SOURCES} ${BBL_SOURCES})
+add_executable(bngblaster ${LIBDICT_SOURCES} ${COMMON_SOURCES} ${BBL_SOURCES})
 
 set(PLATFORM_SPECIFIC_LIBS "-lpthread")
 string(APPEND CMAKE_C_FLAGS "-pthread")

code/bngblaster/fuzzing/CMakeLists.txt

@@ -8,8 +8,7 @@ set(PROPERTIES
 include_directories("../src")
 include_directories("../../common/src")
 
-find_library(libdict NAMES libdict.a REQUIRED)
-set(LINK_LIBS ${libdict} m)
+set(LINK_LIBS m)
 add_executable(fuzz-protocols-decode protocols_decode.c ../src/bbl_protocols.c)
 target_link_libraries(fuzz-protocols-decode ${LINK_LIBS})
 target_compile_options(fuzz-protocols-decode PRIVATE -Wall -Wextra -pedantic)

code/libdict/.clang-format

@@ -0,0 +1 @@
+BasedOnStyle: None

code/libdict/.gitignore

@@ -0,0 +1,9 @@
+words-*
+shuffle.pl
+bin/*
+build/
+*.log
+*.pdf
+*.aux
+.*.swp
+*.pdf

code/libdict/CMakeLists.txt

@@ -0,0 +1,13 @@
+# list of source files.
+FILE(GLOB LIBDICT_SOURCES src/*.c)
+
+# Deterministic randomness for symbol name creation
+list(SORT LIBDICT_SOURCES)
+foreach(_file ${LIBDICT_SOURCES})
+    file(SHA1 ${_file} checksum)
+    string(SUBSTRING ${checksum} 0 8 checksum)
+    set_property(SOURCE ${_file} APPEND_STRING PROPERTY COMPILE_FLAGS "-frandom-seed=0x${checksum}")
+endforeach()
+
+# Export variable one level up
+set(LIBDICT_SOURCES ${LIBDICT_SOURCES} PARENT_SCOPE)