factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add strtonum to compat library and export it

Browse Source 
crypto library requires strtonum now, and add it to compat library.
remove it from applications compat/ directories.
This commit is contained in:
kinichiro
2021-12-26 15:42:47 +09:00
parent 1b95c5d584
commit adde656bb7
10 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/nc/CMakeLists.txt
View File

@@ -29,14 +29,6 @@ else()
set(NC_SRC ${NC_SRC} compat/readpassphrase.c)
endif()
check_function_exists(strtonum HAVE_STRTONUM)
if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND
CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
add_definitions(-DHAVE_STRTONUM)
else()
set(NC_SRC ${NC_SRC} compat/strtonum.c)
endif()
if(NOT "${OPENSSLDIR}" STREQUAL "")
add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
else()

4
apps/nc/Makefile.am
View File

@@ -43,8 +43,4 @@ if !HAVE_READPASSPHRASE
nc_SOURCES += compat/readpassphrase.c
endif
if !HAVE_STRTONUM
nc_SOURCES += compat/strtonum.c
endif
endif

8
apps/ocspcheck/CMakeLists.txt
View File

@@ -13,14 +13,6 @@ else()
set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
endif()
check_function_exists(strtonum HAVE_STRTONUM)
if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND
CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
add_definitions(-DHAVE_STRTONUM)
else()
set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c)
endif()
if(NOT "${OPENSSLDIR}" STREQUAL "")
add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
else()

4
apps/ocspcheck/Makefile.am
View File

@@ -22,7 +22,3 @@ noinst_HEADERS = http.h
if !HAVE_MEMMEM
ocspcheck_SOURCES += compat/memmem.c
endif
if !HAVE_STRTONUM
ocspcheck_SOURCES += compat/strtonum.c
endif

8
apps/openssl/CMakeLists.txt
View File

@@ -61,14 +61,6 @@ if(WIN32)
set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c)
endif()
check_function_exists(strtonum HAVE_STRTONUM)
if(HAVE_STRTONUM AND CMAKE_SYSTEM_NAME MATCHES "Darwin" AND
CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
add_definitions(-DHAVE_STRTONUM)
else()
set(OPENSSL_SRC ${OPENSSL_SRC} compat/strtonum.c)
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
if(NOT HAVE_CLOCK_GETTIME)

4
apps/openssl/Makefile.am
View File

@@ -84,10 +84,6 @@ openssl_SOURCES += compat/clock_gettime_osx.c
endif
endif
if !HAVE_STRTONUM
openssl_SOURCES += compat/strtonum.c
endif
noinst_HEADERS = apps.h
noinst_HEADERS += progs.h
noinst_HEADERS += s_apps.h