From f8ac74881ea73f78073d3902fb014fea15a8df6b Mon Sep 17 00:00:00 2001 From: CPunch Date: Fri, 18 Feb 2022 15:26:29 -0600 Subject: [PATCH] updated README, minor CMake improvements --- README.md | 18 +++++++++--------- lib/CMakeLists.txt | 4 ++-- lib/include/lconfig.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 439a04e..ed022c0 100644 --- a/README.md +++ b/README.md @@ -22,28 +22,28 @@ I could add some padding to each packet to make it look pseudo-HTTP-like, howeve ## Configuration and compilation Make sure you have the following libraries and tools installed: -- CMake (>=3.11) +- CMake (>=3.10) - LibSodium (static library) - NCurses First, compile the target normally -``` -cmake -B build && cmake --build build +```sh +$ cmake -B build && cmake --build build ``` Now, generate your custom key pair using `genKey` -``` -./bin/genKey +```sh +$ ./bin/genKey ``` Next, rerun cmake, but passing your public and private keypairs -``` -rm -rf build &&\ -cmake -B build -DLAIKA_PUBKEY=997d026d1c65deb6c30468525132be4ea44116d6f194c142347b67ee73d18814 -DLAIKA_PRIVKEY=1dbd33962f1e170d1e745c6d3e19175049b5616822fac2fa3535d7477957a841 -DCMAKE_BUILD_TYPE=MinSizeRel &&\ -cmake --build build +```sh +$ rm -rf build &&\ + cmake -B build -DLAIKA_PUBKEY=997d026d1c65deb6c30468525132be4ea44116d6f194c142347b67ee73d18814 -DLAIKA_PRIVKEY=1dbd33962f1e170d1e745c6d3e19175049b5616822fac2fa3535d7477957a841 -DCMAKE_BUILD_TYPE=MinSizeRel &&\ + cmake --build build ``` Output binaries are put in the `./bin` folder \ No newline at end of file diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 97c53e7..f609f40 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -8,7 +8,7 @@ if(NOT LAIKA_PUBKEY) endif () if(NOT LAIKA_PRIVKEY) -set(LAIKA_PRIVKEY "90305aa77023d1c1e03265c3b6af046eb58d6ec8ba650b0dffed01379feab8cc") + set(LAIKA_PRIVKEY "90305aa77023d1c1e03265c3b6af046eb58d6ec8ba650b0dffed01379feab8cc") endif () # version details @@ -17,7 +17,7 @@ set(LAIKA_VERSION_MINOR 1) project(LaikaLib VERSION ${LAIKA_VERSION_MAJOR}.${LAIKA_VERSION_MINOR}) -message(STATUS "Building config file") +message(STATUS "Building config file...") configure_file(${LIB_INCLUDEDIR}/lconfig.h.in ${LIB_INCLUDEDIR}/lconfig.h) # Put CMake targets (ALL_BUILD/ZERO_CHECK) into a folder diff --git a/lib/include/lconfig.h b/lib/include/lconfig.h index d9cbbd5..46670f6 100644 --- a/lib/include/lconfig.h +++ b/lib/include/lconfig.h @@ -6,7 +6,7 @@ #define LAIKA_VERSION_MINOR 1 /* keys */ -#define LAIKA_PUBKEY "997d026d1c65deb6c30468525132be4ea44116d6f194c142347b67ee73d18814" -#define LAIKA_PRIVKEY "1dbd33962f1e170d1e745c6d3e19175049b5616822fac2fa3535d7477957a841" +#define LAIKA_PUBKEY "40d5534aca77d1f5ec2bbe79dd9d0f52a78148918f95814404cefe97c34c5c27" +#define LAIKA_PRIVKEY "90305aa77023d1c1e03265c3b6af046eb58d6ec8ba650b0dffed01379feab8cc" #endif