From c019af1a0542fc53d1d47ea3547141cc97ef69ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20=C5=A0imko?= Date: Thu, 2 Nov 2023 14:10:25 +0000 Subject: [PATCH] update libsodium gcc linking & connectivity check --- README.md | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1880e54..fe0a119 100644 --- a/README.md +++ b/README.md @@ -263,8 +263,13 @@ python config64.py test cd ../.. ``` -- https://download.libsodium.org/libsodium/releases/libsodium-1.0.19-stable-mingw.tar.gz -:white_square_button: doplniť postup linkovania knižnice s prekladačom gcc +- https://download.libsodium.org/libsodium/releases/libsodium-1.0.19-stable-mingw.tar.gz
+:white_check_mark: doplniť postup linkovania knižnice s prekladačom gcc + +- nájdeme miesto, kde sme uložili knižnicu WinLibs a prejdeme do zložky */mingw64/lib/gcc/x86_64-w64-mingw32/11.2.0/* + +- do tejto zložky skopírujeme súbor libsodium.a zo stiahnutého balíka knižnice libsodium */libsodium-1.0.19-stable-mingw.tar/libsodium-win64/lib/* +- následne skopírujeme celý obsah */libsodium-1.0.19-stable-mingw.tar/libsodium-win64/include/* do zložky */mingw64/lib/gcc/x86_64-w64-mingw32/11.2.0/include/* ``` @@ -284,7 +289,10 @@ cmake -DSAL=MIRACL_SODIUM -D CMAKE_CXX_COMPILER=D:/mingw64/bin/gcc.exe -G "Unix ``` cd CMakeFiles/client.dir +``` - do súboru *linkLibs.rsp* pridáme prepínače *-lws2_32* a *-lstdc++* + +``` cd ../.. make ``` @@ -304,14 +312,16 @@ make ## -| | Linux rust client| Win rust client | Linux C++ client| Win C++ client | OpenSSL client (Docker) | -| Linux Rust server | Y | Y | Y | N | | -|Win Rust server | Y* | Y | Y* | N | | -|OpenSSL server (Docker)| | | | | | -|OpenSSL server (OQS-provider)| | | | | | +| | Linux rust client| Win rust client | Linux C++ client| Win C++ client | OpenSSL client (Docker) | +|-------------------|--------------------|------------------|-------------------|-------------------|---------------------------| +| Linux Rust server | Y | Y | Y | N | | +|Win Rust server | Y* | Y | Y* | N | | +|OpenSSL server (Docker)| | | | | | +|OpenSSL server (OQS-provider)| | | | | | + ``` -**(Y*)** +Y* Hostname NOT found in certificate Handshake Failed Alert sent to Server - Bad Certificate