mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			
							parent
							
								
									60f383e01f
								
							
						
					
					
						commit
						eb00fbadb4
					
				| 
						 | 
				
			
			@ -1 +1 @@
 | 
			
		|||
mbedtls-2.19.0
 | 
			
		||||
mbedtls-2.19.1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -27,7 +27,7 @@
 | 
			
		|||
#
 | 
			
		||||
 | 
			
		||||
# Set the mbed TLS release to import (this can/should be edited before import)
 | 
			
		||||
MBED_TLS_RELEASE ?= mbedtls-2.19.0
 | 
			
		||||
MBED_TLS_RELEASE ?= mbedtls-2.19.1
 | 
			
		||||
MBED_TLS_REPO_URL ?= git@github.com:ARMmbed/mbedtls-restricted.git
 | 
			
		||||
 | 
			
		||||
# Translate between mbed TLS namespace and mbed namespace
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -305,6 +305,14 @@
 | 
			
		|||
#error "MBEDTLS_MEMORY_BUFFER_ALLOC_C defined, but not all prerequisites"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(MBEDTLS_MEMORY_BACKTRACE) && !defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
 | 
			
		||||
#error "MBEDTLS_MEMORY_BACKTRACE defined, but not all prerequesites"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(MBEDTLS_MEMORY_DEBUG) && !defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
 | 
			
		||||
#error "MBEDTLS_MEMORY_DEBUG defined, but not all prerequesites"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(MBEDTLS_PADLOCK_C) && !defined(MBEDTLS_HAVE_ASM)
 | 
			
		||||
#error "MBEDTLS_PADLOCK_C defined, but not all prerequisites"
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -970,7 +970,8 @@ struct mbedtls_ssl_config
 | 
			
		|||
     *  tls_prf and random bytes. Should replace f_export_keys    */
 | 
			
		||||
    int (*f_export_keys_ext)( void *, const unsigned char *,
 | 
			
		||||
                const unsigned char *, size_t, size_t, size_t,
 | 
			
		||||
                unsigned char[32], unsigned char[32], mbedtls_tls_prf_types );
 | 
			
		||||
                const unsigned char[32], const unsigned char[32],
 | 
			
		||||
                mbedtls_tls_prf_types );
 | 
			
		||||
    void *p_export_keys;            /*!< context for key export callback    */
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1925,8 +1926,8 @@ typedef int mbedtls_ssl_export_keys_ext_t( void *p_expkey,
 | 
			
		|||
                                           size_t maclen,
 | 
			
		||||
                                           size_t keylen,
 | 
			
		||||
                                           size_t ivlen,
 | 
			
		||||
                                           unsigned char client_random[32],
 | 
			
		||||
                                           unsigned char server_random[32],
 | 
			
		||||
                                           const unsigned char client_random[32],
 | 
			
		||||
                                           const unsigned char server_random[32],
 | 
			
		||||
                                           mbedtls_tls_prf_types tls_prf_type );
 | 
			
		||||
#endif /* MBEDTLS_SSL_EXPORT_KEYS */
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1427,9 +1427,8 @@ static int ssl_populate_transform( mbedtls_ssl_transform *transform,
 | 
			
		|||
                                      master, keyblk,
 | 
			
		||||
                                      mac_key_len, keylen,
 | 
			
		||||
                                      iv_copy_len,
 | 
			
		||||
                                      /* work around bug in exporter type */
 | 
			
		||||
                                      (unsigned char *) randbytes + 32,
 | 
			
		||||
                                      (unsigned char *) randbytes,
 | 
			
		||||
                                      randbytes + 32,
 | 
			
		||||
                                      randbytes,
 | 
			
		||||
                                      tls_prf_get_type( tls_prf ) );
 | 
			
		||||
    }
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue