From 7af04ca7ea2e298c140ac2b8bad4a61b0bb52138 Mon Sep 17 00:00:00 2001 From: William Robinet Date: Thu, 10 Aug 2023 12:07:09 +0200 Subject: [PATCH] Set binary install target, update doc --- CMakeLists.txt | 3 +++ README.md | 13 +++++++------ ssldump.1 | 2 +- ssldump.md | 4 +++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d0c8d8..05cc39b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,3 +111,6 @@ target_link_libraries(ssldump ${JSONC_LIBRARIES} ) +set(CMAKE_INSTALL_PREFIX "/usr/local") +install(TARGETS ssldump DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + diff --git a/README.md b/README.md index 5a7d52d..e01df02 100644 --- a/README.md +++ b/README.md @@ -53,22 +53,23 @@ other too (but this is just a collateral damage). # Build instructions -On Debian & Ubuntu: +Install dependencies on Debian & Ubuntu (as root): ``` apt install build-essential cmake ninja-build libssl-dev libpcap-dev libnet1-dev libjson-c-dev -cmake -G Ninja -B build -ninja -C build -./build/ssldump -v ``` -On Fedora, CentOS, RHEL & Rocky: +On Fedora, CentOS, RHEL & Rocky (as root): ``` dnf install cmake ninja-build gcc openssl-devel libpcap-devel libnet-devel json-c-devel +``` + +Compile & install: +``` cmake -G Ninja -B build ninja -C build ./build/ssldump -v +(optional, as root) ninja -C build install ``` - # Notes The "save to pcap" (-w) option by @ryabkov, is heavily based on the work of diff --git a/ssldump.1 b/ssldump.1 index 027aca7..474c309 100644 --- a/ssldump.1 +++ b/ssldump.1 @@ -61,7 +61,7 @@ ssldump \- dump SSL traffic on a network .na .B ssldump [ -.B \-aAdeFHjnNPqtTvxXy +.B \-aAdeFHjnNPqtTvxXyz ] [ .B \-i .I interface diff --git a/ssldump.md b/ssldump.md index bab1e49..aa61f2d 100644 --- a/ssldump.md +++ b/ssldump.md @@ -3,7 +3,7 @@ 9th April 2023 - version 1.7 ``` -.na ssldump [ -aAdeFHjnNPqtTvxXy ] [ -i interface ] +.na ssldump [ -aAdeFHjnNPqtTvxXyz ] [ -i interface ] .ti +8 [ -k keyfile ] [ -l sslkeylogfile ] [ -p password ] [ -r dumpfile ] [ -w outputpcap ] .ti +8 [ -S [ crypto | d | ht | H | nroff ] ] [ expression ] @@ -138,6 +138,8 @@ _/dev/bpf*_. * **-y** Decorate the output for processing with nroff/troff. Not very useful for the average user. +* **-z** + Add timestamp in front of TCP packet description (-T) * _expression_ Selects what packets _ssldump_ will examine. Technically speaking, _ssldump_ supports the full expression syntax from PCAP and tcpdump.