From 6013004fa922febabdfde40abe498b7756235cab Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Wed, 14 Feb 2018 11:33:30 +0100
Subject: [PATCH] Note in the changelog that this fixes an interoperability
 issue.

Fixes #1339
---
 ChangeLog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 56342e6ac..932e28065 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,9 @@ mbed TLS ChangeLog (Sorted per branch, date)
 Features
    * Extend PKCS#8 interface by introducing support for the entire SHA
      algorithms family when encrypting private keys using PKCS#5 v2.0.
-     Submitted by Antonio Quartulli, OpenVPN Inc.
+     This allows reading encrypted PEM files produced by software that
+     uses PBKDF2-SHA2, such as OpenSSL 1.1. Submitted by Antonio Quartulli,
+     OpenVPN Inc. Fixes #1339
 
 Bugfix
    * Fix setting version TLSv1 as minimal version, even if TLS 1