From 9b36433e6a488b9a332b0772090dc187f2838e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 29 Jan 2015 13:43:10 +0000 Subject: [PATCH 1/2] Fix ignore patterns for windows cmake again --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bbf7822b25..916d7311c6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,9 @@ Coverage *.gcda # MSVC files generated by CMake: -*.filters +/*.sln +/*.vcxproj +/*.filters # MSVC build artifacts: *.exe From aa422b2f1ab5c00bac5f0c63834861662e0de7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 2 Feb 2015 09:30:45 +0000 Subject: [PATCH 2/2] Add attribution --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f122aa6b24..9fadf1f5d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,7 +58,8 @@ Bugfix key exchanges enabled needs certificates. This fixes a possible interop issue with some servers when a zero-length extension was sent. (Reported by Peter Dettman.) - * On a 0-length input, base64_encode() did not correctly set output length. + * On a 0-length input, base64_encode() did not correctly set output length + (found by Hendrik van den Boogaard). Changes * Use deterministic nonces for AEAD ciphers in TLS by default (possible to