aboutsummaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2014-02-11 14:49:15 +0200
committerPetri Lehtinen <petri@digip.org>2014-02-11 14:49:15 +0200
commit17ec22f514ceb9277bea1e38cc8ea69eec1edd53 (patch)
tree55b75defa871dc7178a0f2c6cead32b2bd69b8f5 /CHANGES
parenta721d36f4143faa94c78e447515994891ce9c30f (diff)
parente83ded066a610f8de7caaa3942769321ededa84f (diff)
downloadjansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.zip
jansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.tar.gz
jansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.tar.bz2
Merge branch '2.6'
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES31
1 files changed, 30 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 7807904..3be522c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Version 2.6 (in development)
+Version 2.7 (in development)
============================
Released XXXX-XX-XX
@@ -30,6 +30,35 @@ Released XXXX-XX-XX
readability.
+Version 2.6
+===========
+
+Released 2014-02-11
+
+* Security:
+
+ - CVE-2013-6401: The hash function used by the hashtable
+ implementation has been changed, and is automatically seeded with
+ random data when the first JSON object is created. This prevents
+ an attacker from causing large JSON objects with specially crafted
+ keys perform poorly.
+
+* New features:
+
+ - `json_object_seed()`: Set the seed value of the hash function.
+
+* Bug fixes:
+
+ - Include CMake specific files in the release tarball.
+
+* Documentation:
+
+ - Fix tutorial source to send a User-Agent header, which is now
+ required by the GitHub API.
+
+ - Set all memory to zero in secure_free() example.
+
+
Version 2.5
===========