Merge branch 'development' into dtls

* development:
  Add attribution
  Fix ignore patterns for windows cmake again
This commit is contained in:
Manuel Pégourié-Gonnard 2015-02-03 11:31:06 +00:00
commit 20343cfec9
2 changed files with 5 additions and 2 deletions

4
.gitignore vendored
View File

@ -8,7 +8,9 @@ Coverage
*.gcda
# MSVC files generated by CMake:
*.filters
/*.sln
/*.vcxproj
/*.filters
# MSVC build artifacts:
*.exe

View File

@ -68,7 +68,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