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

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 0134834..27f2172 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1474,7 +1474,7 @@
             return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE );
         }
 
-        ret = x509parse_crt( ssl->peer_cert, ssl->in_msg + i, n );
+        ret = x509parse_crt_der( ssl->peer_cert, ssl->in_msg + i, n );
         if( ret != 0 )
         {
             SSL_DEBUG_RET( 1, " x509parse_crt", ret );