Merge branch 'development' into dtls
* development:
Fix error code description.
generate_errors.pl now errors on duplicate codes
Avoid nested if's without braces.
Move renego SCSV after actual ciphersuites
Fix send_close_notify usage.
Rename variable for clarity
Improve script portability
Conflicts:
library/ssl_srv.c
programs/ssl/ssl_client2.c
programs/ssl/ssl_server2.c
tests/ssl-opt.sh
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index e6948ef..fc86809 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1294,10 +1294,12 @@
#if defined(POLARSSL_SSL_RENEGOTIATION)
if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
#endif
- if( ( ret = ssl_fetch_input( ssl, 5 ) ) != 0 )
{
- SSL_DEBUG_RET( 1, "ssl_fetch_input", ret );
- return( ret );
+ if( ( ret = ssl_fetch_input( ssl, 5 ) ) != 0 )
+ {
+ SSL_DEBUG_RET( 1, "ssl_fetch_input", ret );
+ return( ret );
+ }
}
buf = ssl->in_hdr;
@@ -1351,8 +1353,11 @@
/* For DTLS if this is the initial handshake, remember the client sequence
* number to use it in our next message (RFC 6347 4.2.1) */
#if defined(POLARSSL_SSL_PROTO_DTLS)
- if( ssl->transport == SSL_TRANSPORT_DATAGRAM &&
- ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
+ if( ssl->transport == SSL_TRANSPORT_DATAGRAM
+#if defined(POLARSSL_SSL_RENEGOTIATION)
+ && ssl->renegotiation == SSL_INITIAL_HANDSHAKE
+#endif
+ )
{
/* Epoch should be 0 for initial handshakes */
if( ssl->in_ctr[0] != 0 || ssl->in_ctr[1] != 0 )