mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-04 04:32:24 -05:00 
			
		
		
		
	Use ecdh_setup instead of ecp_group_load
Align files with development to ensure the same state of repositories.
This commit is contained in:
		
							parent
							
								
									c470b6b021
								
							
						
					
					
						commit
						f093a3dc61
					
				@ -3088,7 +3088,7 @@ curve_matching_done:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        MBEDTLS_SSL_DEBUG_MSG( 2, ( "ECDHE curve: %s", (*curve)->name ) );
 | 
					        MBEDTLS_SSL_DEBUG_MSG( 2, ( "ECDHE curve: %s", (*curve)->name ) );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if( ( ret = mbedtls_ecp_group_load( &ssl->handshake->ecdh_ctx.grp,
 | 
					        if( ( ret = mbedtls_ecdh_setup( &ssl->handshake->ecdh_ctx,
 | 
				
			||||||
                                        (*curve)->grp_id ) ) != 0 )
 | 
					                                        (*curve)->grp_id ) ) != 0 )
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ecp_group_load", ret );
 | 
					            MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ecp_group_load", ret );
 | 
				
			||||||
 | 
				
			|||||||
@ -278,7 +278,7 @@ void ecdh_exchange( int id )
 | 
				
			|||||||
    mbedtls_ecdh_init( &cli );
 | 
					    mbedtls_ecdh_init( &cli );
 | 
				
			||||||
    memset( &rnd_info, 0x00, sizeof( rnd_pseudo_info ) );
 | 
					    memset( &rnd_info, 0x00, sizeof( rnd_pseudo_info ) );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	TEST_ASSERT( mbedtls_ecp_group_load( &srv.grp, id ) == 0 ); 
 | 
						TEST_ASSERT( mbedtls_ecdh_setup( &srv, id ) == 0 );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    memset( buf, 0x00, sizeof( buf ) ); vbuf = buf;
 | 
					    memset( buf, 0x00, sizeof( buf ) ); vbuf = buf;
 | 
				
			||||||
    TEST_ASSERT( mbedtls_ecdh_make_params( &srv, &len, buf, 1000,
 | 
					    TEST_ASSERT( mbedtls_ecdh_make_params( &srv, &len, buf, 1000,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user