commit a8e5a4730d1e42927f291158588cf269cd6f8b46
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Jun 09 14:45:14 2017 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Jun 09 14:46:50 2017 +0200
tree 4ec8fb00c94a3c39e9e3b101b2666bbe0e0bdb64
parent 740665e43b6a85ed9c4b47c69478326be01011b7

Merge near-duplicate ChangeLog entries

As agreed with Gilles on the PR discussion page

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 626f70d..09b6c99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,6 @@
      option if needed.
    * Fixed offset in FALLBACK_SCSV parsing that caused TLS server to fail to
      detect it sometimes. Reported by Hugo Leisink. #810
-   * 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
      potential Bleichenbacher/BERserk-style attack.