Skip to content

Commit c0cd382

Browse files
authored
Merge pull request #250 from jwillemsen/jwi-depopenssl11
Remove openssl11, OpenSSL 1.0 itself was supported until 2015
2 parents 1b5d735 + cf09b1e commit c0cd382

4 files changed

Lines changed: 1 addition & 12 deletions

File tree

.github/workflows/windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ jobs:
7878
echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
7979
echo "xerces3=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
8080
echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
81-
echo "openssl11=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
8281
echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
8382
echo "zlib=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features
8483
shell: pwsh

config/global.features

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ erlang = 0
2020
java = 0
2121
mfc = 0
2222
libpng = 0
23-
openssl11 = 0
2423
python = 0
2524
qt = 0 // Qt3
2625
qt4 = 0

config/openssl.mpb

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ feature(openssl) {
1919
}
2020

2121
specific(prop:windows) {
22-
lit_libs += libeay32 ssleay32
22+
lit_libs += libssl libcrypto
2323
includes += $(SSL_ROOT)/inc32
2424
libpaths += $(SSL_ROOT)/out32dll $(SSL_ROOT)/out32
2525
} else {
@@ -48,10 +48,3 @@ feature(openssl) {
4848
includes += ${OPENSSL_INCLUDE_DIR}
4949
}
5050
}
51-
52-
feature(openssl11) {
53-
specific(prop:windows) {
54-
lit_libs -= libeay32 ssleay32
55-
lit_libs += libssl libcrypto
56-
}
57-
}

docs/html/MakeProjectCreator.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6407,8 +6407,6 @@ <h5 class="Head4">The Feature File</h5>
64076407

64086408
<p class="Code">libpng = 0</p>
64096409

6410-
<p class="Code">openssl11 = 0</p>
6411-
64126410
<p class="Code">python = 0</p>
64136411

64146412
<p class="Code">qt = 0</p>

0 commit comments

Comments
 (0)