File tree Expand file tree Collapse file tree 1 file changed +8
-1
lines changed
Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -343,6 +343,7 @@ HAS_SSL3=false
343343HAS_TLS13=false
344344HAS_X448=false
345345HAS_X25519=false
346+ HAS_SIGALGS=false
346347HAS_PKUTIL=false
347348HAS_PKEY=false
348349HAS_NO_SSL2=false
@@ -7512,7 +7513,7 @@ get_server_certificate() {
75127513 CERTIFICATE_LIST_ORDERING_PROBLEM=false
75137514 if [[ "$1" =~ "tls1_3" ]]; then
75147515 [[ $(has_server_protocol "tls1_3") -eq 1 ]] && return 1
7515- if "$HAS_TLS13"; then
7516+ if "$HAS_TLS13" && "$HAS_SIGALGS" ; then
75167517 if [[ "$1" =~ "tls1_3_RSA" ]]; then
75177518 $OPENSSL s_client $(s_client_options "$STARTTLS $BUGS -showcerts -connect $NODEIP:$PORT $PROXY $SNI -tls1_3 -tlsextdebug -status -msg -sigalgs PSS+SHA256:PSS+SHA384") </dev/null 2>$ERRFILE >$TMPFILE
75187519 elif [[ "$1" =~ "tls1_3_ECDSA" ]]; then
@@ -17248,6 +17249,7 @@ find_openssl_binary() {
1724817249 HAS_TLS13=false
1724917250 HAS_X448=false
1725017251 HAS_X25519=false
17252+ HAS_SIGALGS=false
1725117253 HAS_NO_SSL2=false
1725217254 HAS_NOSERVERNAME=false
1725317255 HAS_CIPHERSUITES=false
@@ -17289,6 +17291,10 @@ find_openssl_binary() {
1728917291 $OPENSSL pkey -help 2>&1 | grep -q Error || HAS_PKEY=true
1729017292 $OPENSSL pkeyutl 2>&1 | grep -q Error || HAS_PKUTIL=true
1729117293
17294+ if "$HAS_TLS13"; then
17295+ $OPENSSL s_client -tls1_3 -sigalgs PSS+SHA256:PSS+SHA384 $NXCONNECT </dev/null 2>&1 | grep -aiq "unknown option" || HAS_SIGALGS=true
17296+ fi
17297+
1729217298 $OPENSSL s_client -noservername </dev/null 2>&1 | grep -aiq "unknown option" || HAS_NOSERVERNAME=true
1729317299 $OPENSSL s_client -ciphersuites </dev/null 2>&1 | grep -aiq "unknown option" || HAS_CIPHERSUITES=true
1729417300
@@ -17658,6 +17664,7 @@ HAS_SSL3: $HAS_SSL3
1765817664HAS_TLS13: $HAS_TLS13
1765917665HAS_X448: $HAS_X448
1766017666HAS_X25519: $HAS_X25519
17667+ HAS_SIGALGS: $HAS_SIGALGS
1766117668HAS_NO_SSL2: $HAS_NO_SSL2
1766217669HAS_SPDY: $HAS_SPDY
1766317670HAS_ALPN: $HAS_ALPN
You can’t perform that action at this time.
0 commit comments