Merge branch 'mbedtls-1.4' into dtls

* mbedtls-1.4:
  Add missing require_gnutls guards in ssl-opt.sh
  Remove gnutls from the travis build
  Update release date and added note
This commit is contained in:
Manuel Pégourié-Gonnard 2015-02-17 16:50:45 +00:00
commit cc8980872c
2 changed files with 8 additions and 1 deletions

View File

@ -1,6 +1,9 @@
mbed TLS ChangeLog (Sorted per branch, date) mbed TLS ChangeLog (Sorted per branch, date)
= PolarSSL 1.4.0 (DTLS branch) released 2014-10-22 = PolarSSL 1.4.0 (DTLS feature preview) released 2015-02-16
Note: This is a feature preview release for DTLS. The 1.4 branch is not
maintained further and should not be used to start new projects.
Features Features
* Support for DTLS 1.0 and 1.2 (RFC 6347). * Support for DTLS 1.0 and 1.2 (RFC 6347).

View File

@ -1468,6 +1468,7 @@ run_test "Renegotiation: DTLS, server-initiated" \
-s "=> renegotiate" \ -s "=> renegotiate" \
-s "write hello request" -s "write hello request"
requires_gnutls
run_test "Renegotiation: DTLS, gnutls server, client-initiated" \ run_test "Renegotiation: DTLS, gnutls server, client-initiated" \
"$G_SRV -u --mtu 4096" \ "$G_SRV -u --mtu 4096" \
"$P_CLI debug_level=3 dtls=1 exchanges=1 renegotiation=1 renegotiate=1" \ "$P_CLI debug_level=3 dtls=1 exchanges=1 renegotiation=1 renegotiate=1" \
@ -3086,6 +3087,7 @@ run_test "DTLS proxy: 3d, openssl server, fragmentation, nbio" \
-s "Extra-header:" \ -s "Extra-header:" \
-c "HTTP/1.0 200 OK" -c "HTTP/1.0 200 OK"
requires_gnutls
needs_more_time 6 needs_more_time 6
run_test "DTLS proxy: 3d, gnutls server" \ run_test "DTLS proxy: 3d, gnutls server" \
-p "$P_PXY drop=5 delay=5 duplicate=5" \ -p "$P_PXY drop=5 delay=5 duplicate=5" \
@ -3095,6 +3097,7 @@ run_test "DTLS proxy: 3d, gnutls server" \
-s "Extra-header:" \ -s "Extra-header:" \
-c "Extra-header:" -c "Extra-header:"
requires_gnutls
needs_more_time 6 needs_more_time 6
run_test "DTLS proxy: 3d, gnutls server, fragmentation" \ run_test "DTLS proxy: 3d, gnutls server, fragmentation" \
-p "$P_PXY drop=5 delay=5 duplicate=5" \ -p "$P_PXY drop=5 delay=5 duplicate=5" \
@ -3104,6 +3107,7 @@ run_test "DTLS proxy: 3d, gnutls server, fragmentation" \
-s "Extra-header:" \ -s "Extra-header:" \
-c "Extra-header:" -c "Extra-header:"
requires_gnutls
needs_more_time 6 needs_more_time 6
run_test "DTLS proxy: 3d, gnutls server, fragmentation, nbio" \ run_test "DTLS proxy: 3d, gnutls server, fragmentation, nbio" \
-p "$P_PXY drop=5 delay=5 duplicate=5" \ -p "$P_PXY drop=5 delay=5 duplicate=5" \