export DLLs functions for MSVC with CMake

- Add 3 DEF files to export functions from Windows DLLs - Add gettimeofday to crypto/crypto.def (*1) - Remove gai_strerrorA from tls/tls.def (*1) - Fix CMakeLists.txt to use DEF files as PRIVATE - Change DLL import library file name since it duplicates with static library - Ignore compiler warning C4267, and Edit CMAKE_C_FLAGS not to overwrite it (*1) - Add USE_SHARED option to build openssl.exe with shared libraries (*1) (*1) recommended by @mcnameej
author: kinichiro <kinichiro.inoguchi@gmail.com> 2016-09-06 23:25:28 +0900
committer: Brent Cook <bcook@openbsd.org> 2016-10-30 21:39:36 -0500
commit: 62f2a73061eda53f5d60cfa7fab7dfb6bd7803ad (patch)
tree: 3398f894c4658264cdccc7979a82f49463b3a454 /tls
parent: e168f3b0bc437e58f833efcfd2891892cff4e98e (diff)
download: portable-62f2a73061eda53f5d60cfa7fab7dfb6bd7803ad.tar.gz
portable-62f2a73061eda53f5d60cfa7fab7dfb6bd7803ad.tar.bz2
portable-62f2a73061eda53f5d60cfa7fab7dfb6bd7803ad.zip
3 files changed, 91 insertions, 1 deletions
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 2377685..e522fe2 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -33,11 +33,14 @@ if (BUILD_SHARED)
        add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)
        add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)
        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()
        set_target_properties(tls-shared PROPERTIES
-                OUTPUT_NAME tls${TLS_POSTFIX} ARCHIVE_OUTPUT_NAME tls)
+                OUTPUT_NAME tls${TLS_POSTFIX}
+                ARCHIVE_OUTPUT_NAME tls${TLS_POSTFIX})
        set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION}
                SOVERSION ${TLS_MAJOR_VERSION})
        install(TARGETS tls tls-shared DESTINATION lib)
diff --git a/tls/Makefile.am b/tls/Makefile.am
index 8350e4d..51f31db 100644
--- a/tls/Makefile.am
+++ b/tls/Makefile.am
@@ -4,6 +4,7 @@ lib_LTLIBRARIES = libtls.la
 EXTRA_DIST = VERSION
 EXTRA_DIST += CMakeLists.txt
+EXTRA_DIST += tls.def
 libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined
 libtls_la_LIBADD = $(abs_top_builddir)/ssl/libssl.la
diff --git a/tls/tls.def b/tls/tls.def
new file mode 100644
index 0000000..f8f91e5
--- /dev/null
+++ b/tls/tls.def
@@ -0,0 +1,86 @@
+EXPORTS
+strsep
+tls_accept_cbs
+tls_accept_fds
+tls_accept_socket
+tls_check_name
+tls_client
+tls_close
+tls_config_add_keypair_file
+tls_config_add_keypair_mem
+tls_config_clear_keys
+tls_config_error
+tls_config_free
+tls_config_insecure_noverifycert
+tls_config_insecure_noverifyname
+tls_config_insecure_noverifytime
+tls_config_load_file
+tls_config_new
+tls_config_parse_protocols
+tls_config_prefer_ciphers_client
+tls_config_prefer_ciphers_server
+tls_config_set_alpn
+tls_config_set_ca_file
+tls_config_set_ca_mem
+tls_config_set_ca_path
+tls_config_set_cert_file
+tls_config_set_cert_mem
+tls_config_set_ciphers
+tls_config_set_dheparams
+tls_config_set_ecdhecurve
+tls_config_set_error
+tls_config_set_errorx
+tls_config_set_key_file
+tls_config_set_key_mem
+tls_config_set_keypair_file
+tls_config_set_keypair_mem
+tls_config_set_protocols
+tls_config_set_verify_depth
+tls_config_verify
+tls_config_verify_client
+tls_config_verify_client_optional
+tls_configure
+tls_configure_server
+tls_configure_ssl
+tls_configure_ssl_keypair
+tls_configure_ssl_verify
+tls_conn_alpn_selected
+tls_conn_cipher
+tls_conn_servername
+tls_conn_version
+tls_connect
+tls_connect_cbs
+tls_connect_fds
+tls_connect_servername
+tls_connect_socket
+tls_conninfo_free
+tls_conninfo_populate
+tls_error
+tls_error_set
+tls_error_setx
+tls_free
+tls_handshake
+tls_handshake_client
+tls_handshake_server
+tls_host_port
+tls_init
+tls_load_file
+tls_new
+tls_peer_cert_contains_name
+tls_peer_cert_hash
+tls_peer_cert_issuer
+tls_peer_cert_notafter
+tls_peer_cert_notbefore
+tls_peer_cert_provided
+tls_peer_cert_subject
+tls_read
+tls_reset
+tls_server
+tls_server_conn
+tls_set_cbs
+tls_set_error
+tls_set_errorx
+tls_sni_ctx_free
+tls_sni_ctx_new
+tls_ssl_error
+tls_write
author	kinichiro <kinichiro.inoguchi@gmail.com>	2016-09-06 23:25:28 +0900
committer	Brent Cook <bcook@openbsd.org>	2016-10-30 21:39:36 -0500
commit	62f2a73061eda53f5d60cfa7fab7dfb6bd7803ad (patch)
tree	3398f894c4658264cdccc7979a82f49463b3a454 /tls
parent	e168f3b0bc437e58f833efcfd2891892cff4e98e (diff)
download	portable-62f2a73061eda53f5d60cfa7fab7dfb6bd7803ad.tar.gz portable-62f2a73061eda53f5d60cfa7fab7dfb6bd7803ad.tar.bz2 portable-62f2a73061eda53f5d60cfa7fab7dfb6bd7803ad.zip

diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index 2377685..e522fe2 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt
@@ -33,11 +33,14 @@ if (BUILD_SHARED)
33	add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)	33	add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>)
34	add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)	34	add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)
35	if (WIN32)	35	if (WIN32)
		36	target_sources(tls-shared PRIVATE
		37	${CMAKE_CURRENT_SOURCE_DIR}/tls.def)
36	target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib)	38	target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib)
37	set(TLS_POSTFIX -${TLS_MAJOR_VERSION})	39	set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
38	endif()	40	endif()
39	set_target_properties(tls-shared PROPERTIES	41	set_target_properties(tls-shared PROPERTIES
40	OUTPUT_NAME tls${TLS_POSTFIX} ARCHIVE_OUTPUT_NAME tls)	42	OUTPUT_NAME tls${TLS_POSTFIX}
		43	ARCHIVE_OUTPUT_NAME tls${TLS_POSTFIX})
41	set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION}	44	set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION}
42	SOVERSION ${TLS_MAJOR_VERSION})	45	SOVERSION ${TLS_MAJOR_VERSION})
43	install(TARGETS tls tls-shared DESTINATION lib)	46	install(TARGETS tls tls-shared DESTINATION lib)


diff --git a/tls/Makefile.am b/tls/Makefile.am index 8350e4d..51f31db 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am
@@ -4,6 +4,7 @@ lib_LTLIBRARIES = libtls.la
4		4
5	EXTRA_DIST = VERSION	5	EXTRA_DIST = VERSION
6	EXTRA_DIST += CMakeLists.txt	6	EXTRA_DIST += CMakeLists.txt
		7	EXTRA_DIST += tls.def
7		8
8	libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined	9	libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined
9	libtls_la_LIBADD = $(abs_top_builddir)/ssl/libssl.la	10	libtls_la_LIBADD = $(abs_top_builddir)/ssl/libssl.la


diff --git a/tls/tls.def b/tls/tls.def new file mode 100644 index 0000000..f8f91e5 --- /dev/null +++ b/tls/tls.def
@@ -0,0 +1,86 @@
		1	EXPORTS
		2	strsep
		3	tls_accept_cbs
		4	tls_accept_fds
		5	tls_accept_socket
		6	tls_check_name
		7	tls_client
		8	tls_close
		9	tls_config_add_keypair_file
		10	tls_config_add_keypair_mem
		11	tls_config_clear_keys
		12	tls_config_error
		13	tls_config_free
		14	tls_config_insecure_noverifycert
		15	tls_config_insecure_noverifyname
		16	tls_config_insecure_noverifytime
		17	tls_config_load_file
		18	tls_config_new
		19	tls_config_parse_protocols
		20	tls_config_prefer_ciphers_client
		21	tls_config_prefer_ciphers_server
		22	tls_config_set_alpn
		23	tls_config_set_ca_file
		24	tls_config_set_ca_mem
		25	tls_config_set_ca_path
		26	tls_config_set_cert_file
		27	tls_config_set_cert_mem
		28	tls_config_set_ciphers
		29	tls_config_set_dheparams
		30	tls_config_set_ecdhecurve
		31	tls_config_set_error
		32	tls_config_set_errorx
		33	tls_config_set_key_file
		34	tls_config_set_key_mem
		35	tls_config_set_keypair_file
		36	tls_config_set_keypair_mem
		37	tls_config_set_protocols
		38	tls_config_set_verify_depth
		39	tls_config_verify
		40	tls_config_verify_client
		41	tls_config_verify_client_optional
		42	tls_configure
		43	tls_configure_server
		44	tls_configure_ssl
		45	tls_configure_ssl_keypair
		46	tls_configure_ssl_verify
		47	tls_conn_alpn_selected
		48	tls_conn_cipher
		49	tls_conn_servername
		50	tls_conn_version
		51	tls_connect
		52	tls_connect_cbs
		53	tls_connect_fds
		54	tls_connect_servername
		55	tls_connect_socket
		56	tls_conninfo_free
		57	tls_conninfo_populate
		58	tls_error
		59	tls_error_set
		60	tls_error_setx
		61	tls_free
		62	tls_handshake
		63	tls_handshake_client
		64	tls_handshake_server
		65	tls_host_port
		66	tls_init
		67	tls_load_file
		68	tls_new
		69	tls_peer_cert_contains_name
		70	tls_peer_cert_hash
		71	tls_peer_cert_issuer
		72	tls_peer_cert_notafter
		73	tls_peer_cert_notbefore
		74	tls_peer_cert_provided
		75	tls_peer_cert_subject
		76	tls_read
		77	tls_reset
		78	tls_server
		79	tls_server_conn
		80	tls_set_cbs
		81	tls_set_error
		82	tls_set_errorx
		83	tls_sni_ctx_free
		84	tls_sni_ctx_new
		85	tls_ssl_error
		86	tls_write