commit 67df3e62e7e24309556a8ae11fabbf830579db59
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Jun 09 14:46:27 2017 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Jun 09 14:48:03 2017 +0200
tree b58eae31c8baafc15b96fc6b379338b5d2ec7c2f
parent 89306daef547e57f9cfd937410a71d9b5c688a91

Merge near-duplicate ChangeLog entries

As agreed with Gilles on the PR discussion page

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2af76a9..dbffdf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,9 +11,7 @@
    * Wipe stack buffers in RSA private key operations
      (rsa_rsaes_pkcs1_v15_decrypt(), rsa_rsaes_oaep_decrypt).
      Found by Laurent Simon.
-   * Tighten ASN.1 parsing of RSA PKCS#1 v1.5 signatures, to avoid a
-     potential Bleichenbacher-style attack.
-   * Tighten parsing of RSA PKCS#1 v1.5 signatures, to avoid a
+    Tighten parsing of RSA PKCS#1 v1.5 signatures, to avoid a
      potential Bleichenbacher/BERserk-style attack.
 
 Bugfix