From 431f42d531dcd2098a8afa8b331bbc3e32658ebd Mon Sep 17 00:00:00 2001
From: Janos Follath <janos.follath@arm.com>
Date: Wed, 9 Dec 2020 16:46:30 +0000
Subject: [PATCH] Add missing Changelog entry

Signed-off-by: Janos Follath <janos.follath@arm.com>
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f7aa3ab1a..024dd39c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ Security
      Johan Malmgren and Johan Uppman Bruce from Sectra.
 
 Bugfix
+   * Fix an invalid (but nonzero) return code from mbedtls_pk_parse_subpubkey()
+     when the input has trailing garbage. Fixes #2512.
    * Fix rsa_prepare_blinding() to retry when the blinding value is not
      invertible (mod N), instead of returning MBEDTLS_ERR_RSA_RNG_FAILED. This
      addresses a regression but is rare in practice (approx. 1 in 2/sqrt(N)).