Merge pull request #34 from wllm-rbnt/build-sys

Build system updates

.github/workflows/clang.yml

@@ -0,0 +1,24 @@
+name: Clang CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: |
+       sudo apt install clang autoconf libpcap-dev libssl-dev
+    - name: autogen
+      run: ./autogen.sh
+    - name: configure
+      run: ./configure CC=/usr/bin/clang
+    - name: make
+      run: make

.github/workflows/ccpp.yml → .github/workflows/gcc.yml

@@ -1,4 +1,4 @@
-name: C/C++ CI
+name: GCC CI
 
 on:
   push:
@@ -19,6 +19,6 @@ jobs:
     - name: autogen
       run: ./autogen.sh
     - name: configure
-      run: ./configure
+      run: ./configure CC=/usr/bin/gcc
     - name: make
       run: make

.gitignore

@@ -19,6 +19,8 @@ common/lib/Makefile.in
 compile
 config.h
 config.h.in
+config.guess
+config.sub
 configure
 depcomp
 install-sh

Makefile.am

@@ -5,25 +5,28 @@ ssldump_SOURCES = \
 	base/pcap-snoop.c\
 	base/network.c\
 	base/proto_mod.c\
-	base/common.c\
 	ssl/ssl_analyze.c\
 	null/null_analyze.c\
+	common/lib/r_data.c\
+	common/lib/r_assoc.c\
 	common/lib/r_errors.c\
+	common/lib/debug.c\
 	base/tcppack.c\
 	base/tcpconn.c\
 	ssl/ssldecode.c\
 	ssl/sslprint.c\
 	ssl/ssl.enums.c\
 	ssl/sslxprint.c\
-	ssl/ciphersuites.c
+	ssl/ciphersuites.c\
+	ssl/ssl_rec.c
 
 ssldump_CPPFLAGS = \
 	-I$(top_srcdir)\
 	-I$(top_srcdir)/common/include\
+	-I$(top_srcdir)/common/lib\
 	-I$(top_srcdir)/null\
 	-I$(top_srcdir)/ssl\
 	-I$(top_srcdir)/base\
-	-D_BSD_SOURCE=1\
 	-D_DEFAULT_SOURCE=1\
-	-DLINUX
-
+	-DLINUX\
+	-DOPENSSL

README.md

@@ -50,6 +50,25 @@ make
 (optional) make install
 ```
 
+Optional configuration features (aka ./configure options):
+```
+  --disable-optimization  disable compiler optimizations (change from -O2 to -O0)
+  --enable-debug	  enable debug info (add "-g -DDEBUG" to CFLAGS)
+  --enable-asan		  enable AddressSanitizer and other checks
+	add "-fsanitize=address,undefined,leak -Wformat -Werror=format-security
+		-Werror=array-bounds" to CFLAGS
+	use libasan with GCC and embedded ASAN with Clang
+```
+
+Configuration examples:
+```
+- Use GCC with libasan, debug info and custom CFLAGS:
+	./configure CC=/usr/bin/gcc --enable-asan --enable-debug CFLAGS="-Wall"
+
+- Use Clang with ASAN and no optimizations (-O0)
+	./configure CC=/usr/bin/clang --enable-asan --disable-optimization
+```
+
 ## Contributing
 
 The contributing policy is simple. If you have a patch to propose, make a pull-request