Merge the engine branch into the main trunk. All conflicts resolved.

At the same time, add VMS support for Rijndael.

1 files changed, 10 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index 2baa11c1af..eb4715df04 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,16 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
+  *) Add VMS support for the Rijndael code
+     [Richard Levitte]
+
+  *) Added untested support for Nuron crypto accelerator.
+     [Ben Laurie]
+
+  *) Add support for external cryptographic devices.  This code was
+     previously distributed separately as the "engine" branch.
+     [Geoff Thorpe, Richard Levitte]
+
   *) Rework the filename-translation in the DSO code. It is now possible to
      have far greater control over how a "name" is turned into a filename
      depending on the operating environment and any oddities about the