mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-04 04:32:24 -05:00 
			
		
		
		
	Adjust timeout values for 3d test
Use the same values as other 3d tests: this makes the test hopefully a bit faster than the default values, while not increasing the failure rate. While at it: - adjust "needs_more_time" setting for 3d interop tests (we can't set the timeout values for other implementations, so the test might be slow) - fix some supposedly DTLS 1.0 test that were using dtls1_2 on the command line
This commit is contained in:
		
							parent
							
								
									6e7aaca146
								
							
						
					
					
						commit
						02f3a8a921
					
				@ -5313,11 +5313,11 @@ run_test    "DTLS fragmenting: proxy MTU + 3d" \
 | 
			
		||||
            "$P_SRV dtls=1 debug_level=2 auth_mode=required \
 | 
			
		||||
             crt_file=data_files/server7_int-ca.crt \
 | 
			
		||||
             key_file=data_files/server7.key \
 | 
			
		||||
             mtu=512" \
 | 
			
		||||
             hs_timeout=250-10000 mtu=512" \
 | 
			
		||||
            "$P_CLI dtls=1 debug_level=2 \
 | 
			
		||||
             crt_file=data_files/server8_int-ca2.crt \
 | 
			
		||||
             key_file=data_files/server8.key \
 | 
			
		||||
             mtu=512" \
 | 
			
		||||
             hs_timeout=250-10000 mtu=512" \
 | 
			
		||||
            0 \
 | 
			
		||||
            -s "found fragmented DTLS handshake message" \
 | 
			
		||||
            -c "found fragmented DTLS handshake message" \
 | 
			
		||||
@ -5350,7 +5350,7 @@ run_test    "DTLS fragmenting: gnutls server, DTLS 1.0" \
 | 
			
		||||
            "$P_CLI dtls=1 debug_level=2 \
 | 
			
		||||
             crt_file=data_files/server8_int-ca2.crt \
 | 
			
		||||
             key_file=data_files/server8.key \
 | 
			
		||||
             mtu=512 force_version=dtls1_2" \
 | 
			
		||||
             mtu=512 force_version=dtls1" \
 | 
			
		||||
            0 \
 | 
			
		||||
            -c "fragmenting handshake message" \
 | 
			
		||||
            -C "error"
 | 
			
		||||
@ -5448,14 +5448,14 @@ requires_config_enabled MBEDTLS_SSL_PROTO_DTLS
 | 
			
		||||
requires_config_enabled MBEDTLS_RSA_C
 | 
			
		||||
requires_config_enabled MBEDTLS_ECDSA_C
 | 
			
		||||
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 | 
			
		||||
client_needs_more_time 2
 | 
			
		||||
client_needs_more_time 4
 | 
			
		||||
run_test    "DTLS fragmenting: 3d, gnutls server, DTLS 1.2" \
 | 
			
		||||
            -p "$P_PXY drop=8 delay=8 duplicate=8" \
 | 
			
		||||
            "$G_NEXT_SRV -u" \
 | 
			
		||||
            "$P_CLI dtls=1 debug_level=2 \
 | 
			
		||||
             crt_file=data_files/server8_int-ca2.crt \
 | 
			
		||||
             key_file=data_files/server8.key \
 | 
			
		||||
             mtu=512 force_version=dtls1_2" \
 | 
			
		||||
             hs_timeout=250-60000 mtu=512 force_version=dtls1_2" \
 | 
			
		||||
            0 \
 | 
			
		||||
            -c "fragmenting handshake message" \
 | 
			
		||||
            -C "error"
 | 
			
		||||
@ -5465,14 +5465,14 @@ requires_config_enabled MBEDTLS_SSL_PROTO_DTLS
 | 
			
		||||
requires_config_enabled MBEDTLS_RSA_C
 | 
			
		||||
requires_config_enabled MBEDTLS_ECDSA_C
 | 
			
		||||
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_1
 | 
			
		||||
client_needs_more_time 2
 | 
			
		||||
client_needs_more_time 4
 | 
			
		||||
run_test    "DTLS fragmenting: 3d, gnutls server, DTLS 1.0" \
 | 
			
		||||
            -p "$P_PXY drop=8 delay=8 duplicate=8" \
 | 
			
		||||
            "$G_NEXT_SRV -u" \
 | 
			
		||||
            "$P_CLI dtls=1 debug_level=2 \
 | 
			
		||||
             crt_file=data_files/server8_int-ca2.crt \
 | 
			
		||||
             key_file=data_files/server8.key \
 | 
			
		||||
             mtu=512 force_version=dtls1_2" \
 | 
			
		||||
             hs_timeout=250-60000 mtu=512 force_version=dtls1" \
 | 
			
		||||
            0 \
 | 
			
		||||
            -c "fragmenting handshake message" \
 | 
			
		||||
            -C "error"
 | 
			
		||||
@ -5489,13 +5489,13 @@ run_test    "DTLS fragmenting: 3d, gnutls server, DTLS 1.0" \
 | 
			
		||||
## requires_config_enabled MBEDTLS_RSA_C
 | 
			
		||||
## requires_config_enabled MBEDTLS_ECDSA_C
 | 
			
		||||
## requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 | 
			
		||||
## client_needs_more_time 2
 | 
			
		||||
## client_needs_more_time 4
 | 
			
		||||
## run_test    "DTLS fragmenting: 3d, gnutls client, DTLS 1.2" \
 | 
			
		||||
##             -p "$P_PXY drop=8 delay=8 duplicate=8" \
 | 
			
		||||
##             "$P_SRV dtls=1 debug_level=2 server_addr=::1 \
 | 
			
		||||
##              crt_file=data_files/server7_int-ca.crt \
 | 
			
		||||
##              key_file=data_files/server7.key \
 | 
			
		||||
##              mtu=512 force_version=dtls1_2" \
 | 
			
		||||
##              hs_timeout=250-60000 mtu=512 force_version=dtls1_2" \
 | 
			
		||||
##             "$G_CLI -u" \
 | 
			
		||||
##             0 \
 | 
			
		||||
##             -s "fragmenting handshake message"
 | 
			
		||||
@ -5506,13 +5506,13 @@ run_test    "DTLS fragmenting: 3d, gnutls server, DTLS 1.0" \
 | 
			
		||||
## requires_config_enabled MBEDTLS_RSA_C
 | 
			
		||||
## requires_config_enabled MBEDTLS_ECDSA_C
 | 
			
		||||
## requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_1
 | 
			
		||||
## client_needs_more_time 2
 | 
			
		||||
## client_needs_more_time 4
 | 
			
		||||
## run_test    "DTLS fragmenting: 3d, gnutls client, DTLS 1.0" \
 | 
			
		||||
##             -p "$P_PXY drop=8 delay=8 duplicate=8" \
 | 
			
		||||
##             "$P_SRV dtls=1 debug_level=2 server_addr=::1 \
 | 
			
		||||
##              crt_file=data_files/server7_int-ca.crt \
 | 
			
		||||
##              key_file=data_files/server7.key \
 | 
			
		||||
##              mtu=512 force_version=dtls1" \
 | 
			
		||||
##              hs_timeout=250-60000 mtu=512 force_version=dtls1" \
 | 
			
		||||
##             "$G_CLI -u" \
 | 
			
		||||
##             0 \
 | 
			
		||||
##             -s "fragmenting handshake message"
 | 
			
		||||
@ -5529,14 +5529,14 @@ run_test    "DTLS fragmenting: 3d, gnutls server, DTLS 1.0" \
 | 
			
		||||
## requires_config_enabled MBEDTLS_RSA_C
 | 
			
		||||
## requires_config_enabled MBEDTLS_ECDSA_C
 | 
			
		||||
## requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 | 
			
		||||
## client_needs_more_time 2
 | 
			
		||||
## client_needs_more_time 4
 | 
			
		||||
## run_test    "DTLS fragmenting: 3d, openssl server, DTLS 1.2" \
 | 
			
		||||
##             -p "$P_PXY drop=8 delay=8 duplicate=8" \
 | 
			
		||||
##             "$O_SRV -dtls1_2 -verify 10" \
 | 
			
		||||
##             "$P_CLI dtls=1 debug_level=2 \
 | 
			
		||||
##              crt_file=data_files/server8_int-ca2.crt \
 | 
			
		||||
##              key_file=data_files/server8.key \
 | 
			
		||||
##              mtu=512 force_version=dtls1_2" \
 | 
			
		||||
##              hs_timeout=250-60000 mtu=512 force_version=dtls1_2" \
 | 
			
		||||
##             0 \
 | 
			
		||||
##             -c "fragmenting handshake message" \
 | 
			
		||||
##             -C "error"
 | 
			
		||||
@ -5546,14 +5546,14 @@ requires_config_enabled MBEDTLS_SSL_PROTO_DTLS
 | 
			
		||||
requires_config_enabled MBEDTLS_RSA_C
 | 
			
		||||
requires_config_enabled MBEDTLS_ECDSA_C
 | 
			
		||||
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_1
 | 
			
		||||
client_needs_more_time 2
 | 
			
		||||
client_needs_more_time 4
 | 
			
		||||
run_test    "DTLS fragmenting: 3d, openssl server, DTLS 1.0" \
 | 
			
		||||
            -p "$P_PXY drop=8 delay=8 duplicate=8" \
 | 
			
		||||
            "$O_LEGACY_SRV -dtls1 -verify 10" \
 | 
			
		||||
            "$P_CLI dtls=1 debug_level=2 \
 | 
			
		||||
             crt_file=data_files/server8_int-ca2.crt \
 | 
			
		||||
             key_file=data_files/server8.key \
 | 
			
		||||
             mtu=512 force_version=dtls1" \
 | 
			
		||||
             hs_timeout=250-60000 mtu=512 force_version=dtls1" \
 | 
			
		||||
            0 \
 | 
			
		||||
            -c "fragmenting handshake message" \
 | 
			
		||||
            -C "error"
 | 
			
		||||
@ -5563,13 +5563,13 @@ run_test    "DTLS fragmenting: 3d, openssl server, DTLS 1.0" \
 | 
			
		||||
## requires_config_enabled MBEDTLS_RSA_C
 | 
			
		||||
## requires_config_enabled MBEDTLS_ECDSA_C
 | 
			
		||||
## requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 | 
			
		||||
## client_needs_more_time 2
 | 
			
		||||
## client_needs_more_time 4
 | 
			
		||||
## run_test    "DTLS fragmenting: 3d, openssl client, DTLS 1.2" \
 | 
			
		||||
##             -p "$P_PXY drop=8 delay=8 duplicate=8" \
 | 
			
		||||
##             "$P_SRV dtls=1 debug_level=2 \
 | 
			
		||||
##              crt_file=data_files/server7_int-ca.crt \
 | 
			
		||||
##              key_file=data_files/server7.key \
 | 
			
		||||
##              mtu=512 force_version=dtls1_2" \
 | 
			
		||||
##              hs_timeout=250-60000 mtu=512 force_version=dtls1_2" \
 | 
			
		||||
##             "$O_CLI -dtls1_2" \
 | 
			
		||||
##             0 \
 | 
			
		||||
##             -s "fragmenting handshake message"
 | 
			
		||||
@ -5580,13 +5580,13 @@ requires_config_enabled MBEDTLS_SSL_PROTO_DTLS
 | 
			
		||||
requires_config_enabled MBEDTLS_RSA_C
 | 
			
		||||
requires_config_enabled MBEDTLS_ECDSA_C
 | 
			
		||||
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_1
 | 
			
		||||
client_needs_more_time 2
 | 
			
		||||
client_needs_more_time 4
 | 
			
		||||
run_test    "DTLS fragmenting: 3d, openssl client, DTLS 1.0" \
 | 
			
		||||
            -p "$P_PXY drop=8 delay=8 duplicate=8" \
 | 
			
		||||
            "$P_SRV dtls=1 debug_level=2 \
 | 
			
		||||
             crt_file=data_files/server7_int-ca.crt \
 | 
			
		||||
             key_file=data_files/server7.key \
 | 
			
		||||
             mtu=512 force_version=dtls1" \
 | 
			
		||||
             hs_timeout=250-60000 mtu=512 force_version=dtls1" \
 | 
			
		||||
            "$O_LEGACY_CLI -nbio -dtls1" \
 | 
			
		||||
            0 \
 | 
			
		||||
            -s "fragmenting handshake message"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user