mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 05:25:29 +00:00
Merge remote-tracking branch 'origin/mbedtls-2.16' into mbedtls-2.16-restricted
* origin/mbedtls-2.16: Fix uninitialized variable in x509_crt Fix the license header of hkdf Add ChangeLog entry fix memory leak in mpi_miller_rabin()
This commit is contained in:
commit
e7e55158f8
|
@ -43,6 +43,11 @@ Bugfix
|
||||||
* Fix propagation of restart contexts in restartable EC operations.
|
* Fix propagation of restart contexts in restartable EC operations.
|
||||||
This could previously lead to segmentation faults in builds using an
|
This could previously lead to segmentation faults in builds using an
|
||||||
address-sanitizer and enabling but not using MBEDTLS_ECP_RESTARTABLE.
|
address-sanitizer and enabling but not using MBEDTLS_ECP_RESTARTABLE.
|
||||||
|
* Fix memory leak in in mpi_miller_rabin(). Contributed by
|
||||||
|
Jens Wiklander <jens.wiklander@linaro.org> in #2363
|
||||||
|
* Improve code clarity in x509_crt module, removing false-positive
|
||||||
|
uninitialized variable warnings on some recent toolchains (GCC8, etc).
|
||||||
|
Discovered and fixed by Andy Gross (Linaro), #2392.
|
||||||
|
|
||||||
Changes
|
Changes
|
||||||
* Make it easier to define MBEDTLS_PARAM_FAILED as assert (which config.h
|
* Make it easier to define MBEDTLS_PARAM_FAILED as assert (which config.h
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
* specified by RFC 5869.
|
* specified by RFC 5869.
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2016-2018, ARM Limited, All Rights Reserved
|
* Copyright (C) 2016-2019, ARM Limited, All Rights Reserved
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
|
|
@ -2351,7 +2351,8 @@ static int mpi_miller_rabin( const mbedtls_mpi *X, size_t rounds,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count++ > 30) {
|
if (count++ > 30) {
|
||||||
return MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
|
ret = MBEDTLS_ERR_MPI_NOT_ACCEPTABLE;
|
||||||
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
} while ( mbedtls_mpi_cmp_mpi( &A, &W ) >= 0 ||
|
} while ( mbedtls_mpi_cmp_mpi( &A, &W ) >= 0 ||
|
||||||
|
|
|
@ -2087,15 +2087,13 @@ check_signature:
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
*r_parent = parent;
|
||||||
|
*r_signature_is_good = signature_is_good;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( parent != NULL )
|
if( parent == NULL )
|
||||||
{
|
|
||||||
*r_parent = parent;
|
|
||||||
*r_signature_is_good = signature_is_good;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
*r_parent = fallback_parent;
|
*r_parent = fallback_parent;
|
||||||
*r_signature_is_good = fallback_signature_is_good;
|
*r_signature_is_good = fallback_signature_is_good;
|
||||||
|
|
Loading…
Reference in a new issue