- Added ssl_get_peer_cert() to SSL API

This commit is contained in:
Paul Bakker 2012-10-30 07:51:03 +00:00
parent d2c167e9a8
commit b0550d90c9
5 changed files with 29 additions and 5 deletions

View File

@ -928,6 +928,22 @@ const char *ssl_get_ciphersuite( const ssl_context *ssl );
*/
const char *ssl_get_version( const ssl_context *ssl );
/**
* \brief Return the peer certificate from the current connection
*
* Note: Can be NULL in case no certificate was sent during
* the handshake. Different calls for the same connection can
* return the same or different pointers for the same
* certificate and even a different certificate altogether.
* The peer cert CAN change in a single connection if
* renegotiation is performed.
*
* \param ssl SSL context
*
* \return the current peer certificate
*/
const x509_cert *ssl_get_peer_cert( const ssl_context *ssl );
/**
* \brief Perform the SSL handshake
*

View File

@ -3405,6 +3405,14 @@ const char *ssl_get_version( const ssl_context *ssl )
return( "unknown" );
}
const x509_cert *ssl_get_peer_cert( const ssl_context *ssl )
{
if( ssl == NULL || ssl->session == NULL )
return NULL;
return ssl->session->peer_cert;
}
const int ssl_default_ciphersuites[] =
{
#if defined(POLARSSL_DHM_C)

View File

@ -539,7 +539,7 @@ int main( int argc, char *argv[] )
printf( " . Peer certificate information ...\n" );
x509parse_cert_info( (char *) buf, sizeof( buf ) - 1, " ",
ssl.session->peer_cert );
ssl_get_peer_cert( &ssl ) );
printf( "%s\n", buf );
/*

View File

@ -172,7 +172,7 @@ int do_handshake( ssl_context *ssl, struct options *opt )
printf( " . Peer certificate information ...\n" );
x509parse_cert_info( (char *) buf, sizeof( buf ) - 1, " ",
ssl->session->peer_cert );
ssl_get_peer_cert( &ssl ) );
printf( "%s\n", buf );
return( 0 );

View File

@ -501,7 +501,7 @@ reset:
{
printf( " failed\n" );
if( !ssl.session->peer_cert )
if( !ssl_get_peer_cert( &ssl ) )
printf( " ! no client certificate sent\n" );
if( ( ret & BADCERT_EXPIRED ) != 0 )
@ -518,11 +518,11 @@ reset:
else
printf( " ok\n" );
if( ssl.session->peer_cert )
if( ssl_get_peer_cert( &ssl ) )
{
printf( " . Peer certificate information ...\n" );
x509parse_cert_info( (char *) buf, sizeof( buf ) - 1, " ",
ssl.session->peer_cert );
ssl_get_peer_cert( &ssl ) );
printf( "%s\n", buf );
}