commit b5df3bf1b47775963689c62a866f807ed26e6ad0
author Paul Bakker <p.j.bakker@polarssl.org> Wed Jun 19 12:08:47 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Jun 19 12:08:47 2013 +0200
tree d7585b2d4fe55e8cfd7e8a60809dfb892899372b
parent 721f06d49d5935c587597857052c14b9db96163f

ssl_parse_certificate() now calls x509parse_crt_der() directly
(cherry picked from commit 1922a4e6aade7b1d685af19d4d9339ddb5c02859)

Conflicts:
	library/ssl_tls.c

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4e9fb7c..9485cac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 
 Bugfix
    * x509parse_crt() now better handles PEM error situations
+   * ssl_parse_certificate() now calls x509parse_crt_der() directly
+     instead of the x509parse_crt() wrapper that can also parse PEM
+	 certificates
 
 = Version 1.1.6 released on 2013-03-11
 Bugfix