diff options
author | Richard Levitte <levitte@openssl.org> | 2002-01-02 16:55:35 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2002-01-02 16:55:35 +0000 |
commit | 6f9079fd505c28961049a732e33e662530bdad21 (patch) | |
tree | 4c5850b3d621185192a0755809601d9e4ab72291 /util | |
parent | c938563a81d48e1d23bddcf9283d4961794db132 (diff) |
Because Rijndael is more known as AES, use crypto/aes instead of
crypto/rijndael. Additionally, I applied the AES integration patch
from Stephen Sprunk <stephen@sprunk.org> and fiddled it to work
properly with the normal EVP constructs (and incidently work the same
way as all other symmetric cipher implementations).
This results in an API that looks a lot like the rest of the OpenSSL
cipher suite.
Diffstat (limited to 'util')
-rwxr-xr-x | util/mk1mf.pl | 4 | ||||
-rwxr-xr-x | util/mkdef.pl | 3 | ||||
-rwxr-xr-x | util/mkfiles.pl | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 014c4df0b2..fdaf642c65 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -92,7 +92,7 @@ $no_mdc2=1 if ($no_des); $no_ssl3=1 if ($no_md5 || $no_sha); $no_ssl3=1 if ($no_rsa && $no_dh); -$no_ssl2=1 if ($no_md5 || $no_rsa); +$no_ssl2=1 if ($no_md5); $no_ssl2=1 if ($no_rsa); $out_def="out"; @@ -873,7 +873,7 @@ sub read_options elsif (/^no-dsa$/) { $no_dsa=1; } elsif (/^no-dh$/) { $no_dh=1; } elsif (/^no-hmac$/) { $no_hmac=1; } - elsif (/^no-rijndael$/) { $no_rijndael=1; } + elsif (/^no-aes$/) { $no_aes=1; } elsif (/^no-asm$/) { $no_asm=1; } elsif (/^nasm$/) { $nasm=1; } elsif (/^gaswin$/) { $gaswin=1; } diff --git a/util/mkdef.pl b/util/mkdef.pl index 9243c0bb61..071036a6d2 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -208,8 +208,7 @@ $crypto.=" crypto/md5/md5.h" ; # unless $no_md5; $crypto.=" crypto/mdc2/mdc2.h" ; # unless $no_mdc2; $crypto.=" crypto/sha/sha.h" ; # unless $no_sha; $crypto.=" crypto/ripemd/ripemd.h" ; # unless $no_ripemd; -$crypto.=" crypto/rijndael/rijndael.h" ; # unless $no_aes; -$crypto.=" crypto/rijndael/rd_fst.h" ; # unless $no_aes; +$crypto.=" crypto/aes/aes.h" ; # unless $no_aes; $crypto.=" crypto/bn/bn.h"; $crypto.=" crypto/rsa/rsa.h" ; # unless $no_rsa; diff --git a/util/mkfiles.pl b/util/mkfiles.pl index ef72e7223b..29e1404c69 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -23,7 +23,7 @@ my @dirs = ( "crypto/idea", "crypto/bf", "crypto/cast", -"crypto/rijndael", +"crypto/aes", "crypto/bn", "crypto/rsa", "crypto/dsa", |