11 files changed, 92 insertions, 41 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cf14de..558a6f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,9 @@ include(CheckLibraryExists)
 include(CheckIncludeFiles)
 include(CheckTypeSize)
 
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
+include(cmake_export_symbol)
+
 project (LibreSSL C)
 
 enable_testing()
diff --git a/Makefile.am b/Makefile.am
index 48da18b..b4b9dfc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcrypto.pc libssl.pc libtls.pc openssl.pc
 
 EXTRA_DIST = README.md README.windows VERSION config scripts
-EXTRA_DIST += CMakeLists.txt cmake_uninstall.cmake.in
+EXTRA_DIST += CMakeLists.txt cmake_export_symbol.cmake cmake_uninstall.cmake.in
 
 .PHONY: install_sw
 install_sw: install
diff --git a/cmake_export_symbol.cmake b/cmake_export_symbol.cmake
new file mode 100644
index 0000000..2928c6b
--- /dev/null
+++ b/cmake_export_symbol.cmake
@@ -0,0 +1,44 @@
+macro(export_symbol TARGET FILENAME)
+
+        set(FLAG "")
+
+        if(WIN32)
+                string(REPLACE ".sym" ".def" DEF_FILENAME ${FILENAME})
+                file(WRITE ${DEF_FILENAME} "EXPORTS\n")
+                file(READ ${FILENAME} SYMBOLS)
+                file(APPEND ${DEF_FILENAME} "${SYMBOLS}")
+                target_sources(${TARGET} PRIVATE ${DEF_FILENAME})
+
+        elseif(APPLE)
+                set(FLAG "-exported_symbols_list ${FILENAME}")
+                set_target_properties(${TARGET} PROPERTIES LINK_FLAGS ${FLAG})
+
+        elseif(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
+                file(READ ${FILENAME} SYMBOLS)
+                string(REGEX REPLACE "\n$" "" SYMBOLS ${SYMBOLS})
+                string(REPLACE "\n" "\n+e " SYMBOLS ${SYMBOLS})
+                string(REPLACE ".sym" ".opt" OPT_FILENAME ${FILENAME})
+                file(WRITE ${OPT_FILENAME} "+e ${SYMBOLS}")
+                set(FLAG "-Wl,-c,${OPT_FILENAME}")
+                set_target_properties(${TARGET} PROPERTIES LINK_FLAGS ${FLAG})
+
+        elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+                file(READ ${FILENAME} SYMBOLS)
+                string(REPLACE "\n" ";\n" SYMBOLS ${SYMBOLS})
+                string(REPLACE ".sym" ".ver" VER_FILENAME ${FILENAME})
+                file(WRITE ${VER_FILENAME}
+                        "{\nglobal:\n${SYMBOLS}\nlocal:\n*;\n};\n")
+                set(FLAG "-Wl,-M${VER_FILENAME}")
+                set_target_properties(${TARGET} PROPERTIES LINK_FLAGS ${FLAG})
+
+        elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+                file(READ ${FILENAME} SYMBOLS)
+                string(REPLACE "\n" ";\n" SYMBOLS ${SYMBOLS})
+                string(REPLACE ".sym" ".ver" VER_FILENAME ${FILENAME})
+                file(WRITE ${VER_FILENAME}
+                        "{\nglobal:\n${SYMBOLS}\nlocal:\n*;\n};\n")
+                set(FLAG "-Wl,--version-script,\"${VER_FILENAME}\"")
+                set_target_properties(${TARGET} PROPERTIES LINK_FLAGS ${FLAG})
+        endif()
+
+endmacro()
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index dd0e569..45765d4 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -648,46 +648,70 @@ endif()
 
 if(CMAKE_HOST_WIN32)
         set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c)
+        set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log)
         set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c)
 endif()
 
 if(CMAKE_HOST_WIN32)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/posix_win.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} gettimeofday)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_perror)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_fopen)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_fgets)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_open)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_rename)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_connect)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_close)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_read)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_write)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_getsockopt)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_setsockopt)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} sleep)
 endif()
 
 if(NOT HAVE_ASPRINTF)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf)
 endif()
 
 if(NOT HAVE_INET_PTON)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/inet_pton.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} inet_pton)
 endif()
 
 if(NOT HAVE_REALLOCARRAY)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray)
 endif()
 
 if(NOT HAVE_STRCASECMP)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp)
 endif()
 
 if(NOT HAVE_STRLCAT)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat)
 endif()
 
 if(NOT HAVE_STRLCPY)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy)
 endif()
 
 if(NOT HAVE_STRNDUP)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup)
         if(NOT HAVE_STRNLEN)
                 set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c)
+                set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen)
         endif()
 endif()
 
 if(NOT HAVE_TIMEGM)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/timegm.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} timegm)
 endif()
 
 if(NOT HAVE_EXPLICIT_BZERO)
@@ -697,10 +721,13 @@ if(NOT HAVE_EXPLICIT_BZERO)
                 set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c)
                 set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0)
         endif()
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero)
 endif()
 
 if(NOT HAVE_ARC4RANDOM_BUF)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf)
 
         if(NOT HAVE_GETENTROPY)
                 if(CMAKE_HOST_WIN32)
@@ -720,19 +747,23 @@ if(NOT HAVE_ARC4RANDOM_BUF)
                 elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
                         set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_solaris.c)
                 endif()
+                set(EXTRA_EXPORT ${EXTRA_EXPORT} getentropy)
         endif()
 endif()
 
 if(NOT HAVE_ARC4RANDOM_UNIFORM)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform)
 endif()
 
 if(NOT HAVE_TIMINGSAFE_BCMP)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp)
 endif()
 
 if(NOT HAVE_TIMINGSAFE_MEMCMP)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c)
+        set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp)
 endif()
 
 if(NOT ENABLE_ASM)
@@ -749,13 +780,22 @@ else()
         add_definitions(-DOPENSSLDIR=\"${CMAKE_INSTALL_PREFIX}/etc/ssl\")
 endif()
 
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/crypto.sym SYMS)
+foreach(SYM IN LISTS CRYPTO_UNEXPORT)
+        string(REPLACE "${SYM}\n" "" SYMS ${SYMS})
+endforeach()
+file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/crypto_p.sym ${SYMS})
+list(SORT EXTRA_EXPORT)
+foreach(SYM IN LISTS EXTRA_EXPORT)
+        file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/crypto_p.sym "${SYM}\n")
+endforeach()
+
 add_library(crypto-objects OBJECT ${CRYPTO_SRC})
 if (BUILD_SHARED)
         add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>)
         add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>)
+        export_symbol(crypto-shared ${CMAKE_CURRENT_SOURCE_DIR}/crypto_p.sym)
         if (WIN32)
-                target_sources(crypto-shared PRIVATE
-                        ${CMAKE_CURRENT_SOURCE_DIR}/crypto.def)
                 target_link_libraries(crypto-shared Ws2_32.lib)
                 set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION})
         endif()
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 1b5198f..c56eda0 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -9,7 +9,6 @@ lib_LTLIBRARIES = libcrypto.la
 
 EXTRA_DIST = VERSION
 EXTRA_DIST += CMakeLists.txt
-EXTRA_DIST += crypto.def
 EXTRA_DIST += crypto.sym
 
 # needed for a CMake target
diff --git a/crypto/crypto_win.list b/crypto/crypto_win.list
deleted file mode 100644
index 37c02a5..0000000
--- a/crypto/crypto_win.list
+++ /dev/null
@@ -1,24 +0,0 @@
-arc4random_buf
-asprintf
-explicit_bzero
-inet_pton
-gettimeofday
-posix_close
-posix_connect
-posix_fgets
-posix_fopen
-posix_open
-posix_read
-posix_rename
-posix_write
-posix_perror
-posix_setsockopt
-reallocarray
-sleep
-strcasecmp
-strlcat
-strlcpy
-strndup
-timegm
-timingsafe_memcmp
-vasprintf
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index d511c8e..67115e4 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -52,9 +52,8 @@ add_library(ssl-objects OBJECT ${SSL_SRC})
 if (BUILD_SHARED)
         add_library(ssl STATIC $<TARGET_OBJECTS:ssl-objects>)
         add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>)
+        export_symbol(ssl-shared ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
         if (WIN32)
-                target_sources(ssl-shared PRIVATE
-                        ${CMAKE_CURRENT_SOURCE_DIR}/ssl.def)
                 target_link_libraries(ssl-shared crypto-shared Ws2_32.lib)
                 set(SSL_POSTFIX -${SSL_MAJOR_VERSION})
         endif()
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index b210b92..59a4d23 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -4,7 +4,6 @@ lib_LTLIBRARIES = libssl.la
 
 EXTRA_DIST = VERSION
 EXTRA_DIST += CMakeLists.txt
-EXTRA_DIST += ssl.def
 EXTRA_DIST += ssl.sym
 
 libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 1f78038..dcefad7 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -33,9 +33,8 @@ add_library(tls-objects OBJECT ${TLS_SRC})
 if (BUILD_SHARED)
         add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)
         add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)
+        export_symbol(tls-shared ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym)
         if (WIN32)
-                target_sources(tls-shared PRIVATE
-                        ${CMAKE_CURRENT_SOURCE_DIR}/tls.def)
                 target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib)
                 set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
         endif()
diff --git a/tls/Makefile.am b/tls/Makefile.am
index 3212dfd..b6fdd58 100644
--- a/tls/Makefile.am
+++ b/tls/Makefile.am
@@ -4,7 +4,6 @@ lib_LTLIBRARIES = libtls.la
 
 EXTRA_DIST = VERSION
 EXTRA_DIST += CMakeLists.txt
-EXTRA_DIST += tls.def
 EXTRA_DIST += tls.sym
 
 libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym
diff --git a/update.sh b/update.sh
index 335c5af..9a9dd5e 100755
--- a/update.sh
+++ b/update.sh
@@ -148,9 +148,6 @@ $CP crypto/compat/b_win.c crypto/bio
 $CP crypto/compat/ui_openssl_win.c crypto/ui
 # add the libcrypto symbol export list
 grep '^[[:alpha:]]' < $libcrypto_src/Symbols.list > crypto/crypto.sym
-echo EXPORTS > crypto/crypto.def
-grep -v BIO_s_log crypto/crypto.sym >> crypto/crypto.def
-cat crypto/crypto_win.list >> crypto/crypto.def
 
 # generate assembly crypto algorithms
 asm_src=$libcrypto_src
@@ -206,8 +203,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do
 done
 # add the libtls symbol export list
 grep '^[[:alpha:]]' < $libtls_src/Symbols.list > tls/tls.sym
-echo EXPORTS > tls/tls.def
-cat tls/tls.sym >> tls/tls.def
 
 $CP_LIBC $libc_src/string/strsep.c tls
 $CP_LIBC $libc_src/string/strsep.c libtls-standalone/compat
@@ -251,8 +246,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
 done
 # add the libssl symbol export list
 grep '^[[:alpha:]]' < $libssl_src/Symbols.list > ssl/ssl.sym
-echo EXPORTS > ssl/ssl.def
-cat ssl/ssl.sym >> ssl/ssl.def
 
 # copy libcrypto tests
 echo "copying tests"