aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2019-04-17 12:28:43 +0200
committerJoakim Bech <joakim.bech@linaro.org>2019-04-18 14:52:07 +0700
commit2976273f390e0654fb95928838ed0e251be8451f (patch)
treea820b4c5e8163d82de3de621d12264a6f657781d
parentb99a4a1850c2ce661156ebc25f48d47efa8a41c1 (diff)
libmbedtls: preserve mempool usage on reinit
be040a3e949b ("libmbedtls: preserve mempool usage on reinit") from branch import/mbedtls-2.16.0 Preserve the use_mempool field when reinitializing X in mbedtls_mpi_read_binary(). Acked-by: Etienne Carriere <etienne.carriere@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r--lib/libmbedtls/mbedtls/library/bignum.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libmbedtls/mbedtls/library/bignum.c b/lib/libmbedtls/mbedtls/library/bignum.c
index 5d4beca4..8279d7d6 100644
--- a/lib/libmbedtls/mbedtls/library/bignum.c
+++ b/lib/libmbedtls/mbedtls/library/bignum.c
@@ -777,8 +777,10 @@ int mbedtls_mpi_read_binary( mbedtls_mpi *X, const unsigned char *buf, size_t bu
/* Ensure that target MPI has exactly the necessary number of limbs */
if( X->n != limbs )
{
+ short use_mempool = X->use_mempool;
+
mbedtls_mpi_free( X );
- mbedtls_mpi_init( X );
+ mpi_init( X, use_mempool );
MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, limbs ) );
}