Merge branch 'master' of https://gitee.com/rtoax/ulpatch

Author: Rtoax

CMakeLists.txt

@@ -89,6 +89,7 @@ set(CONFIG_BUILD_BASH_COMPLETIONS ON CACHE BOOL "Build bash completions")
 set(CONFIG_BUILD_PIE_EXE OFF CACHE BOOL "Build all Executions as PIE")
 
 set(CONFIG_CAPSTONE ON CACHE BOOL "Build with capstone for disasm")
+set(CONFIG_OPENSSL ON CACHE BOOL "Build with openssl")
 set(CONFIG_LIBUNWIND ON CACHE BOOL "Build with libunwind for unwind")
 
 set(CMAKE_INSTALL_PREFIX /usr)
@@ -251,11 +252,15 @@ else()
 	message(STATUS "Build without capstone support")
 endif()
 
-if(OPENSSL_INCLUDE_DIRS)
-	message(STATUS "Found openssl headers")
-	set(UTILS_CFLAGS_MACROS "${UTILS_CFLAGS_MACROS}" OPENSSL_INCLUDE_DIRS)
-else()
-	message(FATAL_ERROR "Not found openssl headers")
+if(CONFIG_OPENSSL)
+	message(STATUS "Build with openssl support")
+	set(UTILS_CFLAGS_MACROS "${UTILS_CFLAGS_MACROS}" CONFIG_OPENSSL=1)
+	if(OPENSSL_INCLUDE_DIRS)
+		message(STATUS "Found openssl headers")
+		set(UTILS_CFLAGS_MACROS "${UTILS_CFLAGS_MACROS}" OPENSSL_INCLUDE_DIRS)
+	else()
+		message(FATAL_ERROR "Not found openssl headers")
+	endif()
 endif()
 
 if(KERNEL_HEADERS_INCLUDE_DIRS)

docs/en/CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to
 
 #### Breaking Changes
 #### Added
+- Add CMake macro `CONFIG_OPENSSL`
 - Add OpenSSL depends and add fmd5sum() function.
 - Add header file /usr/include/ulpatch/version.h.
 - rpmbuild.sh add --nocheck argument.

docs/en/INSTALL.md

@@ -151,12 +151,20 @@ CMake `CONFIG_CAPSTONE` determine compile with capstone or not, default `ON`. If
 $ cmake -DCONFIG_CAPSTONE=OFF ..
 ```
 
+#### CONFIG_OPENSSL
+
+CMake `CONFIG_OPENSSL` determine compile with openssl or not, default `ON`. If you want to turn it off, such as:
+
+```
+$ cmake -DCONFIG_OPENSSL=OFF ..
+```
+
 #### CONFIG_LIBUNWIND
 
 CMake `CONFIG_LIBUNWIND` determine compile with libunwind or not, default `ON`. If you want to turn it off, such as:
 
 ```
-$ cmake -DCONFIG_CAPSTONE=OFF ..
+$ cmake -DCONFIG_LIBUNWIND=OFF ..
 ```
 
 If `CONFIG_LIBUNWIND=ON(default)`, and your system donesn's have it, `cmake` will run fatal and tell you.

docs/zh/CHANGELOG.md

@@ -13,6 +13,7 @@
 
 #### 重大变更
 #### 添加
+- 添加CMake宏 `CONFIG_OPENSSL`。
 - 增加对 OpenSSL 的依赖，并且添加 fmd5sum() 相关函数。
 - 增加头文件 /usr/include/ulpatch/version.h。
 - rpmbuild.sh 添加 --nocheck 参数。

docs/zh/INSTALL.md

@@ -150,14 +150,23 @@ CMake `CONFIG_CAPSTONE`选项决定是否支持`capstone`，默认开启 `ON`。
 ```
 $ cmake -DCONFIG_CAPSTONE=OFF ..
 ```
-如果 `CONFIG_CAPSTONE=ON`(默认)，并且你的系统没有安装`libunwind`，`cmake`将报错。
+如果 `CONFIG_CAPSTONE=ON`(默认)，并且你的系统没有安装`openssl`，`cmake`将报错。
+
+#### CONFIG_OPENSSL
+
+CMake `CONFIG_OPENSSL`选项决定是否支持`openssl`，默认开启 `ON`。如果你想要关闭，可以：
+
+```
+$ cmake -DCONFIG_OPENSSL=OFF ..
+```
+如果 `CONFIG_OPENSSL=ON`(默认)，并且你的系统没有安装`openssl`，`cmake`将报错。
 
 #### CONFIG_LIBUNWIND
 
 CMake `CONFIG_LIBUNWIND`选项决定是否支持`libunwind`，默认开启 `ON`。如果你想要关闭，可以：
 
 ```
-$ cmake -DCONFIG_CAPSTONE=OFF ..
+$ cmake -DCONFIG_LIBUNWIND=OFF ..
 ```
 
 如果 `CONFIG_LIBUNWIND=ON`(默认)，并且你的系统没有安装`libunwind`，`cmake`将报错。

src/tests/main.c

@@ -979,7 +979,9 @@ void never_called_stub(void)
 	CALL_TEST_STUB(utils_init);
 	CALL_TEST_STUB(utils_list);
 	CALL_TEST_STUB(utils_log);
+#if defined(CONFIG_OPENSSL)
 	CALL_TEST_STUB(utils_md5);
+#endif
 	CALL_TEST_STUB(utils_rbtree);
 	CALL_TEST_STUB(utils_string);
 	CALL_TEST_STUB(utils_utils);

src/tests/utils/CMakeLists.txt

@@ -7,6 +7,12 @@ set(SEARCH_PATH "/usr/lib64:/usr/lib:/lib64:/lib")
 
 find_library(ELF elf HINTS ${SEARCH_PATH})
 
+set(md5)
+
+if(CONFIG_OPENSSL)
+	set(md5 md5.c)
+endif()
+
 add_library(ulpatch_test_utils STATIC
 	ansi.c
 	backtrace.c
@@ -16,7 +22,7 @@ add_library(ulpatch_test_utils STATIC
 	init.c
 	list.c
 	log.c
-	md5.c
+	${md5}
 	rbtree.c
 	string.c
 	utils.c

src/utils/CMakeLists.txt

@@ -28,6 +28,8 @@ endif()
 
 set(disasm)
 set(CAPSTONE)
+set(md5_evp)
+set(OPENSSL)
 
 if(CONFIG_CAPSTONE)
 	message(STATUS "UTILS Support capstone")
@@ -37,10 +39,14 @@ if(CONFIG_CAPSTONE)
 	set(disasm disasm.c)
 endif()
 
-find_library(LIBSSL ssl HINTS ${SEARCH_PATH})
-find_library(LIBCRYPTO crypto HINTS ${SEARCH_PATH})
-message(STATUS "LIBSSL ${LIBSSL}")
-message(STATUS "LIBCRYPTO ${LIBCRYPTO}")
+if(CONFIG_OPENSSL)
+	message(STATUS "UTILS Support openssl")
+	find_library(LIBSSL ssl HINTS ${SEARCH_PATH})
+	find_library(LIBCRYPTO crypto HINTS ${SEARCH_PATH})
+	message(STATUS "LIBSSL ${LIBSSL}")
+	message(STATUS "LIBCRYPTO ${LIBCRYPTO}")
+	set(md5_evp md5_evp.c)
+endif()
 
 add_library(ulpatch_utils STATIC
 	ansi.c
@@ -51,7 +57,7 @@ add_library(ulpatch_utils STATIC
 	init.c
 	list.c
 	log.c
-	md5_evp.c
+	${md5_evp}
 	rbtree.c
 	string.c
 	time.c

src/utils/util.h

@@ -11,8 +11,10 @@
 #include <string.h>
 #include <sys/types.h>
 #include <limits.h>
+#if defined(CONFIG_OPENSSL)
 #include <openssl/md5.h>
 #include <openssl/evp.h>
+#endif
 
 #ifndef BUFFER_SIZE
 #define BUFFER_SIZE 4096
@@ -274,7 +276,11 @@ int fprint_fd(FILE *fp, int fd);
 /* see /usr/include/openssl/evp.h */
 #define EVP_MAX_MD_SIZE 64
 #endif
+#if defined(CONFIG_OPENSSL)
 int fmd5sum(const char *filename, unsigned char *md5_result);
+#else
+#define fmd5sum(filename, md5_result) ({-ENOTSUPP;})
+#endif
 
 struct mmap_struct *fmmap_rdonly(const char *filepath);
 struct mmap_struct *fmmap_shmem_create(const char *filepath, size_t size);

src/utils/version.c

@@ -75,7 +75,8 @@ void ulpatch_info(const char *progname)
 	printf("  build time: %s\n", ULPATCH_COMPILE_TIME);
 	printf("  OS: %s\n", OS_PRETTY_NAME);
 	printf("  GNUC(GCC): %d.%d.%d\n", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-	printf("  GNU(GLibc): %d.%d\n", __GLIBC__, __GLIBC_MINOR__);
+	printf("  GNU(GLibc): (buildtime version %d.%d, runtime version %s)\n",
+		__GLIBC__, __GLIBC_MINOR__, gnu_get_libc_version());
 	printf("\n");
 	printf("Support\n");
 #if defined(HAVE_BINUTILS_BFD_H)
@@ -93,6 +94,12 @@ void ulpatch_info(const char *progname)
 		capstone_buildtime_version(), capstone_runtime_version());
 #else
 	printf("  capstone no\n");
+#endif
+#if defined(CONFIG_OPENSSL)
+	printf("  openssl yes (buildtime version %d.%d.%d)\n",
+		OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH);
+#else
+	printf("  openssl no\n");
 #endif
 	printf("\n");
 	printf("ULPatch\n");