Skip to content

Commit

Permalink
Get rid of code for OpenSSL that has old QUIC API (apache#7599)
Browse files Browse the repository at this point in the history
  • Loading branch information
maskit committed May 17, 2021
1 parent db75f18 commit 5cdc145
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 715 deletions.
13 changes: 2 additions & 11 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1260,20 +1260,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
AC_CHECK_FUNCS(SSL_set_quic_early_data_enabled)
LIBS=$_quic_saved_LIBS
],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
[[
#ifdef SSL_MODE_QUIC_HACK
#else
# error no hack for quic
#endif
]])
],
[AC_MSG_RESULT([yes]); enable_quic=yes; enable_quic_old_api=yes],
[AC_MSG_RESULT([no])])
[
AC_MSG_RESULT([no])
])

AM_CONDITIONAL([ENABLE_QUIC], [test "x$enable_quic" = "xyes"])
AM_CONDITIONAL([ENABLE_QUIC_OLD_API], [test "x$enable_quic_old_api" = "xyes"])
TS_ARG_ENABLE_VAR([use], [quic])
AC_SUBST(use_quic)

Expand Down
7 changes: 0 additions & 7 deletions iocore/net/quic/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,11 @@ QUICPPProtector_impl = QUICPacketPayloadProtector_boringssl.cc
QUICTLS_impl = QUICTLS_boringssl.cc
QUICKeyGenerator_impl = QUICKeyGenerator_boringssl.cc
else
if ENABLE_QUIC_OLD_API
QUICPHProtector_impl = QUICPacketHeaderProtector_legacy.cc
QUICPPProtector_impl = QUICPacketPayloadProtector_legacy.cc
QUICTLS_impl = QUICTLS_legacy.cc
QUICKeyGenerator_impl = QUICKeyGenerator_legacy.cc
else
QUICPHProtector_impl = QUICPacketHeaderProtector_openssl.cc
QUICPPProtector_impl = QUICPacketPayloadProtector_openssl.cc
QUICTLS_impl = QUICTLS_openssl.cc
QUICKeyGenerator_impl = QUICKeyGenerator_openssl.cc
endif
endif

QLog_impl = qlog/QLogEvent.cc qlog/QLogFrame.cc qlog/QLog.cc

Expand Down
63 changes: 0 additions & 63 deletions iocore/net/quic/QUICKeyGenerator_legacy.cc

This file was deleted.

53 changes: 0 additions & 53 deletions iocore/net/quic/QUICPacketHeaderProtector_legacy.cc

This file was deleted.

136 changes: 0 additions & 136 deletions iocore/net/quic/QUICPacketPayloadProtector_legacy.cc

This file was deleted.

0 comments on commit 5cdc145

Please sign in to comment.