From 8199a3375f7f1c42d3d8eff3f5d4a81502511458 Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Wed, 19 Jun 2013 12:16:23 +0200
Subject: [PATCH] Added Security note (Advisory 2013-03) in ChangeLog (cherry
 picked from commit 016ea076e72d771137d283958714e17368e3c049)

Conflicts:
	ChangeLog
---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 683ce2030..a1c1dba45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@ Bugfix
 	 certificates
    * Fixed values for 2-key Triple DES in cipher layer
 
+Security
+   * A possible DoS during the SSL Handshake, due to faulty parsing of
+     PEM-encoded certificates has been fixed (found by Jack Lloyd)
+
 = Version 1.1.6 released on 2013-03-11
 Bugfix
    * Fixed net_bind() for specified IP addresses on little endian systems