Skip to content
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

Jump to bottom

Fix broken build with NSS crypto back end #2074

Merged
merged 8 commits into from
Mar 12, 2024
Merged

Fix broken build with NSS crypto back end #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1291ad
Fix broken build with NSS crypto back end
jan-cerny Jan 23, 2024
114395b
Add NSS implementation of sha2.h
jan-cerny Jan 23, 2024
1d53104
Avoid duplicate code
jan-cerny Jan 23, 2024
85681d7
Avoid duplicate code
jan-cerny Jan 25, 2024
1cd0d14
Use nss to build
jan-cerny Feb 7, 2024
7b539cb
Fix NSS name on Ubuntu
jan-cerny Feb 7, 2024
399813e
Revert back to use gcrypt as default crypto library
jan-cerny Mar 11, 2024
0c858c6
Revert back to use gcrypt as default crypto library in CI
jan-cerny Mar 11, 2024
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
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,13 @@ check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP)
check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP)

# WITH_CRYPTO
set(WITH_CRYPTO "gcrypt" CACHE STRING "gcrypt|nss3")
if(NOT (${WITH_CRYPTO} EQUAL "nss3"))
# gcrypt
find_package(GCrypt)
else()
# nss3
set(WITH_CRYPTO "gcrypt" CACHE STRING "gcrypt|nss")
if(${WITH_CRYPTO} STREQUAL "nss")
message("-- Using NSS")
find_package(NSS)
else()
message("-- Using GCrypt")
find_package(GCrypt)
endif()
if(GCRYPT_FOUND OR NSS_FOUND)
set(CRYPTO_FOUND TRUE)
Expand Down
2 changes: 0 additions & 2 deletions cmake/FindNSS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.

include(FindLibraryWithDebug)

if (NSS_LIBRARIES)
set(NSS_FIND_QUIETLY TRUE)
endif ()
Expand Down
4 changes: 2 additions & 2 deletions config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#cmakedefine HAVE_GCRYCTL_SET_ENFORCED_FIPS_FLAG
#endif

#cmakedefine NSS3_FOUND
#if defined(NSS3_FOUND)
#cmakedefine NSS_FOUND
#if defined(NSS_FOUND)
#define HAVE_NSS3
#endif

Expand Down
Loading
Loading