mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-03 12:11:27 -05:00 
			
		
		
		
	Merge remote-tracking branch 'public/pr/1721' into development-restricted
This commit is contained in:
		
						commit
						b6cdf980bc
					
				@ -452,11 +452,16 @@ void mbedtls_dhm_free( mbedtls_dhm_context *ctx )
 | 
				
			|||||||
    if( ctx == NULL )
 | 
					    if( ctx == NULL )
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->pX ); mbedtls_mpi_free( &ctx->Vf );
 | 
					    mbedtls_mpi_free( &ctx->pX );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->Vi ); mbedtls_mpi_free( &ctx->RP );
 | 
					    mbedtls_mpi_free( &ctx->Vf );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->K  ); mbedtls_mpi_free( &ctx->GY );
 | 
					    mbedtls_mpi_free( &ctx->Vi );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->GX ); mbedtls_mpi_free( &ctx->X  );
 | 
					    mbedtls_mpi_free( &ctx->RP );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->G  ); mbedtls_mpi_free( &ctx->P  );
 | 
					    mbedtls_mpi_free( &ctx->K  );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->GY );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->GX );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->X  );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->G  );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->P  );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_dhm_context ) );
 | 
					    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_dhm_context ) );
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -423,9 +423,11 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void mbedtls_pem_free( mbedtls_pem_context *ctx )
 | 
					void mbedtls_pem_free( mbedtls_pem_context *ctx )
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if( ctx->buf != NULL )
 | 
					    if ( ctx->buf != NULL )
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
        mbedtls_platform_zeroize( ctx->buf, ctx->buflen );
 | 
					        mbedtls_platform_zeroize( ctx->buf, ctx->buflen );
 | 
				
			||||||
    mbedtls_free( ctx->buf );
 | 
					        mbedtls_free( ctx->buf );
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    mbedtls_free( ctx->info );
 | 
					    mbedtls_free( ctx->info );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_pem_context ) );
 | 
					    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_pem_context ) );
 | 
				
			||||||
 | 
				
			|||||||
@ -66,10 +66,11 @@ void mbedtls_pk_init( mbedtls_pk_context *ctx )
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
void mbedtls_pk_free( mbedtls_pk_context *ctx )
 | 
					void mbedtls_pk_free( mbedtls_pk_context *ctx )
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if( ctx == NULL || ctx->pk_info == NULL )
 | 
					    if( ctx == NULL )
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ctx->pk_info->ctx_free_func( ctx->pk_ctx );
 | 
					    if ( ctx->pk_info != NULL )
 | 
				
			||||||
 | 
					        ctx->pk_info->ctx_free_func( ctx->pk_ctx );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_pk_context ) );
 | 
					    mbedtls_platform_zeroize( ctx, sizeof( mbedtls_pk_context ) );
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -2484,14 +2484,20 @@ void mbedtls_rsa_free( mbedtls_rsa_context *ctx )
 | 
				
			|||||||
    if( ctx == NULL )
 | 
					    if( ctx == NULL )
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->Vi ); mbedtls_mpi_free( &ctx->Vf );
 | 
					    mbedtls_mpi_free( &ctx->Vi );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->RN ); mbedtls_mpi_free( &ctx->D  );
 | 
					    mbedtls_mpi_free( &ctx->Vf );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->Q  ); mbedtls_mpi_free( &ctx->P  );
 | 
					    mbedtls_mpi_free( &ctx->RN );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->E  ); mbedtls_mpi_free( &ctx->N  );
 | 
					    mbedtls_mpi_free( &ctx->D  );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->Q  );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->P  );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->E  );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->N  );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if !defined(MBEDTLS_RSA_NO_CRT)
 | 
					#if !defined(MBEDTLS_RSA_NO_CRT)
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->RQ ); mbedtls_mpi_free( &ctx->RP );
 | 
					    mbedtls_mpi_free( &ctx->RQ );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->QP ); mbedtls_mpi_free( &ctx->DQ );
 | 
					    mbedtls_mpi_free( &ctx->RP );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->QP );
 | 
				
			||||||
 | 
					    mbedtls_mpi_free( &ctx->DQ );
 | 
				
			||||||
    mbedtls_mpi_free( &ctx->DP );
 | 
					    mbedtls_mpi_free( &ctx->DP );
 | 
				
			||||||
#endif /* MBEDTLS_RSA_NO_CRT */
 | 
					#endif /* MBEDTLS_RSA_NO_CRT */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user