Skip to content

Remove dependency on OpenSSL's OCSP API #9624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maskit merged 5 commits into from
Apr 28, 2023
Merged

Remove dependency on OpenSSL's OCSP API #9624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04b1e7e
Remove dependency on OpenSSL's OCSP API
maskit Mar 23, 2023
4c95ba7
Fix CMake build
maskit Apr 19, 2023
909b152
Another fix for cmake
maskit Apr 19, 2023
c532f9c
Check return code from TS_OCSP_single_get0_status
maskit Apr 20, 2023
113b3b6
Add commments
maskit Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 0 additions & 88 deletions build/boringocsp.m4
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions build/crypto.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,27 +272,6 @@ AC_DEFUN([TS_CHECK_CRYPTO_TLS13], [
AC_SUBST(use_tls13)
])

dnl
dnl Since OpenSSL 1.1.0
dnl
AC_DEFUN([TS_CHECK_CRYPTO_OCSP], [
_ocsp_saved_LIBS=$LIBS

TS_ADDTO(LIBS, [$OPENSSL_LIBS])
AC_CHECK_HEADERS(openssl/ocsp.h, [ocsp_have_headers=1], [enable_tls_ocsp=no])

if test "$ocsp_have_headers" == "1"; then
AC_CHECK_FUNCS(OCSP_response_status, [enable_tls_ocsp=yes], [enable_tls_ocsp=no])

LIBS=$_ocsp_saved_LIBS
fi

AC_MSG_CHECKING(whether OCSP is supported)
AC_MSG_RESULT([$enable_tls_ocsp])
TS_ARG_ENABLE_VAR([use], [tls-ocsp])
AC_SUBST(use_tls_ocsp)
])

dnl
dnl Since OpenSSL 1.1.1
dnl
Expand Down
3 changes: 0 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,9 +1499,6 @@ AM_CONDITIONAL([BUILD_SWOC], [test "$has_libswoc" = "no"])
TS_CHECK_SWOC_HEADERS_EXPORT
AM_CONDITIONAL([EXPORT_SWOC_HEADERS], [test x"$enable_swoc_headers" = x"yes"])

# Check for optional boringocsp library
TS_CHECK_BORINGOCSP

# Check for optional hiredis library
TS_CHECK_HIREDIS
AM_CONDITIONAL([BUILD_SSL_SESSION_REUSE_PLUGIN], [test ! -z "${LIB_HIREDIS}" -a "x${has_hiredis}" = "x1" ])
Expand Down
3 changes: 0 additions & 3 deletions include/tscore/ink_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,13 @@
#define TS_USE_LINUX_NATIVE_AIO @use_linux_native_aio@
#define TS_USE_LINUX_IO_URING @use_linux_io_uring@
#define TS_USE_REMOTE_UNWINDING @use_remote_unwinding@
#define TS_USE_TLS_OCSP @use_tls_ocsp@
#define TS_HAS_TLS_EARLY_DATA @has_tls_early_data@
#define TS_HAS_TLS_SESSION_TICKET @has_tls_session_ticket@
#define TS_HAS_VERIFY_CERT_STORE @has_verify_cert_store@

#define TS_USE_HRW_GEOIP @use_hrw_geoip@
#define TS_USE_HRW_MAXMINDDB @use_hrw_maxminddb@

#define TS_HAS_BORINGOCSP @has_boringocsp@

#define TS_HAS_SO_PEERCRED @has_so_peercred@

/* OS API definitions */
Expand Down
1 change: 0 additions & 1 deletion iocore/cache/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ test_LDADD = \
@LIBPROFILER@ \
@OPENSSL_LIBS@ \
@YAMLCPP_LIBS@ \
@BORINGOCSP_LIBS@ \
-lm

check_PROGRAMS = \
Expand Down
2 changes: 2 additions & 0 deletions iocore/net/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ target_include_directories(inknet PRIVATE
${CMAKE_SOURCE_DIR}/proxy/hdrs
${CMAKE_SOURCE_DIR}/proxy/shared
${CMAKE_SOURCE_DIR}/proxy/http
${CMAKE_SOURCE_DIR}/proxy/http/remap
${CMAKE_SOURCE_DIR}/mgmt
${CMAKE_SOURCE_DIR}/mgmt/utils
${CMAKE_SOURCE_DIR}/src/traffic_server
${OPENSSL_INCLUDE_DIRS}
${YAML_INCLUDE_DIRS}
)
Expand Down
3 changes: 1 addition & 2 deletions iocore/net/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/src/traffic_server \
$(TS_INCLUDES) \
@OPENSSL_INCLUDES@ \
@BORINGOCSP_INCLUDES@ \
@YAMLCPP_INCLUDES@ \
@SWOC_INCLUDES@

Expand Down Expand Up @@ -85,7 +84,7 @@ test_UDPNet_LDADD = \
$(top_builddir)/src/tscore/libtscore.la $(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/proxy/ParentSelectionStrategy.o \
@HWLOC_LIBS@ @OPENSSL_LIBS@ @BORINGOCSP_LIBS@ @LIBPCRE@ @YAMLCPP_LIBS@ @SWOC_LIBS@
@HWLOC_LIBS@ @OPENSSL_LIBS@ @LIBPCRE@ @YAMLCPP_LIBS@ @SWOC_LIBS@

test_UDPNet_SOURCES = \
libinknet_stub.cc \
Expand Down
Loading