synchronize with OpenSSL-engine-0_9_6-stable

diff --git a/CHANGES b/CHANGES
index 50b07c70f4718b3fe8b6720ade203f2c30a35cc3..35b77ba297d1842a8a377d721efc2b86056c9cea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -57,6 +57,10 @@
      value is 0.
      [Richard Levitte]
 
+  *) [In 0.9.6c-engine release:]
+     Fix a crashbug and a logic bug in hwcrhk_load_pubkey()
+     [Toomas Kiisk <vix@cyber.ee> via Richard Levitte]
+
   *) Add the configuration target linux-s390x.
      [Neale Ferguson <Neale.Ferguson@SoftwareAG-USA.com> via Richard Levitte]