build: reworks cryptographic modules to be in a plugins path and not rely on cryptoface being in the same namespace

Author: harningt

CMakeLists.txt

@@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 project(cryptoface C CXX)
 #C++ enabled for the few projects that consume it
 
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Modules)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/Modules)
+
+set(CF_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}/Modules)
+
+set(CMAKE_MODULE_PATH ${CF_MODULE_PATH} ${CMAKE_MODULE_PATH})
 
 include(CMakeDependentOption)
 
@@ -38,35 +42,35 @@ ENDIF(NOT WIN32)
 ADD_SUBDIRECTORY(cryptoface)
 
 IF(BUILD_CF_BEECRYPT)
-	ADD_SUBDIRECTORY(cf_beecrypt)
+	ADD_SUBDIRECTORY(plugins/cf_beecrypt)
 ENDIF(BUILD_CF_BEECRYPT)
 
 IF(BUILD_CF_BOTAN)
-	ADD_SUBDIRECTORY(cf_botan)
+	ADD_SUBDIRECTORY(plugins/cf_botan)
 ENDIF(BUILD_CF_BOTAN)
 
 IF(BUILD_CF_CRYPTOPP)
-	ADD_SUBDIRECTORY(cf_cryptopp)
+	ADD_SUBDIRECTORY(plugins/cf_cryptopp)
 ENDIF(BUILD_CF_CRYPTOPP)
 
 IF(BUILD_CF_MHASH)
-	ADD_SUBDIRECTORY(cf_mhash)
+	ADD_SUBDIRECTORY(plugins/cf_mhash)
 ENDIF(BUILD_CF_MHASH)
 
 IF(BUILD_CF_NETTLE)
-	ADD_SUBDIRECTORY(cf_nettle)
+	ADD_SUBDIRECTORY(plugins/cf_nettle)
 ENDIF(BUILD_CF_NETTLE)
 
 IF(BUILD_CF_TOMCRYPT)
-	ADD_SUBDIRECTORY(cf_tomcrypt)
+	ADD_SUBDIRECTORY(plugins/cf_tomcrypt)
 ENDIF(BUILD_CF_TOMCRYPT)
 
 IF(BUILD_CF_GCRYPT)
-	ADD_SUBDIRECTORY(cf_gcrypt)
+	ADD_SUBDIRECTORY(plugins/cf_gcrypt)
 ENDIF(BUILD_CF_GCRYPT)
 
 IF(BUILD_CF_OPENSSL)
-	ADD_SUBDIRECTORY(cf_openssl)
+	ADD_SUBDIRECTORY(plugins/cf_openssl)
 ENDIF(BUILD_CF_OPENSSL)
 IF(BUILD_LUACF)
 	ADD_SUBDIRECTORY(luacf)

cryptoface/CMakeLists.txt

@@ -1,18 +1,26 @@
 cmake_minimum_required(VERSION 2.6)
 project(cryptoface_core C)
 
+set(CRYPTOFACE_VERSION 0.0.0)
+
+include(WriteBasicConfigVersionFile)
+
 SET(SOURCES
 	src/provider.c
 	src/digest.c
 	src/module_loader.c
 )
-SET(HEADERS
+SET(PUBLIC_HEADERS
 	include/cryptoface.h
 	include/provider.h
 	include/digest.h
 	include/cryptoface_impl.h
+	include/digest_impl.h
 	include/module_loader.h
 )
+SET(HEADERS
+    ${PUBLIC_HEADERS}
+)
 
 add_library(cryptoface SHARED ${SOURCES} ${HEADERS})
 
@@ -21,3 +29,14 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR APPLE)
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR APPLE)
 
 include_directories(include)
+
+file(COPY ${PUBLIC_HEADERS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+get_filename_component(CRYPTOFACE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} ABSOLUTE)
+configure_file(cryptoface-config.cmake.in ${CF_MODULE_PATH}/cryptoface-config.cmake @ONLY)
+export(TARGETS cryptoface APPEND FILE ${CF_MODULE_PATH}/cryptoface-config.cmake)
+WRITE_BASIC_CONFIG_VERSION_FILE(
+    ${CF_MODULE_PATH}/cryptoface-config-version.cmake
+    VERSION ${CRYPTOFACE_VERSION}
+    COMPATIBILITY SameMajorVersion)
+

cf_beecrypt/CMakeLists.txt plugins/cf_beecrypt/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(cf_beecrypt C)
 
+find_package(cryptoface REQUIRED CONFIG PATHS ${CMAKE_MODULE_PATH})
 find_package(BeeCrypt REQUIRED)
 
 SET(SOURCES
@@ -20,8 +21,12 @@ set_target_properties(cf_beecrypt
 	COMPILE_FLAGS "${BEECRYPT_C_FLAGS}"
 	LINK_FLAGS "${BEECRYPT_LINK_FLAGS}")
 
-target_link_libraries(cf_beecrypt cryptoface)
+target_link_libraries(cf_beecrypt ${CRYPTOFACE_LIBRARIES})
 
 target_link_libraries(cf_beecrypt ${BEECRYPT_LIBRARIES})
 
-include_directories(include ../cryptoface/include ${BEECRYPT_INCLUDE_DIR})
+include_directories(
+    include
+    ${CRYPTOFACE_INCLUDE_DIRS}
+    ${BEECRYPT_INCLUDE_DIR}
+)

cf_beecrypt/include/beecrypt_digest.h plugins/cf_beecrypt/include/beecrypt_digest.h

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(cf_botan CXX)
 
+find_package(cryptoface REQUIRED CONFIG PATHS ${CMAKE_MODULE_PATH})
 find_package(Botan REQUIRED)
 
 SET(SOURCES
@@ -19,8 +20,12 @@ set_target_properties(cf_botan
 	PREFIX ""
 	COMPILE_FLAGS "${BOTAN_CFLAGS}")
 
-target_link_libraries(cf_botan cryptoface)
+target_link_libraries(cf_botan ${CRYPTOFACE_LIBRARIES})
 
 target_link_libraries(cf_botan ${BOTAN_LIBRARIES})
 
-include_directories(include ../cryptoface/include ${BOTAN_INCLUDE_DIR})
+include_directories(
+    include
+    ${CRYPTOFACE_INCLUDE_DIRS}
+    ${BOTAN_INCLUDE_DIR}
+)

cf_beecrypt/include/beecrypt_provider.h plugins/cf_beecrypt/include/beecrypt_provider.h

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(cf_cryptopp CXX)
 
+find_package(cryptoface REQUIRED CONFIG PATHS ${CMAKE_MODULE_PATH})
 find_package(Crypto++ REQUIRED)
 
 SET(SOURCES
@@ -19,8 +20,12 @@ set_target_properties(cf_cryptopp
 	PROPERTIES
 	PREFIX "")
 
-target_link_libraries(cf_cryptopp cryptoface)
+target_link_libraries(cf_cryptopp ${CRYPTOFACE_LIBRARIES})
 
 target_link_libraries(cf_cryptopp ${CRYPTO++_LIBRARIES})
 
-include_directories(include ../cryptoface/include ${CRYPTO++_INCLUDE_DIR})
+include_directories(
+    include
+    ${CRYPTOFACE_INCLUDE_DIRS}
+    ${CRYPTO++_INCLUDE_DIR}
+)

cf_beecrypt/src/beecrypt_digest.c plugins/cf_beecrypt/src/beecrypt_digest.c

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(cf_gcrypt C)
 
+find_package(cryptoface REQUIRED CONFIG PATHS ${CMAKE_MODULE_PATH})
 find_package(gcrypt REQUIRED)
 
 SET(SOURCES
@@ -17,7 +18,12 @@ set_target_properties(cf_gcrypt
 	PROPERTIES
 	PREFIX "")
 
-target_link_libraries(cf_gcrypt cryptoface)
+target_link_libraries(cf_gcrypt ${CRYPTOFACE_LIBRARIES})
+
 target_link_libraries(cf_gcrypt ${GCRYPT_LIBRARIES})
 
-include_directories(include ../cryptoface/include ${GCRYPT_INCLUDE_DIR})
+include_directories(
+    include
+    ${CRYPTOFACE_INCLUDE_DIRS}
+    ${GCRYPT_INCLUDE_DIR}
+)

cf_beecrypt/src/beecrypt_provider.c plugins/cf_beecrypt/src/beecrypt_provider.c

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(cf_mhash C)
 
+find_package(cryptoface REQUIRED CONFIG PATHS ${CMAKE_MODULE_PATH})
 find_package(MHASH REQUIRED)
 
 SET(SOURCES
@@ -17,7 +18,12 @@ set_target_properties(cf_mhash
 	PROPERTIES
 	PREFIX "")
 
-target_link_libraries(cf_mhash cryptoface)
+target_link_libraries(cf_mhash ${CRYPTOFACE_LIBRARIES})
+
 target_link_libraries(cf_mhash ${MHASH_LIBRARIES})
 
-include_directories(include ../cryptoface/include ${MHASH_INCLUDE_DIR})
+include_directories(
+    include
+    ${CRYPTOFACE_INCLUDE_DIRS}
+    ${MHASH_INCLUDE_DIR}
+)

cf_botan/CMakeLists.txt plugins/cf_botan/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(cf_nettle C)
 
+find_package(cryptoface REQUIRED CONFIG PATHS ${CMAKE_MODULE_PATH})
 find_package(Nettle REQUIRED)
 
 SET(SOURCES
@@ -19,12 +20,12 @@ set_target_properties(cf_nettle
 	PROPERTIES
 	PREFIX "")
 
-target_link_libraries(cf_nettle cryptoface)
+target_link_libraries(cf_nettle ${CRYPTOFACE_LIBRARIES})
 
 target_link_libraries(cf_nettle ${NETTLE_LIBRARIES})
 
 include_directories(
-	include
-	../cryptoface/include
-	${NETTLE_INCLUDE_DIR}
+    include
+    ${CRYPTOFACE_INCLUDE_DIRS}
+    ${NETTLE_INCLUDE_DIR}
 )

cf_botan/include/botan_digest.h plugins/cf_botan/include/botan_digest.h

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(cf_openssl C)
 
+find_package(cryptoface REQUIRED CONFIG PATHS ${CMAKE_MODULE_PATH})
 find_package(OpenSSL REQUIRED)
 
 SET(SOURCES
@@ -17,8 +18,12 @@ set_target_properties(cf_openssl
 	PROPERTIES
 	PREFIX "")
 
-target_link_libraries(cf_openssl cryptoface)
+target_link_libraries(cf_openssl ${CRYPTOFACE_LIBRARIES})
 
 target_link_libraries(cf_openssl ${OPENSSL_LIBCRYPTO})
 
-include_directories(include ../cryptoface/include ${OPENSSL_INCLUDE_DIR})
+include_directories(
+    include
+    ${CRYPTOFACE_INCLUDE_DIRS}
+    ${OPENSSL_INCLUDE_DIR}
+)

cf_botan/include/botan_provider.h plugins/cf_botan/include/botan_provider.h

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(cf_tomcrypt C)
 
+find_package(cryptoface REQUIRED CONFIG PATHS ${CMAKE_MODULE_PATH})
 find_package(TomCrypt REQUIRED)
 
 SET(SOURCES
@@ -18,7 +19,12 @@ set_target_properties(cf_tomcrypt
 	PROPERTIES
 	PREFIX "")
 
-target_link_libraries(cf_tomcrypt cryptoface)
+target_link_libraries(cf_tomcrypt ${CRYPTOFACE_LIBRARIES})
+
 target_link_libraries(cf_tomcrypt ${TOMCRYPT_LIBRARIES})
 
-include_directories(include ../cryptoface/include ${TOMCRYPT_INCLUDE_DIR})
+include_directories(
+    include
+    ${CRYPTOFACE_INCLUDE_DIRS}
+    ${TOMCRYPT_INCLUDE_DIR}
+)