Merge pull request #2074 from jan-cerny/nss

Fix broken build with NSS crypto back end

Author: evgenyz

CMakeLists.txt

@@ -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)

cmake/FindNSS.cmake

@@ -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 ()

config.h.in

@@ -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