cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-03 20:22:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

ssl_parse_certificate() now calls x509parse_crt_der() directly

Browse Source 
(cherry picked from commit 1922a4e6aade7b1d685af19d4d9339ddb5c02859)
This commit is contained in:
Paul Bakker 2013-06-24 19:06:15 +02:00
parent 5ed3b34e22
commit 89ecb2d074
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/polarssl/x509.h
View File

@ -328,6 +328,18 @@ extern "C" {
*/ */
/** \ingroup x509_module */ /** \ingroup x509_module */
/**
* \brief Parse a single DER formatted certificate and add it
* to the chained list.
*
* \param chain points to the start of the chain
* \param buf buffer holding the certificate DER data
* \param buflen size of the buffer
*
* \return 0 if successful, or a specific X509 or PEM error code
*/
int x509parse_crt_der( x509_cert *chain, const unsigned char *buf, size_t buflen );
/** /**
* \brief Parse one or more certificates and add them * \brief Parse one or more certificates and add them
* to the chained list. Parses permissively. If some * to the chained list. Parses permissively. If some

4
library/ssl_tls.c
View File

@ -2115,8 +2115,8 @@ int ssl_parse_certificate( ssl_context *ssl )
return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE ); return( POLARSSL_ERR_SSL_BAD_HS_CERTIFICATE );
} }
ret = x509parse_crt( ssl->session_negotiate->peer_cert, ssl->in_msg + i, ret = x509parse_crt_der( ssl->session_negotiate->peer_cert,
n ); ssl->in_msg + i, n );
if( ret != 0 ) if( ret != 0 )
{ {
SSL_DEBUG_RET( 1, " x509parse_crt", ret ); SSL_DEBUG_RET( 1, " x509parse_crt", ret );