From: Matt Caswell <matt@openssl.org>
Date: Mon, 21 Mar 2016 11:51:16 +0000 (+0000)
Subject: Remove the no-rijndael option
X-Git-Tag: OpenSSL_1_1_0-pre5~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc110177defb6bd50cc2271f7e3590cc3ca04a52;p=openssl

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 d3d4ca9668..cdc85181a5 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 e7f8fcde91..cf6f1687c5 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" ],