Skip to content

Address incompatibility with BoringSSL #12943

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

Open
maskit wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −0
Open

Address incompatibility with BoringSSL #12943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,19 @@ check_cxx_source_compiles(
}"
HAVE_CRYPTO_EX_DUP_TYPE1
)
check_cxx_source_compiles(
"#include <openssl/asn1.h>
namespace bssl {
DECLARE_ASN1_ITEM(GENERAL_NAME)
};
int main() {
if (&bssl::GENERAL_NAME_it == reinterpret_cast<void *>(0x01)) {
return 1;
}
return 0;
}"
HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE
)

set(CMAKE_EXTRA_INCLUDE_FILES netinet/in.h netinet/tcp.h)
check_type_size("struct tcp_info" STRUCT_TCP_INFO)
Expand Down
1 change: 1 addition & 0 deletions include/tscore/ink_config.h.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
#cmakedefine HAVE_NATIVE_DUAL_CERT_SUPPORT 1
#cmakedefine HAVE_CRYPTO_EX_UNUSED 1
#cmakedefine HAVE_CRYPTO_EX_DUP_TYPE1 1
#cmakedefine HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE 1

#cmakedefine HAVE_STRUCT_TCP_INFO 1
#cmakedefine HAVE_STRUCT_TCP_INFO_TCPI_TOTAL_RETRANS 1
Expand Down
10 changes: 10 additions & 0 deletions src/iocore/net/OCSPStapling.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@ extern ClassAllocator<FetchSM, false> FetchSMAllocator;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#ifndef GENERAL_NAME_it
#if HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE
namespace bssl {
#endif
DECLARE_ASN1_ITEM(GENERAL_NAME)
#if HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE
}
#endif
#endif
// RFC 6960
using TS_OCSP_CERTID = struct ocsp_cert_id {
Expand Down Expand Up @@ -97,7 +103,11 @@ using TS_OCSP_REQINFO = struct ocsp_req_info_st {
DECLARE_ASN1_FUNCTIONS(TS_OCSP_REQINFO)
ASN1_SEQUENCE(TS_OCSP_REQINFO) = {
ASN1_EXP_OPT(TS_OCSP_REQINFO, version, ASN1_INTEGER, 0),
#if HAVE_GENERAL_NAME_IN_BSSL_NAMESPACE
ASN1_EXP_OPT(TS_OCSP_REQINFO, requestorName, bssl::GENERAL_NAME, 1),
#else
ASN1_EXP_OPT(TS_OCSP_REQINFO, requestorName, GENERAL_NAME, 1),
#endif
ASN1_SEQUENCE_OF(TS_OCSP_REQINFO, requestList, TS_OCSP_ONEREQ),
ASN1_EXP_SEQUENCE_OF_OPT(TS_OCSP_REQINFO, requestExtensions, X509_EXTENSION, 2)
} ASN1_SEQUENCE_END(TS_OCSP_REQINFO)
Expand Down