Remove the no-rijndael option

Rijndael is an old name for AES.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>

diff --git a/CHANGES b/CHANGES
index d3d4ca96689441b7d268004bccdcbda55ca72182..cdc85181a5a2e37a66353fc60ad590f10587054d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 1.0.2g and 1.1.0  [xx XXX xxxx]
 
 
  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]
 
   *) Removed the mk1mf build scripts.
      [Richard Levitte]
 

diff --git a/Configure b/Configure
index e7f8fcde91fadfea6a98d32719ca7f5d87d43089..cf6f1687c539d9f9fa0f4679f90e61d83436f27f 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -290,7 +290,6 @@ my @disablables = (
     "rc5",
     "rdrand",
     "rfc3779",
     "rc5",
     "rdrand",
     "rfc3779",

-    "rijndael",                        # Old AES name

     "ripemd",
     "rmd160",
     "rsa",
     "ripemd",
     "rmd160",
     "rsa",


@@ -356,7 +355,6 @@ my @disable_cascades = (
     "ssl"              => [ "ssl3" ],
     "ssl3-method"      => [ "ssl3" ],
     "zlib"             => [ "zlib-dynamic" ],
     "ssl"              => [ "ssl3" ],
     "ssl3-method"      => [ "ssl3" ],
     "zlib"             => [ "zlib-dynamic" ],

-    "rijndael"         => [ "aes" ],

     "des"              => [ "mdc2" ],
     "ec"               => [ "ecdsa", "ecdh" ],
 
     "des"              => [ "mdc2" ],
     "ec"               => [ "ecdsa", "ecdh" ],