diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-02-03 15:02:28 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-02-03 15:02:28 +0100 |
| commit | 620a751859ad758a77362c818e3ca2f279919bcb (patch) | |
| tree | 1fa54414527de0d04e339093845cef43de54500f | |
| parent | 269010b97abce5020a0c4a8ce4e65414b5bd1721 (diff) | |
| parent | be2df3244a3cfb5070fa8b5f93c90d9e81d6edf1 (diff) | |
| download | ATCD-620a751859ad758a77362c818e3ca2f279919bcb.tar.gz | |
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
| -rw-r--r-- | .github/workflows/macosx.yml | 9 | ||||
| -rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 11 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_common.GNU | 15 |
3 files changed, 21 insertions, 14 deletions
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index c6420a4b2a0..014bece5fdd 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -10,12 +10,11 @@ jobs: build: strategy: matrix: - cxxstd: ["11"] os: [macos-10.15, macos-11.0] include: - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} - name: "${{ matrix.os }}-C++${{ matrix.cxxstd }}" + name: "${{ matrix.os }}-C++" env: ACE_ROOT: ${{ github.workspace }}/ACE TAO_ROOT: ${{ github.workspace }}/TAO @@ -32,13 +31,9 @@ jobs: run: | '#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh - - name: Add c++${{ matrix.cxxstd }} platform_macros.GNU - run: | - 'c++${{ matrix.cxxstd }}=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - shell: pwsh - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU run: | - '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + '${{ matrix.platform_file }}' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU shell: pwsh - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index badc7239546..3fff8fa365e 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -349,6 +349,17 @@ ACE_SSL_Context::filter_versions (const char* versionlist) ::SSL_CTX_set_options (this->context_, SSL_OP_NO_TLSv1_2); } #endif /* SSL_OP_NO_TLSv1_2 */ + +#if defined (SSL_OP_NO_TLSv1_3) + pos = vlist.find("tlsv1.3"); + match = pos != ACE_CString::npos && + (pos == vlist.length() - 7 || + seplist.find(vlist[pos + 7]) != ACE_CString::npos); + if (!match) + { + ::SSL_CTX_set_options(this->context_, SSL_OP_NO_TLSv1_3); + } +#endif /* SSL_OP_NO_TLSv1_3 */ return 0; } diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 1ba6dcd5107..342883b2855 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -27,21 +27,22 @@ CC ?= gcc CXX ?= g++ DCCFLAGS += -g DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) +DLD = $(CXX) +LD = $(CXX) #LIBS += -lstdc++.6 -lSystem -lSystemStubs -OCFLAGS += -O2 -RANLIB = ranlib -SOEXT = dylib -SOFLAGS += -dynamiclib -SOBUILD = -o $(VSHDIR)$*.dylib $< +OCFLAGS += -O2 +RANLIB = ranlib +SOEXT = dylib +SOFLAGS += -dynamiclib +SOBUILD = -o $(VSHDIR)$*.dylib $< # Test for template instantiation, add to SOFLAGS if versioned_so set, # add -E to LDFLAGS if using GNU ld ifeq ($(findstring g++,$(CXX)),)# include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU else + c++11 ?= 1 include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU endif |