Skip to content

chore: build and expose nettle for attachment encrypt/decrypt #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bilb wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

chore: build and expose nettle for attachment encrypt/decrypt #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ option(USE_LTO "Use Link-Time Optimization" ${use_lto_default})
# Provide this as an option for now because GMP and Desktop are sometimes unhappy with each other.
option(ENABLE_NETWORKING "Build with networking functionality" ON)
option(ENABLE_NETWORKING_SROUTER "Build with session-router networking support (requires ENABLE_NETWORKING)" ON)
option(ENABLE_NETTLE "Build with Nettle crypto library (independent of onionreq, e.g. for AES-CBC)" ${ENABLE_NETWORKING})

if(USE_LTO)
include(CheckIPOSupported)
Expand Down Expand Up @@ -120,9 +121,9 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)

add_subdirectory(external)

if(ENABLE_NETWORKING)
if(ENABLE_NETWORKING OR ENABLE_NETTLE)
if(NOT TARGET nettle::nettle)
if(BUILD_STATIC_DEPS)
if(BUILD_STATIC_DEPS AND TARGET nettle_external)
message(FATAL_ERROR "Internal error: nettle::nettle target (expected via libquic BUILD_STATIC_DEPS) not found")
else()
find_package(PkgConfig REQUIRED)
Expand Down