[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  dc110177defb6bd50cc2271f7e3590cc3ca04a52 (commit)
      from  83bd31da23c668388ff20722ed1fa062590c9860 (commit)


- Log -----------------------------------------------------------------
commit dc110177defb6bd50cc2271f7e3590cc3ca04a52
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 21 11:51:16 2016 +0000

    Remove the no-rijndael option
    
    Rijndael is an old name for AES.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 CHANGES   | 3 +++
 Configure | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index d3d4ca9..cdc8518 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 1.0.2g and 1.1.0  [xx XXX xxxx]
 
+  *) Removed no-rijndael as a config option. Rijndael is an old name for AES.
+     [Matt Caswell}
+
   *) Removed the mk1mf build scripts.
      [Richard Levitte]
 
diff --git a/Configure b/Configure
index e7f8fcd..cf6f168 100755
--- a/Configure
+++ b/Configure
@@ -290,7 +290,6 @@ my @disablables = (
     "rc5",
     "rdrand",
     "rfc3779",
-    "rijndael",			# Old AES name
     "ripemd",
     "rmd160",
     "rsa",
@@ -356,7 +355,6 @@ my @disable_cascades = (
     "ssl"		=> [ "ssl3" ],
     "ssl3-method"	=> [ "ssl3" ],
     "zlib"		=> [ "zlib-dynamic" ],
-    "rijndael"		=> [ "aes" ],
     "des"		=> [ "mdc2" ],
     "ec"		=> [ "ecdsa", "ecdh" ],