mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-03 20:22:59 -05:00 
			
		
		
		
	Revised hostname length check from review
This commit is contained in:
		
							parent
							
								
									ed9976634f
								
							
						
					
					
						commit
						9f81231fb8
					
				@ -139,8 +139,7 @@
 | 
				
			|||||||
#define MBEDTLS_SSL_TRANSPORT_STREAM            0   /*!< TLS      */
 | 
					#define MBEDTLS_SSL_TRANSPORT_STREAM            0   /*!< TLS      */
 | 
				
			||||||
#define MBEDTLS_SSL_TRANSPORT_DATAGRAM          1   /*!< DTLS     */
 | 
					#define MBEDTLS_SSL_TRANSPORT_DATAGRAM          1   /*!< DTLS     */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define MBEDTLS_SSL_MAX_HOST_NAME               255 /*!< Maximum host name
 | 
					#define MBEDTLS_SSL_MAX_HOST_NAME_LEN           255 /*!< Maximum host name defined in RFC 1035 */
 | 
				
			||||||
defined in RFC 1035 */
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* RFC 6066 section 4, see also mfl_code_to_length in ssl_tls.c
 | 
					/* RFC 6066 section 4, see also mfl_code_to_length in ssl_tls.c
 | 
				
			||||||
 * NONE must be zero so that memset()ing structure to zero works */
 | 
					 * NONE must be zero so that memset()ing structure to zero works */
 | 
				
			||||||
 | 
				
			|||||||
@ -5833,7 +5833,7 @@ int mbedtls_ssl_set_hostname( mbedtls_ssl_context *ssl, const char *hostname )
 | 
				
			|||||||
    if( hostname_len + 1 == 0 )
 | 
					    if( hostname_len + 1 == 0 )
 | 
				
			||||||
        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 | 
					        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if( hostname_len > MBEDTLS_SSL_MAX_HOST_NAME )
 | 
					    if( hostname_len > MBEDTLS_SSL_MAX_HOST_NAME_LEN )
 | 
				
			||||||
        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 | 
					        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ssl->hostname = mbedtls_calloc( 1, hostname_len + 1 );
 | 
					    ssl->hostname = mbedtls_calloc( 1, hostname_len + 1 );
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user