cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added defines around renegotiation code for SSL_SRV and SSL_CLI

Browse Source
This commit is contained in:
Paul Bakker 2013-10-31 14:32:04 +01:00
parent 6d8404d6ba
commit 37ce0ff185
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/ssl_tls.c
View File

@ -3971,6 +3971,7 @@ int ssl_handshake( ssl_context *ssl )
return( ret ); return( ret );
} }
#if defined(POLARSSL_SSL_SRV_C)
/* /*
* Write HelloRequest to request renegotiation on server * Write HelloRequest to request renegotiation on server
*/ */
@ -3996,6 +3997,7 @@ static int ssl_write_hello_request( ssl_context *ssl )
return( 0 ); return( 0 );
} }
#endif /* POLARSSL_SSL_SRV_C */
/* /*
* Actually renegotiate current connection, triggered by either: * Actually renegotiate current connection, triggered by either:
@ -4035,8 +4037,9 @@ static int ssl_start_renegotiation( ssl_context *ssl )
*/ */
int ssl_renegotiate( ssl_context *ssl ) int ssl_renegotiate( ssl_context *ssl )
{ {
int ret; int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
#if defined(POLARSSL_SSL_SRV_C)
/* On server, just send the request */ /* On server, just send the request */
if( ssl->endpoint == SSL_IS_SERVER ) if( ssl->endpoint == SSL_IS_SERVER )
{ {
@ -4045,7 +4048,9 @@ int ssl_renegotiate( ssl_context *ssl )
return( ssl_write_hello_request( ssl ) ); return( ssl_write_hello_request( ssl ) );
} }
#endif /* POLARSSL_SSL_SRV_C */
#if defined(POLARSSL_SSL_CLI_C)
/* /*
* On client, either start the renegotiation process or, * On client, either start the renegotiation process or,
* if already in progress, continue the handshake * if already in progress, continue the handshake
@ -4069,8 +4074,9 @@ int ssl_renegotiate( ssl_context *ssl )
return( ret ); return( ret );
} }
} }
#endif /* POLARSSL_SSL_CLI_C */
return( 0 ); return( ret );
} }
/* /*