commit 43df7e6bb725bc84c1f35c0ca65a112c95eb4817
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Jun 09 14:45:51 2017 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Jun 09 14:47:42 2017 +0200
tree 90abcbd19424d4f84b05024367760ea54b4591c8
parent e2356722c0ebd4f5afe63ca794e49d10ec1024f6

Merge near-duplicate ChangeLog entries

As agreed with Gilles on the PR discussion page

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b6bb59b..0a47c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,8 +16,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.