ssl_read() stops returning non-application data
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index ac82dfb..1d68d96 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4357,9 +4357,10 @@
SSL_DEBUG_RET( 1, "ssl_start_renegotiation", ret );
return( ret );
}
-
- return( POLARSSL_ERR_NET_WANT_READ );
}
+
+ /* Tell the user to call ssl_read() again */
+ return( POLARSSL_ERR_NET_WANT_READ );
}
else if( ssl->renegotiation == SSL_RENEGOTIATION_PENDING )
{
@@ -4373,7 +4374,15 @@
return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
}
}
- else if( ssl->in_msgtype != SSL_MSG_APPLICATION_DATA )
+
+ /* Fatal and closure alerts handled by ssl_read_record() */
+ if( ssl->in_msgtype == SSL_MSG_ALERT )
+ {
+ SSL_DEBUG_MSG( 2, ( "ignoring non-fatal non-closure alert" ) );
+ return( POLARSSL_ERR_NET_WANT_READ );
+ }
+
+ if( ssl->in_msgtype != SSL_MSG_APPLICATION_DATA )
{
SSL_DEBUG_MSG( 1, ( "bad application data message" ) );
return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );