mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCTP Test

Browse Source 
1. Removed test cases for DTLSv1.0 that used AEAD ciphers.
2. Cleaned up some typos in the test configs.
3. Fixed typo in a WOLFSSL_SCTP ifdef check.
This commit is contained in:
John Safranek 2020-07-20 15:03:48 -07:00
parent 29abd72c39
commit 10c293a76c
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
3 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl.c
View File

@ -2025,7 +2025,7 @@ static int wolfSSL_read_internal(WOLFSSL* ssl, void* data, int sz, int peek)
#ifdef WOLFSSL_SCTP
if (ssl->options.dtlsSctp)
#endif
#if defined(WOLLSSL_SCTP) || defined(WOLFSSL_DTLS_MTU)
#if defined(WOLFSSL_SCTP) || defined(WOLFSSL_DTLS_MTU)
ssl->dtls_expected_rx = max(ssl->dtls_expected_rx, ssl->dtlsMtuSz);
#endif
}

16
tests/test-sctp-sha2.conf
View File

@ -18,49 +18,49 @@
-v 2
-l AES256-SHA256
# server TLSv1 ECDHE-PSK-AES128-SHA256
# server DTLSv1 ECDHE-PSK-AES128-SHA256
-s
-G
-v 1
-l ECDHE-PSK-AES128-SHA256
# client TLSv1 ECDHE-PSK-AES128-SHA256
# client DTLSv1 ECDHE-PSK-AES128-SHA256
-s
-G
-v 1
-l ECDHE-PSK-AES128-SHA256
# server TLSv1.1 ECDHE-PSK-AES128-SHA256
# server DTLSv1.1 ECDHE-PSK-AES128-SHA256
-s
-G
-v 2
-l ECDHE-PSK-AES128-SHA256
# client TLSv1.1 ECDHE-PSK-AES128-SHA256
# client DTLSv1.1 ECDHE-PSK-AES128-SHA256
-s
-G
-v 2
-l ECDHE-PSK-AES128-SHA256
# server TLSv1 ECDHE-PSK-NULL-SHA256
# server DTLSv1 ECDHE-PSK-NULL-SHA256
-s
-G
-v 1
-l ECDHE-PSK-NULL-SHA256
# client TLSv1 ECDHE-PSK-NULL-SHA256
# client DTLSv1 ECDHE-PSK-NULL-SHA256
-s
-G
-v 1
-l ECDHE-PSK-NULL-SHA256
# server TLSv1.1 ECDHE-PSK-NULL-SHA256
# server DTLSv1.1 ECDHE-PSK-NULL-SHA256
-s
-G
-v 2
-l ECDHE-PSK-NULL-SHA256
# client TLSv1.1 ECDHE-PSK-NULL-SHA256
# client DTLSv1.1 ECDHE-PSK-NULL-SHA256
-s
-G
-v 2

65
tests/test-sctp.conf
View File

@ -1,36 +1,3 @@
# server DTLSv1 DHE-RSA-CHACHA20-POLY1305
-G
-v 2
-l DHE-RSA-CHACHA20-POLY1305
# client DTLSv1 DHE-RSA-CHACHA20-POLY1305
-G
-v 2
-l DHE-RSA-CHACHA20-POLY1305
# server DTLSv1 ECDHE-RSA-CHACHA20-POLY1305
-G
-v 2
-l ECDHE-RSA-CHACHA20-POLY1305
# client DTLSv1 ECDHE-RSA-CHACHA20-POLY1305
-G
-v 2
-l ECDHE-RSA-CHACHA20-POLY1305
# server DTLSv1 ECDHE-EDCSA-CHACHA20-POLY1305
-G
-v 2
-l ECDHE-ECDSA-CHACHA20-POLY1305
-c ./certs/server-ecc.pem
-k ./certs/ecc-key.pem
# client DTLSv1 ECDHE-ECDSA-CHACHA20-POLY1305
-G
-v 2
-l ECDHE-ECDSA-CHACHA20-POLY1305
-A ./certs/ca-ecc-cert.pem
# server DTLSv1.2 DHE-RSA-CHACHA20-POLY1305
-G
-v 3
@ -64,37 +31,37 @@
-l ECDHE-ECDSA-CHACHA20-POLY1305
-A ./certs/ca-ecc-cert.pem
# server TLSv1.2 DHE-PSK-CHACHA20-POLY1305
# server DTLSv1.2 DHE-PSK-CHACHA20-POLY1305
-G
-v 3
-s
-l DHE-PSK-CHACHA20-POLY1305
# client TLSv1.2 DHE-PSK-CHACHA20-POLY1305
# client DTLSv1.2 DHE-PSK-CHACHA20-POLY1305
-G
-v 3
-s
-l DHE-PSK-CHACHA20-POLY1305
# server TLSv1.2 ECDHE-PSK-CHACHA20-POLY1305
# server DTLSv1.2 ECDHE-PSK-CHACHA20-POLY1305
-G
-v 3
-s
-l ECDHE-PSK-CHACHA20-POLY1305
# client TLSv1.2 ECDHE-PSK-CHACHA20-POLY1305
# client DTLSv1.2 ECDHE-PSK-CHACHA20-POLY1305
-G
-v 3
-s
-l ECDHE-PSK-CHACHA20-POLY1305
# server TLSv1.2 PSK-CHACHA20-POLY1305
# server DTLSv1.2 PSK-CHACHA20-POLY1305
-G
-v 3
-s
-l PSK-CHACHA20-POLY1305
# client TLSv1.2 PSK-CHACHA20-POLY1305
# client DTLSv1.2 PSK-CHACHA20-POLY1305
-G
-v 3
-s
@ -333,40 +300,40 @@
-v 3
-l ECDHE-RSA-AES256-SHA
# server TLSv1 ECDHE-ECDSA-NULL-SHA
# server DTLSv1 ECDHE-ECDSA-NULL-SHA
-G
-v 1
-l ECDHE-ECDSA-NULL-SHA
-c ./certs/server-ecc.pem
-k ./certs/ecc-key.pem
# client TLSv1 ECDHE-ECDSA-NULL-SHA
# client DTLSv1 ECDHE-ECDSA-NULL-SHA
-G
-v 1
-l ECDHE-ECDSA-NULL-SHA
-A ./certs/ca-ecc-cert.pem
# server TLSv1.1 ECDHE-ECDSA-NULL-SHA
# server DTLSv1.1 ECDHE-ECDSA-NULL-SHA
-G
-v 2
-l ECDHE-ECDSA-NULL-SHA
-c ./certs/server-ecc.pem
-k ./certs/ecc-key.pem
# client TLSv1 ECDHE-ECDSA-NULL-SHA
# client DTLSv1 ECDHE-ECDSA-NULL-SHA
-G
-v 2
-l ECDHE-ECDSA-NULL-SHA
-A ./certs/ca-ecc-cert.pem
# server TLSv1.2 ECDHE-ECDSA-NULL-SHA
# server DTLSv1.2 ECDHE-ECDSA-NULL-SHA
-G
-v 3
-l ECDHE-ECDSA-NULL-SHA
-c ./certs/server-ecc.pem
-k ./certs/ecc-key.pem
# client TLSv1.2 ECDHE-ECDSA-NULL-SHA
# client DTLSv1.2 ECDHE-ECDSA-NULL-SHA
-G
-v 3
-l ECDHE-ECDSA-NULL-SHA
@ -762,25 +729,25 @@
-l ECDH-ECDSA-AES256-SHA384
-A ./certs/ca-ecc-cert.pem
# server TLSv1.2 ECDHE-PSK-AES128-SHA256
# server DTLSv1.2 ECDHE-PSK-AES128-SHA256
-s
-G
-v 3
-l ECDHE-PSK-AES128-SHA256
# client TLSv1.2 ECDHE-PSK-AES128-SHA256
# client DTLSv1.2 ECDHE-PSK-AES128-SHA256
-s
-G
-v 3
-l ECDHE-PSK-AES128-SHA256
# server TLSv1.2 ECDHE-PSK-NULL-SHA256
# server DTLSv1.2 ECDHE-PSK-NULL-SHA256
-s
-G
-v 3
-l ECDHE-PSK-NULL-SHA256
# client TLSv1.2 ECDHE-PSK-NULL-SHA256
# client DTLSv1.2 ECDHE-PSK-NULL-SHA256
-s
-G
-v 3