Skip to content

Commit b4cb5dd

Browse files
rbsecrbsec
authored
Merge pull request #283 from tetlowgm/master
Update to OpenSSL 3.0
2 parents de14dbb + 1041203 commit b4cb5dd

14 files changed

+93
-90
lines changed

Diff for: ‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ifneq (,$(wildcard /usr/bin/nproc))
8787
NUM_PROCS = `/usr/bin/nproc --all`
8888
endif
8989
ifeq ($(OS), Darwin)
90-
NUM_PROCS = `/usr/sbin/system_profiler SPHardwareDataType | /usr/bin/grep "Total Number of Cores" | /usr/bin/awk -F: '{print $$2}'`
90+
NUM_PROCS = `sysctl -n hw.ncpu`
9191
endif
9292

9393
.PHONY: all sslscan clean install uninstall static opensslpull
@@ -129,9 +129,9 @@ uninstall:
129129
true
130130
opensslpull:
131131
if [ -d openssl -a -d openssl/.git ]; then \
132-
cd ./openssl && git checkout OpenSSL_1_1_1-stable && git pull | grep -q "Already up-to-date." && [ -e ../.openssl.is.fresh ] || touch ../.openssl.is.fresh ; \
132+
cd ./openssl && git checkout `git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort --version-sort | tail -n 1` && git pull | grep -q "Already up-to-date." && [ -e ../.openssl.is.fresh ] || touch ../.openssl.is.fresh ; \
133133
else \
134-
git clone --depth 1 -b OpenSSL_1_1_1-stable https://github.com/openssl/openssl ./openssl && cd ./openssl && touch ../.openssl.is.fresh ; \
134+
git clone --depth 1 -b `git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort --version-sort | tail -n 1` https://github.com/openssl/openssl ./openssl && cd ./openssl && touch ../.openssl.is.fresh ; \
135135
fi
136136

137137
# Need to build OpenSSL differently on OSX
@@ -151,7 +151,7 @@ endif
151151

152152
openssl/libcrypto.a: openssl/Makefile
153153
$(MAKE) -j $(NUM_PROCS) -C openssl depend
154-
$(MAKE) -j $(NUM_PROCS) -C openssl all
154+
$(MAKE) -j $(NUM_PROCS) -C openssl build_libs
155155
# $(MAKE) -j $(NUM_PROCS) -C openssl test # Disabled because this takes 45+ minutes for OpenSSL v1.1.1.
156156

157157
static: openssl/libcrypto.a

Diff for: ‎Makefile.mingw

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ zlibpull:
7171

7272
opensslpull:
7373
if [ -d openssl_mingw -a -d openssl_mingw/.git ]; then \
74-
cd ./openssl_mingw && git checkout OpenSSL_1_1_1-stable && git pull | grep -q "Already up-to-date." && [ -e ../.openssl_mingw.is.fresh ] || touch ../.openssl_mingw.is.fresh ; \
74+
cd ./openssl_mingw && git checkout `git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort --version-sort | tail -n 1` && git pull | grep -q "Already up-to-date." && [ -e ../.openssl_mingw.is.fresh ] || touch ../.openssl_mingw.is.fresh ; \
7575
else \
76-
git clone --depth 1 -b OpenSSL_1_1_1-stable https://github.com/openssl/openssl ./openssl_mingw && cd ./openssl_mingw && touch ../.openssl_mingw.is.fresh ; \
76+
git clone --depth 1 -b `git ls-remote https://github.com/openssl/openssl | grep -Eo '(openssl-3\.0\.[0-9]+)' | sort --version-sort | tail -n 1` https://github.com/openssl/openssl ./openssl_mingw && cd ./openssl_mingw && touch ../.openssl_mingw.is.fresh ; \
7777
fi
7878

7979
zlib_mingw/libz.a: zlibpull

Diff for: ‎docker_test/expected_output/test_1.txt

+18-17
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ Accepted TLSv1.2 256 bits DHE-RSA-AES256-SHA DHE 2048 bit
3939
Accepted TLSv1.2 256 bits DHE-RSA-CAMELLIA256-SHA DHE 2048 bits
4040
Accepted TLSv1.2 128 bits ECDHE-RSA-AES128-SHA Curve P-256 DHE 256
4141
Accepted TLSv1.2 128 bits DHE-RSA-AES128-SHA DHE 2048 bits
42-
Accepted TLSv1.2 128 bits DHE-RSA-SEED-SHA DHE 2048 bits
4342
Accepted TLSv1.2 128 bits DHE-RSA-CAMELLIA128-SHA DHE 2048 bits
44-
Accepted TLSv1.2 128 bits ECDHE-RSA-RC4-SHA  Curve P-256 DHE 256
4543
Accepted TLSv1.2 112 bits ECDHE-RSA-DES-CBC3-SHA  Curve P-256 DHE 256
4644
Accepted TLSv1.2 112 bits DHE-RSA-DES-CBC3-SHA  DHE 2048 bits
4745
Accepted TLSv1.2 256 bits AES256-GCM-SHA384
@@ -51,49 +49,52 @@ Accepted TLSv1.2 128 bits AES128-SHA256
5149
Accepted TLSv1.2 256 bits AES256-SHA
5250
Accepted TLSv1.2 256 bits CAMELLIA256-SHA
5351
Accepted TLSv1.2 128 bits AES128-SHA
54-
Accepted TLSv1.2 128 bits SEED-SHA
5552
Accepted TLSv1.2 128 bits CAMELLIA128-SHA
56-
Accepted TLSv1.2 128 bits RC4-SHA 
57-
Accepted TLSv1.2 128 bits RC4-MD5 
5853
Accepted TLSv1.2 112 bits DES-CBC3-SHA 
54+
Accepted TLSv1.2 128 bits TLS_RSA_WITH_RC4_128_MD5 
55+
Accepted TLSv1.2 128 bits TLS_RSA_WITH_RC4_128_SHA 
56+
Accepted TLSv1.2 128 bits TLS_RSA_WITH_IDEA_CBC_SHA
57+
Accepted TLSv1.2 128 bits TLS_RSA_WITH_SEED_CBC_SHA
58+
Accepted TLSv1.2 128 bits TLS_DHE_RSA_WITH_SEED_CBC_SHA
59+
Accepted TLSv1.2 128 bits TLS_ECDHE_RSA_WITH_RC4_128_SHA
5960
Preferred TLSv1.1 256 bits ECDHE-RSA-AES256-SHA Curve P-256 DHE 256
6061
Accepted TLSv1.1 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
6162
Accepted TLSv1.1 256 bits DHE-RSA-CAMELLIA256-SHA DHE 2048 bits
6263
Accepted TLSv1.1 128 bits ECDHE-RSA-AES128-SHA Curve P-256 DHE 256
6364
Accepted TLSv1.1 128 bits DHE-RSA-AES128-SHA DHE 2048 bits
64-
Accepted TLSv1.1 128 bits DHE-RSA-SEED-SHA DHE 2048 bits
6565
Accepted TLSv1.1 128 bits DHE-RSA-CAMELLIA128-SHA DHE 2048 bits
66-
Accepted TLSv1.1 128 bits ECDHE-RSA-RC4-SHA  Curve P-256 DHE 256
6766
Accepted TLSv1.1 112 bits ECDHE-RSA-DES-CBC3-SHA  Curve P-256 DHE 256
6867
Accepted TLSv1.1 112 bits DHE-RSA-DES-CBC3-SHA  DHE 2048 bits
6968
Accepted TLSv1.1 256 bits AES256-SHA
7069
Accepted TLSv1.1 256 bits CAMELLIA256-SHA
7170
Accepted TLSv1.1 128 bits AES128-SHA
72-
Accepted TLSv1.1 128 bits SEED-SHA
7371
Accepted TLSv1.1 128 bits CAMELLIA128-SHA
74-
Accepted TLSv1.1 128 bits IDEA-CBC-SHA
75-
Accepted TLSv1.1 128 bits RC4-SHA 
76-
Accepted TLSv1.1 128 bits RC4-MD5 
7772
Accepted TLSv1.1 112 bits DES-CBC3-SHA 
73+
Accepted TLSv1.1 128 bits TLS_RSA_WITH_RC4_128_MD5 
74+
Accepted TLSv1.1 128 bits TLS_RSA_WITH_RC4_128_SHA 
75+
Accepted TLSv1.1 128 bits TLS_RSA_WITH_IDEA_CBC_SHA
76+
Accepted TLSv1.1 128 bits TLS_RSA_WITH_SEED_CBC_SHA
77+
Accepted TLSv1.1 128 bits TLS_DHE_RSA_WITH_SEED_CBC_SHA
78+
Accepted TLSv1.1 128 bits TLS_ECDHE_RSA_WITH_RC4_128_SHA
7879
Preferred TLSv1.0 256 bits ECDHE-RSA-AES256-SHA Curve P-256 DHE 256
7980
Accepted TLSv1.0 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
8081
Accepted TLSv1.0 256 bits DHE-RSA-CAMELLIA256-SHA DHE 2048 bits
8182
Accepted TLSv1.0 128 bits ECDHE-RSA-AES128-SHA Curve P-256 DHE 256
8283
Accepted TLSv1.0 128 bits DHE-RSA-AES128-SHA DHE 2048 bits
83-
Accepted TLSv1.0 128 bits DHE-RSA-SEED-SHA DHE 2048 bits
8484
Accepted TLSv1.0 128 bits DHE-RSA-CAMELLIA128-SHA DHE 2048 bits
85-
Accepted TLSv1.0 128 bits ECDHE-RSA-RC4-SHA  Curve P-256 DHE 256
8685
Accepted TLSv1.0 112 bits ECDHE-RSA-DES-CBC3-SHA  Curve P-256 DHE 256
8786
Accepted TLSv1.0 112 bits DHE-RSA-DES-CBC3-SHA  DHE 2048 bits
8887
Accepted TLSv1.0 256 bits AES256-SHA
8988
Accepted TLSv1.0 256 bits CAMELLIA256-SHA
9089
Accepted TLSv1.0 128 bits AES128-SHA
91-
Accepted TLSv1.0 128 bits SEED-SHA
9290
Accepted TLSv1.0 128 bits CAMELLIA128-SHA
93-
Accepted TLSv1.0 128 bits IDEA-CBC-SHA
94-
Accepted TLSv1.0 128 bits RC4-SHA 
95-
Accepted TLSv1.0 128 bits RC4-MD5 
9691
Accepted TLSv1.0 112 bits DES-CBC3-SHA 
92+
Accepted TLSv1.0 128 bits TLS_RSA_WITH_RC4_128_MD5 
93+
Accepted TLSv1.0 128 bits TLS_RSA_WITH_RC4_128_SHA 
94+
Accepted TLSv1.0 128 bits TLS_RSA_WITH_IDEA_CBC_SHA
95+
Accepted TLSv1.0 128 bits TLS_RSA_WITH_SEED_CBC_SHA
96+
Accepted TLSv1.0 128 bits TLS_DHE_RSA_WITH_SEED_CBC_SHA
97+
Accepted TLSv1.0 128 bits TLS_ECDHE_RSA_WITH_RC4_128_SHA
9798

9899
Server Key Exchange Group(s):
99100
TLSv1.2 128 bits secp256r1 (NIST P-256)

Diff for: ‎docker_test/expected_output/test_12.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ Accepted TLSv1.0 256 bits DHE-RSA-AES256-SHA DHE
2929
Accepted TLSv1.0 256 bits DHE-RSA-CAMELLIA256-SHA DHE 512 bits
3030
Accepted TLSv1.0 128 bits ECDHE-RSA-AES128-SHA Curve P-256 DHE 256
3131
Accepted TLSv1.0 128 bits DHE-RSA-AES128-SHA DHE 512 bits
32-
Accepted TLSv1.0 128 bits DHE-RSA-SEED-SHA DHE 512 bits
3332
Accepted TLSv1.0 128 bits DHE-RSA-CAMELLIA128-SHA DHE 512 bits
34-
Accepted TLSv1.0 128 bits ECDHE-RSA-RC4-SHA  Curve P-256 DHE 256
3533
Accepted TLSv1.0 112 bits ECDHE-RSA-DES-CBC3-SHA  Curve P-256 DHE 256
3634
Accepted TLSv1.0 112 bits DHE-RSA-DES-CBC3-SHA  DHE 512 bits
3735
Accepted TLSv1.0 256 bits AES256-SHA
3836
Accepted TLSv1.0 256 bits CAMELLIA256-SHA
3937
Accepted TLSv1.0 128 bits AES128-SHA
40-
Accepted TLSv1.0 128 bits SEED-SHA
4138
Accepted TLSv1.0 128 bits CAMELLIA128-SHA
42-
Accepted TLSv1.0 128 bits IDEA-CBC-SHA
43-
Accepted TLSv1.0 128 bits RC4-SHA 
44-
Accepted TLSv1.0 128 bits RC4-MD5 
4539
Accepted TLSv1.0 112 bits DES-CBC3-SHA 
40+
Accepted TLSv1.0 128 bits TLS_RSA_WITH_RC4_128_MD5 
41+
Accepted TLSv1.0 128 bits TLS_RSA_WITH_RC4_128_SHA 
42+
Accepted TLSv1.0 128 bits TLS_RSA_WITH_IDEA_CBC_SHA
4643
Accepted TLSv1.0 56 bits TLS_RSA_WITH_DES_CBC_SHA 
4744
Accepted TLSv1.0 56 bits TLS_DHE_RSA_WITH_DES_CBC_SHA 
45+
Accepted TLSv1.0 128 bits TLS_RSA_WITH_SEED_CBC_SHA
46+
Accepted TLSv1.0 128 bits TLS_DHE_RSA_WITH_SEED_CBC_SHA
47+
Accepted TLSv1.0 128 bits TLS_ECDHE_RSA_WITH_RC4_128_SHA
4848

4949
Server Key Exchange Group(s):
5050
TLSv1.0 128 bits secp256r1 (NIST P-256)

Diff for: ‎docker_test/expected_output/test_13.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ TLSv1.1 not vulnerable to heartbleed
2727
TLSv1.0 not vulnerable to heartbleed
2828

2929
Supported Server Cipher(s):
30-
Preferred TLSv1.3 128 bits TLS_AES_128_GCM_SHA256 Curve 25519 DHE 253
31-
Accepted TLSv1.3 256 bits TLS_AES_256_GCM_SHA384 Curve 25519 DHE 253
32-
Accepted TLSv1.3 256 bits TLS_CHACHA20_POLY1305_SHA256 Curve 25519 DHE 253
30+
Preferred TLSv1.3 128 bits TLS_AES_128_GCM_SHA256  Curve 25519 DHE 253
31+
Accepted TLSv1.3 256 bits TLS_AES_256_GCM_SHA384  Curve 25519 DHE 253
32+
Accepted TLSv1.3 256 bits TLS_CHACHA20_POLY1305_SHA256  Curve 25519 DHE 253
3333
Accepted TLSv1.3 128 bits TLS_AES_128_CCM_SHA256 Curve 25519 DHE 253
3434
Preferred TLSv1.2 256 bits ECDHE-RSA-AES256-GCM-SHA384  Curve 25519 DHE 253
3535
Accepted TLSv1.2 256 bits DHE-RSA-AES256-GCM-SHA384  DHE 2048 bits

Diff for: ‎docker_test/expected_output/test_14.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ TLSv1.3 not vulnerable to heartbleed
2525
TLSv1.2 not vulnerable to heartbleed
2626

2727
Supported Server Cipher(s):
28-
Preferred TLSv1.3 128 bits TLS_AES_128_GCM_SHA256 Curve P-521 DHE 521
29-
Accepted TLSv1.3 256 bits TLS_AES_256_GCM_SHA384 Curve P-521 DHE 521
30-
Accepted TLSv1.3 256 bits TLS_CHACHA20_POLY1305_SHA256 Curve P-521 DHE 521
28+
Preferred TLSv1.3 128 bits TLS_AES_128_GCM_SHA256  Curve P-521 DHE 521
29+
Accepted TLSv1.3 256 bits TLS_AES_256_GCM_SHA384  Curve P-521 DHE 521
30+
Accepted TLSv1.3 256 bits TLS_CHACHA20_POLY1305_SHA256  Curve P-521 DHE 521
3131
Accepted TLSv1.3 128 bits TLS_AES_128_CCM_SHA256 Curve P-521 DHE 521
3232
Preferred TLSv1.2 256 bits ECDHE-RSA-AES256-GCM-SHA384  Curve P-521 DHE 521
3333
Accepted TLSv1.2 256 bits DHE-RSA-AES256-GCM-SHA384  DHE 8192 bits

Diff for: ‎docker_test/expected_output/test_15.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ TLSv1.1 not vulnerable to heartbleed
2727
TLSv1.0 not vulnerable to heartbleed
2828

2929
Supported Server Cipher(s):
30-
Preferred TLSv1.3 128 bits TLS_AES_128_GCM_SHA256 Curve 25519 DHE 253
31-
Accepted TLSv1.3 256 bits TLS_AES_256_GCM_SHA384 Curve 25519 DHE 253
32-
Accepted TLSv1.3 256 bits TLS_CHACHA20_POLY1305_SHA256 Curve 25519 DHE 253
30+
Preferred TLSv1.3 128 bits TLS_AES_128_GCM_SHA256  Curve 25519 DHE 253
31+
Accepted TLSv1.3 256 bits TLS_AES_256_GCM_SHA384  Curve 25519 DHE 253
32+
Accepted TLSv1.3 256 bits TLS_CHACHA20_POLY1305_SHA256  Curve 25519 DHE 253
3333
Accepted TLSv1.3 128 bits TLS_AES_128_CCM_SHA256 Curve 25519 DHE 253
3434
Preferred TLSv1.2 256 bits ECDHE-ECDSA-AES256-GCM-SHA384 Curve 25519 DHE 253
3535
Accepted TLSv1.2 256 bits ECDHE-ECDSA-CHACHA20-POLY1305 Curve 25519 DHE 253

Diff for: ‎docker_test/expected_output/test_16.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Accepted TLSv1.2 128 bits DHE-RSA-AES128-SHA256 DHE 2048 bit
3131
Accepted TLSv1.2 256 bits DHE-RSA-AES256-SHA DHE 2048 bits
3232
Accepted TLSv1.2 256 bits DHE-RSA-CAMELLIA256-SHA DHE 2048 bits
3333
Accepted TLSv1.2 128 bits DHE-RSA-AES128-SHA DHE 2048 bits
34-
Accepted TLSv1.2 128 bits DHE-RSA-SEED-SHA DHE 2048 bits
3534
Accepted TLSv1.2 128 bits DHE-RSA-CAMELLIA128-SHA DHE 2048 bits
3635
Accepted TLSv1.2 112 bits DHE-RSA-DES-CBC3-SHA  DHE 2048 bits
3736
Accepted TLSv1.2 256 bits AES256-GCM-SHA384
@@ -41,11 +40,13 @@ Accepted TLSv1.2 128 bits AES128-SHA256
4140
Accepted TLSv1.2 256 bits AES256-SHA
4241
Accepted TLSv1.2 256 bits CAMELLIA256-SHA
4342
Accepted TLSv1.2 128 bits AES128-SHA
44-
Accepted TLSv1.2 128 bits SEED-SHA
4543
Accepted TLSv1.2 128 bits CAMELLIA128-SHA
46-
Accepted TLSv1.2 128 bits RC4-SHA 
47-
Accepted TLSv1.2 128 bits RC4-MD5 
4844
Accepted TLSv1.2 112 bits DES-CBC3-SHA 
45+
Accepted TLSv1.2 128 bits TLS_RSA_WITH_RC4_128_MD5 
46+
Accepted TLSv1.2 128 bits TLS_RSA_WITH_RC4_128_SHA 
47+
Accepted TLSv1.2 128 bits TLS_RSA_WITH_IDEA_CBC_SHA
48+
Accepted TLSv1.2 128 bits TLS_RSA_WITH_SEED_CBC_SHA
49+
Accepted TLSv1.2 128 bits TLS_DHE_RSA_WITH_SEED_CBC_SHA
4950

5051
Server Key Exchange Group(s):
5152
TLSv1.2 81 bits sect163k1

Diff for: ‎docker_test/expected_output/test_4.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ TLSv1.1 not vulnerable to heartbleed
2727
TLSv1.0 not vulnerable to heartbleed
2828

2929
Supported Server Cipher(s):
30-
Preferred TLSv1.3 128 bits TLS_AES_128_GCM_SHA256 Curve 25519 DHE 253
31-
Accepted TLSv1.3 256 bits TLS_AES_256_GCM_SHA384 Curve 25519 DHE 253
32-
Accepted TLSv1.3 256 bits TLS_CHACHA20_POLY1305_SHA256 Curve 25519 DHE 253
30+
Preferred TLSv1.3 128 bits TLS_AES_128_GCM_SHA256  Curve 25519 DHE 253
31+
Accepted TLSv1.3 256 bits TLS_AES_256_GCM_SHA384  Curve 25519 DHE 253
32+
Accepted TLSv1.3 256 bits TLS_CHACHA20_POLY1305_SHA256  Curve 25519 DHE 253
3333
Preferred TLSv1.2 256 bits ECDHE-RSA-AES256-GCM-SHA384  Curve 25519 DHE 253
3434
Accepted TLSv1.2 256 bits DHE-RSA-AES256-GCM-SHA384  DHE 3072 bits
3535
Accepted TLSv1.2 256 bits ECDHE-RSA-CHACHA20-POLY1305  Curve 25519 DHE 253

0 commit comments

Comments
 (0)