From 9c5898f0339c35a3947c9787d919ad2e07e6a85c Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Mon, 16 Feb 2015 16:18:33 +0100 Subject: [PATCH 1/3] Update release date and added note --- ChangeLog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5fef05290..336fba07a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 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 * Support for DTLS 1.0 and 1.2 (RFC 6347). From 67afeb23bbe73c82aaea90d0d0942004ac73ff99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 16 Feb 2015 15:52:48 +0000 Subject: [PATCH 2/3] Remove gnutls from the travis build Causing spurious fails of ssl-opt.sh. Likely a version issue. It would be better to investigate the exact problem, and maybe adapt ssl-opt.sh to be check for a minimum version just as compat.sh does, but this is a quick fix. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f100c3be..0a51e7eed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ compiler: - clang - gcc before_install: sudo apt-get update -install: sudo apt-get install gnutls-bin valgrind perl +install: sudo apt-get install valgrind perl script: - cmake -D CMAKE_BUILD_TYPE:String="Check" . - make From 9699996f46749138e41f947047a11964377d5abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 17 Feb 2015 16:02:37 +0000 Subject: [PATCH 3/3] Add missing require_gnutls guards in ssl-opt.sh --- tests/ssl-opt.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index 9b59fb8d8..86deb2d78 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -1468,6 +1468,7 @@ run_test "Renegotiation: DTLS, server-initiated" \ -s "=> renegotiate" \ -s "write hello request" +requires_gnutls run_test "Renegotiation: DTLS, gnutls server, client-initiated" \ "$G_SRV -u --mtu 4096" \ "$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:" \ -c "HTTP/1.0 200 OK" +requires_gnutls needs_more_time 6 run_test "DTLS proxy: 3d, gnutls server" \ -p "$P_PXY drop=5 delay=5 duplicate=5" \ @@ -3095,6 +3097,7 @@ run_test "DTLS proxy: 3d, gnutls server" \ -s "Extra-header:" \ -c "Extra-header:" +requires_gnutls needs_more_time 6 run_test "DTLS proxy: 3d, gnutls server, fragmentation" \ -p "$P_PXY drop=5 delay=5 duplicate=5" \ @@ -3104,6 +3107,7 @@ run_test "DTLS proxy: 3d, gnutls server, fragmentation" \ -s "Extra-header:" \ -c "Extra-header:" +requires_gnutls needs_more_time 6 run_test "DTLS proxy: 3d, gnutls server, fragmentation, nbio" \ -p "$P_PXY drop=5 delay=5 duplicate=5" \