The experimental Rijndael code moved to the main trunk.

make update done.

diff --git a/CHANGES b/CHANGES
index c306920548ff6ab81f6eb0de6bbf5055ea7646c0..aca771190c18a8137404531b1098e43ac96603bd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,9 @@
      this case.
      [Steve Henson]
 
+  *) Added the beginnings of Rijndael support.
+     [Ben Laurie]
+
   *) Fix for bug in DirectoryString mask setting. Add support for
      X509_NAME_print_ex() in 'req' and X509_print_ex() function
      to allow certificate printing to more controllable, additional

diff --git a/Makefile.org b/Makefile.org
index d0b016d021e108567fb0ff55cf9575ef4ae855c8..557cc4304314919ff9ceb4b50f72c87145ae5db1 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -161,7 +161,7 @@ SHLIBDIRS= crypto ssl
 SDIRS=  \
        md2 md4 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
-       bn rsa dsa dh dso \
+       bn rsa dsa dh dso rijndael \
        buffer bio stack lhash rand err objects \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
 

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 438c052610662abcebc2ae8341266c386c454119..31fe2803959c930bc7f4c003e803a88191fa970d 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -158,6 +158,7 @@ app_rand.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 app_rand.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
 app_rand.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 app_rand.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+app_rand.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 app_rand.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 app_rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 app_rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -178,7 +179,8 @@ apps.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 apps.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 apps.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
 apps.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-apps.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+apps.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+apps.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 apps.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 apps.o: ../include/openssl/sha.h ../include/openssl/stack.h
 apps.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -199,6 +201,7 @@ asn1pars.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 asn1pars.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 asn1pars.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 asn1pars.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+asn1pars.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 asn1pars.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 asn1pars.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -218,7 +221,8 @@ ca.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 ca.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ca.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ca.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ca.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ca.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+ca.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 ca.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ca.o: ../include/openssl/sha.h ../include/openssl/stack.h
 ca.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
@@ -240,7 +244,8 @@ ciphers.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 ciphers.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ciphers.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ciphers.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ciphers.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+ciphers.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 ciphers.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ciphers.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 ciphers.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -263,6 +268,7 @@ crl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 crl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 crl.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 crl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+crl.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 crl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 crl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 crl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -284,6 +290,7 @@ crl2p7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 crl2p7.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 crl2p7.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 crl2p7.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+crl2p7.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 crl2p7.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 crl2p7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 crl2p7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -304,6 +311,7 @@ dgst.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 dgst.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 dgst.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 dgst.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+dgst.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 dgst.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 dgst.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 dgst.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -323,7 +331,8 @@ dh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 dh.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 dh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 dh.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-dh.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+dh.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+dh.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 dh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 dh.o: ../include/openssl/sha.h ../include/openssl/stack.h
 dh.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -344,6 +353,7 @@ dsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 dsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 dsa.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 dsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+dsa.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 dsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 dsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -364,6 +374,7 @@ dsaparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 dsaparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 dsaparam.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+dsaparam.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 dsaparam.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 dsaparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 dsaparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -384,7 +395,8 @@ enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 enc.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 enc.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-enc.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+enc.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+enc.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 enc.o: ../include/openssl/sha.h ../include/openssl/stack.h
 enc.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -405,7 +417,8 @@ errstr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 errstr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 errstr.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-errstr.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+errstr.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+errstr.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 errstr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 errstr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 errstr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -428,7 +441,8 @@ gendh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 gendh.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 gendh.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 gendh.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-gendh.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+gendh.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+gendh.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 gendh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h
 gendh.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -449,6 +463,7 @@ gendsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 gendsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 gendsa.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 gendsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+gendsa.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 gendsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 gendsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -469,6 +484,7 @@ genrsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 genrsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 genrsa.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 genrsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+genrsa.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 genrsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 genrsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 genrsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -489,6 +505,7 @@ nseq.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 nseq.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 nseq.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 nseq.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+nseq.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 nseq.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 nseq.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 nseq.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -509,7 +526,8 @@ openssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 openssl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 openssl.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-openssl.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+openssl.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+openssl.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 openssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 openssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -532,7 +550,8 @@ passwd.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 passwd.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 passwd.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-passwd.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+passwd.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+passwd.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 passwd.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 passwd.o: ../include/openssl/sha.h ../include/openssl/stack.h
 passwd.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -553,7 +572,8 @@ pkcs12.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 pkcs12.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 pkcs12.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
 pkcs12.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-pkcs12.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+pkcs12.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+pkcs12.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 pkcs12.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 pkcs12.o: ../include/openssl/sha.h ../include/openssl/stack.h
 pkcs12.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -574,6 +594,7 @@ pkcs7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 pkcs7.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 pkcs7.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 pkcs7.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+pkcs7.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 pkcs7.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 pkcs7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 pkcs7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -594,7 +615,8 @@ pkcs8.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 pkcs8.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 pkcs8.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
 pkcs8.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-pkcs8.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+pkcs8.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+pkcs8.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 pkcs8.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 pkcs8.o: ../include/openssl/sha.h ../include/openssl/stack.h
 pkcs8.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -614,7 +636,8 @@ rand.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 rand.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-rand.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+rand.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+rand.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 rand.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
 rand.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -635,6 +658,7 @@ req.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 req.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 req.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 req.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+req.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 req.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 req.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 req.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -656,6 +680,7 @@ rsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 rsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 rsa.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 rsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+rsa.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 rsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -676,6 +701,7 @@ rsautl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 rsautl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 rsautl.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 rsautl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+rsautl.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 rsautl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 rsautl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 rsautl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -696,7 +722,8 @@ s_cb.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s_cb.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_cb.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s_cb.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_cb.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s_cb.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s_cb.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s_cb.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s_cb.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -719,7 +746,8 @@ s_client.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s_client.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s_client.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_client.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s_client.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_client.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s_client.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s_client.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s_client.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -743,7 +771,8 @@ s_server.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s_server.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s_server.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_server.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s_server.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_server.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s_server.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s_server.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s_server.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s_server.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -767,6 +796,7 @@ s_socket.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 s_socket.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_socket.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 s_socket.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s_socket.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 s_socket.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 s_socket.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s_socket.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -790,7 +820,8 @@ s_time.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s_time.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s_time.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_time.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s_time.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_time.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s_time.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s_time.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s_time.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s_time.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -814,7 +845,8 @@ sess_id.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 sess_id.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 sess_id.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 sess_id.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-sess_id.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+sess_id.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+sess_id.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 sess_id.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 sess_id.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 sess_id.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -837,6 +869,7 @@ smime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 smime.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 smime.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 smime.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+smime.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 smime.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 smime.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 smime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -857,6 +890,7 @@ speed.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 speed.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
 speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 speed.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+speed.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 speed.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -878,6 +912,7 @@ spkac.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 spkac.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 spkac.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 spkac.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+spkac.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 spkac.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 spkac.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -898,6 +933,7 @@ verify.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 verify.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 verify.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 verify.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+verify.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 verify.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 verify.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 verify.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -917,7 +953,8 @@ version.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
 version.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 version.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
 version.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-version.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+version.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+version.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 version.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 version.o: ../include/openssl/sha.h ../include/openssl/stack.h
 version.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -938,6 +975,7 @@ x509.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 x509.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 x509.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 x509.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+x509.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 x509.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 x509.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 x509.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

diff --git a/apps/enc.c b/apps/enc.c
index 2101b4cc647786d57799eb0d380a0e2a68fb1d9a..14b82d5ba1458f32166989dd567c40d0f16ca4f3 100644 (file)
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -308,6 +308,11 @@ bad:
                                LN_rc5_cfb64, LN_rc5_ofb64);
                        BIO_printf(bio_err," -%-4s (%s)\n","rc5", LN_rc5_cbc);
 #endif
+#ifndef NO_RIJNDAEL
+                       BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s\n",
+                                  LN_rijndael_ecb_k128_b128,"","","","");
+#endif
+                       
                        goto end;
                        }
                argc--;

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index ae761da79f8410ef5c1a1346c0e5cd4520680c86..72e3fe7fde759eecd7dbf0500b9866e752825990 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -29,7 +29,7 @@ SDIRS=        md2 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
        bn rsa dsa dh dso \
        buffer bio stack lhash rand err objects \
-       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
+       evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp rijndael
 
 GENERAL=Makefile README crypto-lib.com install.com
 

diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index 269af4459323cd0dae39114d4b10d3053f43ac50..cb73cda47ba88e2487da9b2f333fcaa0937da88b 100644 (file)
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -171,7 +171,9 @@ a_digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 a_digest.o: ../../include/openssl/opensslconf.h
 a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 a_digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+a_digest.o: ../../include/openssl/rc5.h
+a_digest.o: ../../include/openssl/rijndael-alg-fst.h
+a_digest.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 a_digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 a_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 a_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -296,11 +298,12 @@ a_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 a_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 a_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_sign.o: ../cryptlib.h
+a_sign.o: ../../include/openssl/rijndael-alg-fst.h
+a_sign.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+a_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+a_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+a_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+a_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 a_strex.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_strex.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 a_strex.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -314,11 +317,12 @@ a_strex.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 a_strex.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 a_strex.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 a_strex.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-a_strex.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-a_strex.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-a_strex.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-a_strex.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_strex.o: charmap.h
+a_strex.o: ../../include/openssl/rijndael-alg-fst.h
+a_strex.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+a_strex.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+a_strex.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+a_strex.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+a_strex.o: ../../include/openssl/x509_vfy.h charmap.h
 a_strnid.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_strnid.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_strnid.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
@@ -374,7 +378,9 @@ a_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 a_verify.o: ../../include/openssl/opensslconf.h
 a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 a_verify.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_verify.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+a_verify.o: ../../include/openssl/rc5.h
+a_verify.o: ../../include/openssl/rijndael-alg-fst.h
+a_verify.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 a_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 a_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 a_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -453,7 +459,8 @@ d2i_pr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 d2i_pr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 d2i_pr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 d2i_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-d2i_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+d2i_pr.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+d2i_pr.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 d2i_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 d2i_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 d2i_pr.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -470,7 +477,8 @@ d2i_pu.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 d2i_pu.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 d2i_pu.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 d2i_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-d2i_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+d2i_pu.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+d2i_pu.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 d2i_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 d2i_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 d2i_pu.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -581,7 +589,8 @@ i2d_pr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 i2d_pr.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 i2d_pr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 i2d_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-i2d_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+i2d_pr.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+i2d_pr.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 i2d_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 i2d_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 i2d_pr.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -598,7 +607,8 @@ i2d_pu.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 i2d_pu.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 i2d_pu.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 i2d_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-i2d_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+i2d_pu.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+i2d_pu.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 i2d_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 i2d_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 i2d_pu.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -658,7 +668,8 @@ n_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 n_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 n_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 n_pkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-n_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+n_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+n_pkey.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 n_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 n_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 n_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -677,10 +688,12 @@ nsseq.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 nsseq.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 nsseq.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 nsseq.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-nsseq.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-nsseq.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-nsseq.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-nsseq.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+nsseq.o: ../../include/openssl/rijndael-alg-fst.h
+nsseq.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+nsseq.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+nsseq.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+nsseq.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+nsseq.o: ../../include/openssl/x509_vfy.h
 p5_pbe.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 p5_pbe.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 p5_pbe.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -696,11 +709,12 @@ p5_pbe.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p5_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p5_pbe.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 p5_pbe.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p5_pbe.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p5_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p5_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p5_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p5_pbe.o: ../cryptlib.h
+p5_pbe.o: ../../include/openssl/rijndael-alg-fst.h
+p5_pbe.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p5_pbe.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p5_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p5_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p5_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p5_pbev2.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 p5_pbev2.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 p5_pbev2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -716,11 +730,12 @@ p5_pbev2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p5_pbev2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p5_pbev2.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 p5_pbev2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p5_pbev2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p5_pbev2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p5_pbev2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p5_pbev2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p5_pbev2.o: ../cryptlib.h
+p5_pbev2.o: ../../include/openssl/rijndael-alg-fst.h
+p5_pbev2.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p5_pbev2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p5_pbev2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p5_pbev2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p5_pbev2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p7_dgst.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 p7_dgst.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 p7_dgst.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -735,7 +750,8 @@ p7_dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_dgst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_dgst.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_dgst.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_dgst.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p7_dgst.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_dgst.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_dgst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_dgst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -754,7 +770,8 @@ p7_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_enc.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p7_enc.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -773,7 +790,9 @@ p7_enc_c.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_enc_c.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_enc_c.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_enc_c.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_enc_c.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_enc_c.o: ../../include/openssl/rc5.h
+p7_enc_c.o: ../../include/openssl/rijndael-alg-fst.h
+p7_enc_c.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_enc_c.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_enc_c.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_enc_c.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -792,7 +811,8 @@ p7_evp.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_evp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_evp.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_evp.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_evp.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_evp.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p7_evp.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_evp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_evp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_evp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -811,7 +831,8 @@ p7_i_s.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_i_s.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_i_s.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_i_s.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_i_s.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_i_s.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p7_i_s.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_i_s.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_i_s.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_i_s.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -830,7 +851,8 @@ p7_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p7_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -849,7 +871,9 @@ p7_recip.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_recip.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_recip.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_recip.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_recip.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_recip.o: ../../include/openssl/rc5.h
+p7_recip.o: ../../include/openssl/rijndael-alg-fst.h
+p7_recip.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_recip.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_recip.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_recip.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -868,7 +892,8 @@ p7_s_e.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_s_e.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_s_e.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_s_e.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_s_e.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_s_e.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p7_s_e.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_s_e.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_s_e.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_s_e.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -887,7 +912,9 @@ p7_signd.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_signd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_signd.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_signd.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_signd.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_signd.o: ../../include/openssl/rc5.h
+p7_signd.o: ../../include/openssl/rijndael-alg-fst.h
+p7_signd.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_signd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_signd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_signd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -906,7 +933,9 @@ p7_signi.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p7_signi.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p7_signi.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p7_signi.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p7_signi.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_signi.o: ../../include/openssl/rc5.h
+p7_signi.o: ../../include/openssl/rijndael-alg-fst.h
+p7_signi.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p7_signi.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p7_signi.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p7_signi.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -925,7 +954,8 @@ p8_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p8_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p8_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p8_pkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p8_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p8_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p8_pkey.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p8_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p8_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p8_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -945,11 +975,13 @@ t_bitst.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 t_bitst.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 t_bitst.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 t_bitst.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-t_bitst.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-t_bitst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_bitst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_bitst.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-t_bitst.o: ../../include/openssl/x509v3.h ../cryptlib.h
+t_bitst.o: ../../include/openssl/rijndael-alg-fst.h
+t_bitst.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+t_bitst.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+t_bitst.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+t_bitst.o: ../cryptlib.h
 t_crl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 t_crl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 t_crl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -965,11 +997,13 @@ t_crl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 t_crl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 t_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 t_crl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-t_crl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-t_crl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_crl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_crl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-t_crl.o: ../../include/openssl/x509v3.h ../cryptlib.h
+t_crl.o: ../../include/openssl/rijndael-alg-fst.h
+t_crl.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+t_crl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+t_crl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+t_crl.o: ../cryptlib.h
 t_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 t_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 t_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
@@ -994,11 +1028,13 @@ t_req.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 t_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 t_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 t_req.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-t_req.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-t_req.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_req.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_req.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-t_req.o: ../../include/openssl/x509v3.h ../cryptlib.h
+t_req.o: ../../include/openssl/rijndael-alg-fst.h
+t_req.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+t_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+t_req.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+t_req.o: ../cryptlib.h
 t_spki.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 t_spki.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 t_spki.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1013,7 +1049,8 @@ t_spki.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 t_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 t_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 t_spki.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-t_spki.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+t_spki.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+t_spki.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 t_spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 t_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 t_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1033,11 +1070,13 @@ t_x509.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 t_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 t_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 t_x509.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-t_x509.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-t_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-t_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-t_x509.o: ../../include/openssl/x509v3.h ../cryptlib.h
+t_x509.o: ../../include/openssl/rijndael-alg-fst.h
+t_x509.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+t_x509.o: ../cryptlib.h
 t_x509a.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 t_x509a.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 t_x509a.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1052,7 +1091,8 @@ t_x509a.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 t_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 t_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 t_x509a.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-t_x509a.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+t_x509a.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+t_x509a.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 t_x509a.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 t_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 t_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1071,7 +1111,8 @@ x_algor.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_algor.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_algor.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_algor.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_algor.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_algor.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_algor.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_algor.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1090,7 +1131,9 @@ x_attrib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_attrib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_attrib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_attrib.o: ../../include/openssl/rc5.h
+x_attrib.o: ../../include/openssl/rijndael-alg-fst.h
+x_attrib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_attrib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_attrib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_attrib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1109,7 +1152,8 @@ x_cinf.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_cinf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_cinf.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_cinf.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_cinf.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_cinf.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_cinf.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_cinf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_cinf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_cinf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1128,7 +1172,8 @@ x_crl.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_crl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_crl.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_crl.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_crl.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_crl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_crl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1147,7 +1192,8 @@ x_exten.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_exten.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_exten.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_exten.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_exten.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_exten.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_exten.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1166,7 +1212,8 @@ x_info.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_info.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_info.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_info.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_info.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_info.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_info.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_info.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1185,7 +1232,8 @@ x_name.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_name.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_name.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_name.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_name.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_name.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1204,7 +1252,8 @@ x_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_pkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_pkey.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1223,7 +1272,9 @@ x_pubkey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_pubkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_pubkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_pubkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_pubkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_pubkey.o: ../../include/openssl/rc5.h
+x_pubkey.o: ../../include/openssl/rijndael-alg-fst.h
+x_pubkey.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_pubkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_pubkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_pubkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1242,7 +1293,8 @@ x_req.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_req.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_req.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_req.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_req.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_req.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1261,7 +1313,8 @@ x_sig.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_sig.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_sig.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_sig.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_sig.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_sig.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_sig.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_sig.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_sig.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_sig.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1280,7 +1333,8 @@ x_spki.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_spki.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_spki.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_spki.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_spki.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1299,7 +1353,8 @@ x_val.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_val.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_val.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_val.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_val.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_val.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_val.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_val.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_val.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_val.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1319,7 +1374,8 @@ x_x509.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_x509.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_x509.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_x509.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_x509.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -1339,7 +1395,8 @@ x_x509a.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x_x509a.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_x509a.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_x509a.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+x_x509a.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x_x509a.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x_x509a.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl
index 00caa9f7eb17943ee8269b4a2f1941d243ebf377..4ca495d2818488d9f809ba749679a569bd87447b 100644 (file)
--- a/crypto/bio/Makefile.ssl
+++ b/crypto/bio/Makefile.ssl
@@ -123,7 +123,8 @@ bf_buff.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 bf_buff.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 bf_buff.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bf_buff.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-bf_buff.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bf_buff.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+bf_buff.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 bf_buff.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 bf_buff.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 bf_buff.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -141,10 +142,11 @@ bf_nbio.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 bf_nbio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bf_nbio.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 bf_nbio.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-bf_nbio.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bf_nbio.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-bf_nbio.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-bf_nbio.o: ../cryptlib.h
+bf_nbio.o: ../../include/openssl/rijndael-alg-fst.h
+bf_nbio.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+bf_nbio.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bf_nbio.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bf_nbio.o: ../../include/openssl/symhacks.h ../cryptlib.h
 bf_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 bf_null.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -158,7 +160,8 @@ bf_null.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 bf_null.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 bf_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bf_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-bf_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bf_null.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+bf_null.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 bf_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 bf_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 bf_null.o: ../../include/openssl/symhacks.h ../cryptlib.h

diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl
index 42b9faa559f1b4c60afb9cd20822ccd2204b3101..a31bc78914bb8bc43637bd01c36d0e54ee032270 100644 (file)
--- a/crypto/err/Makefile.ssl
+++ b/crypto/err/Makefile.ssl
@@ -102,7 +102,8 @@ err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
 err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-err_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+err_all.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+err_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl
index fb9945db1684cb195fae6795accc91cf3b7af356..0f059047a922d30ea6d3cc60104e661e91c05256 100644 (file)
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -24,7 +24,7 @@ APPS=
 LIB=$(TOP)/libcrypto.a
 LIBSRC= encode.c digest.c evp_enc.c evp_key.c \
        e_des.c e_bf.c e_idea.c e_des3.c \
-       e_rc4.c names.c \
+       e_rc4.c e_rd.c names.c \
        e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
        m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c \
        m_dss.c m_dss1.c m_mdc2.c m_ripemd.c \
@@ -35,7 +35,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c \
 
 LIBOBJ=        encode.o digest.o evp_enc.o evp_key.o \
        e_des.o e_bf.o e_idea.o e_des3.o \
-       e_rc4.o names.o \
+       e_rc4.o e_rd.o names.o \
        e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o \
        m_null.o m_md2.o m_md4.o m_md5.o m_sha.o m_sha1.o \
        m_dss.o m_dss1.o m_mdc2.o m_ripemd.o \
@@ -111,7 +111,8 @@ bio_b64.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 bio_b64.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 bio_b64.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bio_b64.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-bio_b64.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bio_b64.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+bio_b64.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 bio_b64.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 bio_b64.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 bio_b64.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -128,7 +129,8 @@ bio_enc.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 bio_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 bio_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bio_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-bio_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bio_enc.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+bio_enc.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 bio_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 bio_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 bio_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -145,7 +147,8 @@ bio_md.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 bio_md.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 bio_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bio_md.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-bio_md.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bio_md.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+bio_md.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 bio_md.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 bio_md.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 bio_md.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -163,10 +166,11 @@ bio_ok.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 bio_ok.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 bio_ok.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 bio_ok.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-bio_ok.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bio_ok.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-bio_ok.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-bio_ok.o: ../cryptlib.h
+bio_ok.o: ../../include/openssl/rijndael-alg-fst.h
+bio_ok.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+bio_ok.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bio_ok.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bio_ok.o: ../../include/openssl/symhacks.h ../cryptlib.h
 c_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 c_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 c_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -180,7 +184,8 @@ c_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 c_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 c_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 c_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-c_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+c_all.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+c_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 c_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 c_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 c_all.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -198,7 +203,8 @@ c_allc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 c_allc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 c_allc.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 c_allc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-c_allc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+c_allc.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+c_allc.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 c_allc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 c_allc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 c_allc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -217,7 +223,8 @@ c_alld.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 c_alld.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 c_alld.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 c_alld.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-c_alld.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+c_alld.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+c_alld.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 c_alld.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 c_alld.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 c_alld.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -235,7 +242,8 @@ digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 digest.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+digest.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+digest.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 digest.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -252,7 +260,8 @@ e_bf.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_bf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_bf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_bf.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_bf.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_bf.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_bf.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_bf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_bf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_bf.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
@@ -269,7 +278,8 @@ e_cast.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_cast.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_cast.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_cast.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_cast.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_cast.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_cast.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_cast.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_cast.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_cast.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
@@ -286,7 +296,8 @@ e_des.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_des.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_des.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_des.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_des.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_des.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_des.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_des.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_des.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_des.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
@@ -303,7 +314,8 @@ e_des3.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_des3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_des3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_des3.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_des3.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_des3.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_des3.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_des3.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_des3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_des3.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
@@ -320,7 +332,8 @@ e_idea.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_idea.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_idea.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_idea.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_idea.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_idea.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_idea.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_idea.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_idea.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_idea.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
@@ -337,7 +350,8 @@ e_null.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_null.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_null.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_null.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_null.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -354,7 +368,8 @@ e_rc2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_rc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_rc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_rc2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_rc2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_rc2.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_rc2.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_rc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_rc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_rc2.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
@@ -371,7 +386,8 @@ e_rc4.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_rc4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_rc4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_rc4.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_rc4.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_rc4.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_rc4.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_rc4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_rc4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_rc4.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -388,10 +404,28 @@ e_rc5.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 e_rc5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_rc5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_rc5.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-e_rc5.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_rc5.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_rc5.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 e_rc5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 e_rc5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 e_rc5.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
+e_rd.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+e_rd.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+e_rd.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+e_rd.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+e_rd.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+e_rd.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+e_rd.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_rd.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+e_rd.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+e_rd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+e_rd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_rd.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_rd.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+e_rd.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+e_rd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_rd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_rd.o: ../../include/openssl/symhacks.h
 e_xcbc_d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_xcbc_d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 e_xcbc_d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -406,10 +440,11 @@ e_xcbc_d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_xcbc_d.o: ../../include/openssl/opensslconf.h
 e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 e_xcbc_d.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_xcbc_d.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_xcbc_d.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-e_xcbc_d.o: ../cryptlib.h
+e_xcbc_d.o: ../../include/openssl/rijndael-alg-fst.h
+e_xcbc_d.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+e_xcbc_d.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_xcbc_d.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_xcbc_d.o: ../../include/openssl/symhacks.h ../cryptlib.h
 encode.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 encode.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 encode.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -423,7 +458,8 @@ encode.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 encode.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 encode.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 encode.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-encode.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+encode.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+encode.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 encode.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 encode.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 encode.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -440,7 +476,8 @@ evp_enc.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 evp_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 evp_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 evp_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-evp_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+evp_enc.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+evp_enc.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 evp_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 evp_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 evp_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h
@@ -456,7 +493,8 @@ evp_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 evp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 evp_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 evp_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-evp_err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+evp_err.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+evp_err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 evp_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 evp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 evp_err.o: ../../include/openssl/symhacks.h
@@ -474,11 +512,12 @@ evp_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 evp_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 evp_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 evp_key.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-evp_key.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-evp_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_key.o: ../cryptlib.h
+evp_key.o: ../../include/openssl/rijndael-alg-fst.h
+evp_key.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+evp_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_key.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+evp_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 evp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 evp_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 evp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -492,7 +531,8 @@ evp_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 evp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 evp_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 evp_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-evp_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+evp_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+evp_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 evp_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 evp_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 evp_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h
@@ -510,11 +550,12 @@ evp_pbe.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 evp_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 evp_pbe.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-evp_pbe.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-evp_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_pbe.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_pbe.o: ../cryptlib.h
+evp_pbe.o: ../../include/openssl/rijndael-alg-fst.h
+evp_pbe.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+evp_pbe.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 evp_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 evp_pkey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 evp_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -530,11 +571,12 @@ evp_pkey.o: ../../include/openssl/opensslconf.h
 evp_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 evp_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 evp_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-evp_pkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-evp_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_pkey.o: ../cryptlib.h
+evp_pkey.o: ../../include/openssl/rijndael-alg-fst.h
+evp_pkey.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+evp_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+evp_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_dss.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_dss.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_dss.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -549,11 +591,12 @@ m_dss.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_dss.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_dss.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_dss.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_dss.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_dss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_dss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_dss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_dss.o: ../cryptlib.h
+m_dss.o: ../../include/openssl/rijndael-alg-fst.h
+m_dss.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_dss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_dss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_dss.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_dss.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_dss1.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_dss1.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_dss1.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -568,11 +611,12 @@ m_dss1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_dss1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_dss1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_dss1.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_dss1.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_dss1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_dss1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_dss1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_dss1.o: ../cryptlib.h
+m_dss1.o: ../../include/openssl/rijndael-alg-fst.h
+m_dss1.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_dss1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_dss1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_dss1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_dss1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_md2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_md2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_md2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -587,11 +631,12 @@ m_md2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_md2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_md2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_md2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_md2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_md2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_md2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_md2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_md2.o: ../cryptlib.h
+m_md2.o: ../../include/openssl/rijndael-alg-fst.h
+m_md2.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_md2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_md2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_md2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_md2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_md4.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_md4.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_md4.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -606,11 +651,12 @@ m_md4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_md4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_md4.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_md4.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_md4.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_md4.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_md4.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_md4.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_md4.o: ../cryptlib.h
+m_md4.o: ../../include/openssl/rijndael-alg-fst.h
+m_md4.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_md4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_md4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_md4.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_md5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_md5.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_md5.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -625,11 +671,12 @@ m_md5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_md5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_md5.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_md5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_md5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_md5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_md5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_md5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_md5.o: ../cryptlib.h
+m_md5.o: ../../include/openssl/rijndael-alg-fst.h
+m_md5.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_mdc2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_mdc2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -644,11 +691,12 @@ m_mdc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_mdc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_mdc2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_mdc2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_mdc2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_mdc2.o: ../cryptlib.h
+m_mdc2.o: ../../include/openssl/rijndael-alg-fst.h
+m_mdc2.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_null.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_null.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -663,11 +711,12 @@ m_null.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_null.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_null.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_null.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_null.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_null.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_null.o: ../cryptlib.h
+m_null.o: ../../include/openssl/rijndael-alg-fst.h
+m_null.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_null.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_null.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_ripemd.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_ripemd.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_ripemd.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -682,7 +731,9 @@ m_ripemd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_ripemd.o: ../../include/openssl/opensslconf.h
 m_ripemd.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 m_ripemd.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_ripemd.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+m_ripemd.o: ../../include/openssl/rc5.h
+m_ripemd.o: ../../include/openssl/rijndael-alg-fst.h
+m_ripemd.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 m_ripemd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_ripemd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -701,11 +752,12 @@ m_sha.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_sha.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_sha.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_sha.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_sha.o: ../cryptlib.h
+m_sha.o: ../../include/openssl/rijndael-alg-fst.h
+m_sha.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_sha.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_sha.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_sha.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_sha.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 m_sha1.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_sha1.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 m_sha1.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -720,11 +772,12 @@ m_sha1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 m_sha1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 m_sha1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 m_sha1.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-m_sha1.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-m_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_sha1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_sha1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_sha1.o: ../cryptlib.h
+m_sha1.o: ../../include/openssl/rijndael-alg-fst.h
+m_sha1.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+m_sha1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_sha1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_sha1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_sha1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 names.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 names.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -739,11 +792,12 @@ names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 names.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 names.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-names.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-names.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-names.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-names.o: ../cryptlib.h
+names.o: ../../include/openssl/rijndael-alg-fst.h
+names.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+names.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+names.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+names.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+names.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p5_crpt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p5_crpt.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p5_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -758,11 +812,12 @@ p5_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p5_crpt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p5_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p5_crpt.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p5_crpt.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p5_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p5_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p5_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p5_crpt.o: ../cryptlib.h
+p5_crpt.o: ../../include/openssl/rijndael-alg-fst.h
+p5_crpt.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p5_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p5_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p5_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p5_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p5_crpt2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p5_crpt2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p5_crpt2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -777,7 +832,9 @@ p5_crpt2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p5_crpt2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p5_crpt2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p5_crpt2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p5_crpt2.o: ../../include/openssl/rc5.h
+p5_crpt2.o: ../../include/openssl/rijndael-alg-fst.h
+p5_crpt2.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p5_crpt2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p5_crpt2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -796,7 +853,8 @@ p_dec.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p_dec.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p_dec.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 p_dec.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p_dec.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_dec.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p_dec.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p_dec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p_dec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p_dec.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -815,7 +873,8 @@ p_enc.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 p_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_enc.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p_enc.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -834,7 +893,8 @@ p_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 p_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -853,11 +913,12 @@ p_open.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p_open.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p_open.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p_open.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p_open.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p_open.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_open.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p_open.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p_open.o: ../cryptlib.h
+p_open.o: ../../include/openssl/rijndael-alg-fst.h
+p_open.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p_open.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_open.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_open.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p_open.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p_seal.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p_seal.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p_seal.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -872,7 +933,8 @@ p_seal.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p_seal.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 p_seal.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p_seal.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_seal.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p_seal.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -891,11 +953,12 @@ p_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p_sign.o: ../cryptlib.h
+p_sign.o: ../../include/openssl/rijndael-alg-fst.h
+p_sign.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p_verify.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p_verify.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p_verify.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -910,7 +973,9 @@ p_verify.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p_verify.o: ../../include/openssl/opensslconf.h
 p_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 p_verify.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p_verify.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_verify.o: ../../include/openssl/rc5.h
+p_verify.o: ../../include/openssl/rijndael-alg-fst.h
+p_verify.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index f24d3756c904a8650f30ce77a4b97683d16845c7..bb78c68160ad9246efa3bab42e9340ef113b2260 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -64,6 +64,8 @@
 
 void OpenSSL_add_all_ciphers(void)
        {
+       int i,j;
+
 #ifndef NO_DES
        EVP_add_cipher(EVP_des_cfb());
        EVP_add_cipher(EVP_des_ede_cfb());
@@ -144,6 +146,12 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_rc5_cbc,"rc5");
        EVP_add_cipher_alias(SN_rc5_cbc,"RC5");
 #endif
+
+#ifndef NO_RIJNDAEL
+       for(i=0 ; i < 3 ; ++i)
+           for(j=0 ; j < 3 ; ++j)
+               EVP_add_cipher(EVP_rijndael_ecb(i,j));
+#endif
        PKCS12_PBE_add();
        PKCS5_PBE_add();
        }

diff --git a/crypto/evp/e_rd.c b/crypto/evp/e_rd.c
new file mode 100644 (file)
index 0000000..e51d9bc
--- /dev/null
+++ b/crypto/evp/e_rd.c
@@ -0,0 +1,131 @@
+/* ====================================================================
+ * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#include <openssl/evp.h>
+#include <openssl/err.h>
+#include <memory.h>
+#include <assert.h>
+
+static EVP_CIPHER rd_cipher[3][3];
+
+static anSizes[]={16,24,32};
+static anNIDs[3][3]=
+    {
+    { NID_rijndael_ecb_k128_b128,NID_rijndael_ecb_k192_b128,NID_rijndael_ecb_k256_b128 },
+    { NID_rijndael_ecb_k128_b192,NID_rijndael_ecb_k192_b192,NID_rijndael_ecb_k256_b192 },
+    { NID_rijndael_ecb_k128_b256,NID_rijndael_ecb_k192_b256,NID_rijndael_ecb_k256_b256 }
+    };
+
+static int rd_init_ecb(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                      const unsigned char *iv, int enc)
+    {
+    RIJNDAEL_KEY *k=&ctx->c.rijndael;
+
+    k->enc=enc;
+    k->rounds=ctx->cipher->key_len/4+6;
+    rijndaelKeySched((const word8 (*)[4])key,k->keySched,k->rounds);
+    if(!k->enc)
+       rijndaelKeyEncToDec(k->keySched,k->rounds);
+    memcpy(k->iv,iv,ctx->cipher->iv_len);
+
+    return 1;
+    }
+
+static int rd_cipher_ecb(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                        const unsigned char *in, unsigned int inl)
+    {
+    while(inl > 0)
+       {
+       if(ctx->c.rijndael.enc)
+           rijndaelEncrypt(in,out,ctx->c.rijndael.keySched,
+                           ctx->c.rijndael.rounds);
+       else
+           rijndaelDecrypt(in,out,ctx->c.rijndael.keySched,
+                           ctx->c.rijndael.rounds);
+       inl-=16;
+       in+=16;
+       out+=16;
+       }
+    assert(inl == 0);
+
+    return 1;
+    }
+
+EVP_CIPHER *EVP_rijndael_ecb(int nBlockLength,int nKeyLength)
+    {
+    EVP_CIPHER *c;
+
+    if(nBlockLength < 0 || nBlockLength > 2)
+       {
+       EVPerr(EVP_F_EVP_RIJNDAEL,EVP_R_BAD_BLOCK_LENGTH);
+       return NULL;
+       }
+    if(nKeyLength < 0 || nKeyLength > 2)
+       {
+       EVPerr(EVP_F_EVP_RIJNDAEL,EVP_R_BAD_KEY_LENGTH);
+       return NULL;
+       }
+
+    c=&rd_cipher[nKeyLength][nBlockLength];
+
+    memset(c,'\0',sizeof *c);
+
+    c->nid=anNIDs[nBlockLength][nKeyLength];
+    c->block_size=anSizes[nBlockLength];
+    c->key_len=anSizes[nKeyLength];
+    c->iv_len=16;
+    c->flags=EVP_CIPH_ECB_MODE;
+    c->init=rd_init_ecb;
+    c->do_cipher=rd_cipher_ecb;
+    c->ctx_size=sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.rijndael));
+
+    return c;
+    }

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index cdf5f3cf8942ffd68ff77e5eee475bdcd3cca2ed..e8621973ec0b1eeae8e40ada53cc368ca01a7ae6 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -109,6 +109,9 @@
 #ifndef NO_MDC2
 #include <openssl/mdc2.h>
 #endif
+#ifndef NO_RIJNDAEL
+#include <openssl/rijndael.h>
+#endif
 
 #define EVP_RC2_KEY_SIZE               16
 #define EVP_RC4_KEY_SIZE               16
@@ -116,8 +119,8 @@
 #define EVP_CAST5_KEY_SIZE             16
 #define EVP_RC5_32_12_16_KEY_SIZE      16
 #define EVP_MAX_MD_SIZE                        (16+20) /* The SSLv3 md5+sha1 type */
-#define EVP_MAX_KEY_LENGTH             24
-#define EVP_MAX_IV_LENGTH              8
+#define EVP_MAX_KEY_LENGTH             32
+#define EVP_MAX_IV_LENGTH              16
 
 #define PKCS5_SALT_LEN                 8
 /* Default PKCS#5 iteration count */
@@ -398,7 +401,8 @@ struct evp_cipher_ctx_st
 
        void *app_data;         /* application stuff */
        int key_len;            /* May change for variable length cipher */
-       union   {
+       union
+               {
 #ifndef NO_RC4
                struct
                        {
@@ -425,22 +429,27 @@ struct evp_cipher_ctx_st
                IDEA_KEY_SCHEDULE idea_ks;/* key schedule */
 #endif
 #ifndef NO_RC2
-               struct {
+               struct
+                       {
                        int key_bits;   /* effective key bits */
                        RC2_KEY ks;/* key schedule */
-               } rc2;
+                       } rc2;
 #endif
 #ifndef NO_RC5
-               struct {
+               struct
+                       {
                        int rounds;     /* number of rounds */
                        RC5_32_KEY ks;/* key schedule */
-               } rc5;
+                       } rc5;
 #endif
 #ifndef NO_BF
                BF_KEY bf_ks;/* key schedule */
 #endif
 #ifndef NO_CAST
                CAST_KEY cast_ks;/* key schedule */
+#endif
+#ifndef NO_RIJNDAEL
+               RIJNDAEL_KEY rijndael;
 #endif
                } c;
        };
@@ -693,6 +702,10 @@ EVP_CIPHER *EVP_rc5_32_12_16_ecb(void);
 EVP_CIPHER *EVP_rc5_32_12_16_cfb(void);
 EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
 #endif
+#ifndef NO_RIJNDAEL
+EVP_CIPHER *EVP_rijndael_ecb(int nBlockLength,int nKeyLength);
+#endif
+
 void OpenSSL_add_all_algorithms(void);
 void OpenSSL_add_all_ciphers(void);
 void OpenSSL_add_all_digests(void);
@@ -800,6 +813,7 @@ void EVP_PBE_cleanup(void);
 #define EVP_F_EVP_PKEY_GET1_DSA                                 120
 #define EVP_F_EVP_PKEY_GET1_RSA                                 121
 #define EVP_F_EVP_PKEY_NEW                              106
+#define EVP_F_EVP_RIJNDAEL                              126
 #define EVP_F_EVP_SIGNFINAL                             107
 #define EVP_F_EVP_VERIFYFINAL                           108
 #define EVP_F_PKCS5_PBE_KEYIVGEN                        117
@@ -808,7 +822,9 @@ void EVP_PBE_cleanup(void);
 #define EVP_F_RC5_CTRL                                  125
 
 /* Reason codes. */
+#define EVP_R_BAD_BLOCK_LENGTH                          136
 #define EVP_R_BAD_DECRYPT                               100
+#define EVP_R_BAD_KEY_LENGTH                            137
 #define EVP_R_BN_DECODE_ERROR                           112
 #define EVP_R_BN_PUBKEY_ERROR                           113
 #define EVP_R_CIPHER_PARAMETER_ERROR                    122

diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index a01412a07c76ead2f04887e8904ddc92c6fe6a3f..f54314b091726bf6aeed79e1a4859a0805d42be3 100644 (file)
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -85,6 +85,7 @@ static ERR_STRING_DATA EVP_str_functs[]=
 {ERR_PACK(0,EVP_F_EVP_PKEY_GET1_DSA,0),        "EVP_PKEY_get1_DSA"},
 {ERR_PACK(0,EVP_F_EVP_PKEY_GET1_RSA,0),        "EVP_PKEY_get1_RSA"},
 {ERR_PACK(0,EVP_F_EVP_PKEY_NEW,0),     "EVP_PKEY_new"},
+{ERR_PACK(0,EVP_F_EVP_RIJNDAEL,0),     "EVP_RIJNDAEL"},
 {ERR_PACK(0,EVP_F_EVP_SIGNFINAL,0),    "EVP_SignFinal"},
 {ERR_PACK(0,EVP_F_EVP_VERIFYFINAL,0),  "EVP_VerifyFinal"},
 {ERR_PACK(0,EVP_F_PKCS5_PBE_KEYIVGEN,0),       "PKCS5_PBE_keyivgen"},
@@ -96,7 +97,9 @@ static ERR_STRING_DATA EVP_str_functs[]=
 
 static ERR_STRING_DATA EVP_str_reasons[]=
        {
+{EVP_R_BAD_BLOCK_LENGTH                  ,"bad block length"},
 {EVP_R_BAD_DECRYPT                       ,"bad decrypt"},
+{EVP_R_BAD_KEY_LENGTH                    ,"bad key length"},
 {EVP_R_BN_DECODE_ERROR                   ,"bn decode error"},
 {EVP_R_BN_PUBKEY_ERROR                   ,"bn pubkey error"},
 {EVP_R_CIPHER_PARAMETER_ERROR            ,"cipher parameter error"},

diff --git a/crypto/hmac/Makefile.ssl b/crypto/hmac/Makefile.ssl
index ed3c8c64d1ca31f7d86fd94d91c6d203dcbbb807..a15f775c988653590c27757de7775833733a677d 100644 (file)
--- a/crypto/hmac/Makefile.ssl
+++ b/crypto/hmac/Makefile.ssl
@@ -91,6 +91,8 @@ hmac.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 hmac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 hmac.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
 hmac.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-hmac.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-hmac.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-hmac.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+hmac.o: ../../include/openssl/rijndael-alg-fst.h
+hmac.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+hmac.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+hmac.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+hmac.o: ../../include/openssl/symhacks.h

diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl
index 1b43d8027b8402277674d15b830e36445ce1c2bd..7b01d4b085098c5e4056438c3bb99c5124927a9a 100644 (file)
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -43,6 +43,12 @@ lib: $(LIBOBJ)
        - $(RANLIB) $(LIB)
        @touch lib
 
+obj_dat.h: objects.h objects.txt obj_mac.h
+       perl obj_dat.pl obj_mac.h obj_dat.h
+
+obj_mac.h: objects.txt obj_mac.num
+       perl objects.pl objects.txt obj_mac.num obj_mac.h
+
 files:
        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index f0d824141c393ea1fe92967accf7abad038ef010..7401905f3ed5d91fd58e5da9b25a289400f12ec0 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -61,9 +61,9 @@
  * perl obj_dat.pl objects.h obj_dat.h
  */
 
-#define NUM_NID 393
-#define NUM_SN 392
-#define NUM_LN 392
+#define NUM_NID 405
+#define NUM_SN 401
+#define NUM_LN 401
 #define NUM_OBJ 366
 
 static unsigned char lvalues[2896]={
@@ -1045,6 +1045,27 @@ static ASN1_OBJECT nid_objs[NUM_NID]={
 {"dcobject","dcObject",NID_dcObject,3,&(lvalues[2872]),0},
 {"DC","domainComponent",NID_domainComponent,10,&(lvalues[2875]),0},
 {"domain","Domain",NID_Domain,10,&(lvalues[2885]),0},
+{NULL,NULL,NID_undef,0,NULL},
+{NULL,NULL,NID_undef,0,NULL},
+{NULL,NULL,NID_undef,0,NULL},
+{"RIJNDAEL-ECB-K128-B128","rijndael-ecb-k128-b128",
+       NID_rijndael_ecb_k128_b128,0,NULL},
+{"RIJNDAEL-ECB-K192-B128","rijndael-ecb-k192-b128",
+       NID_rijndael_ecb_k192_b128,0,NULL},
+{"RIJNDAEL-ECB-K256-B128","rijndael-ecb-k256-b128",
+       NID_rijndael_ecb_k256_b128,0,NULL},
+{"RIJNDAEL-ECB-K128-B192","rijndael-ecb-k128-b192",
+       NID_rijndael_ecb_k128_b192,0,NULL},
+{"RIJNDAEL-ECB-K192-B192","rijndael-ecb-k192-b192",
+       NID_rijndael_ecb_k192_b192,0,NULL},
+{"RIJNDAEL-ECB-K256-B192","rijndael-ecb-k256-b192",
+       NID_rijndael_ecb_k256_b192,0,NULL},
+{"RIJNDAEL-ECB-K128-B256","rijndael-ecb-k128-b256",
+       NID_rijndael_ecb_k128_b256,0,NULL},
+{"RIJNDAEL-ECB-K192-B256","rijndael-ecb-k192-b256",
+       NID_rijndael_ecb_k192_b256,0,NULL},
+{"RIJNDAEL-ECB-K256-B256","rijndael-ecb-k256-b256",
+       NID_rijndael_ecb_k256_b256,0,NULL},
 };
 
 static ASN1_OBJECT *sn_objs[NUM_SN]={
@@ -1134,6 +1155,15 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={
 &(nid_objs[122]),/* "RC5-CFB" */
 &(nid_objs[121]),/* "RC5-ECB" */
 &(nid_objs[123]),/* "RC5-OFB" */
+&(nid_objs[396]),/* "RIJNDAEL-ECB-K128-B128" */
+&(nid_objs[399]),/* "RIJNDAEL-ECB-K128-B192" */
+&(nid_objs[402]),/* "RIJNDAEL-ECB-K128-B256" */
+&(nid_objs[397]),/* "RIJNDAEL-ECB-K192-B128" */
+&(nid_objs[400]),/* "RIJNDAEL-ECB-K192-B192" */
+&(nid_objs[403]),/* "RIJNDAEL-ECB-K192-B256" */
+&(nid_objs[398]),/* "RIJNDAEL-ECB-K256-B128" */
+&(nid_objs[401]),/* "RIJNDAEL-ECB-K256-B192" */
+&(nid_objs[404]),/* "RIJNDAEL-ECB-K256-B256" */
 &(nid_objs[117]),/* "RIPEMD160" */
 &(nid_objs[124]),/* "RLE" */
 &(nid_objs[19]),/* "RSA" */
@@ -1804,6 +1834,15 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={
 &(nid_objs[122]),/* "rc5-cfb" */
 &(nid_objs[121]),/* "rc5-ecb" */
 &(nid_objs[123]),/* "rc5-ofb" */
+&(nid_objs[396]),/* "rijndael-ecb-k128-b128" */
+&(nid_objs[399]),/* "rijndael-ecb-k128-b192" */
+&(nid_objs[402]),/* "rijndael-ecb-k128-b256" */
+&(nid_objs[397]),/* "rijndael-ecb-k192-b128" */
+&(nid_objs[400]),/* "rijndael-ecb-k192-b192" */
+&(nid_objs[403]),/* "rijndael-ecb-k192-b256" */
+&(nid_objs[398]),/* "rijndael-ecb-k256-b128" */
+&(nid_objs[401]),/* "rijndael-ecb-k256-b192" */
+&(nid_objs[404]),/* "rijndael-ecb-k256-b256" */
 &(nid_objs[117]),/* "ripemd160" */
 &(nid_objs[119]),/* "ripemd160WithRSA" */
 &(nid_objs[19]),/* "rsa" */

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 401b1e5a1bc25b4d05a5309e6e15c4d9bb4789c0..715293548f2dd6d6eadc246c20ae5836b233178d 100644 (file)
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1796,3 +1796,39 @@
 #define NID_zlib_compression           125
 #define OBJ_zlib_compression           1L,1L,1L,1L,666L,2L
 
+#define SN_rijndael_ecb_k128_b128              "RIJNDAEL-ECB-K128-B128"
+#define LN_rijndael_ecb_k128_b128              "rijndael-ecb-k128-b128"
+#define NID_rijndael_ecb_k128_b128             396
+
+#define SN_rijndael_ecb_k192_b128              "RIJNDAEL-ECB-K192-B128"
+#define LN_rijndael_ecb_k192_b128              "rijndael-ecb-k192-b128"
+#define NID_rijndael_ecb_k192_b128             397
+
+#define SN_rijndael_ecb_k256_b128              "RIJNDAEL-ECB-K256-B128"
+#define LN_rijndael_ecb_k256_b128              "rijndael-ecb-k256-b128"
+#define NID_rijndael_ecb_k256_b128             398
+
+#define SN_rijndael_ecb_k128_b192              "RIJNDAEL-ECB-K128-B192"
+#define LN_rijndael_ecb_k128_b192              "rijndael-ecb-k128-b192"
+#define NID_rijndael_ecb_k128_b192             399
+
+#define SN_rijndael_ecb_k192_b192              "RIJNDAEL-ECB-K192-B192"
+#define LN_rijndael_ecb_k192_b192              "rijndael-ecb-k192-b192"
+#define NID_rijndael_ecb_k192_b192             400
+
+#define SN_rijndael_ecb_k256_b192              "RIJNDAEL-ECB-K256-B192"
+#define LN_rijndael_ecb_k256_b192              "rijndael-ecb-k256-b192"
+#define NID_rijndael_ecb_k256_b192             401
+
+#define SN_rijndael_ecb_k128_b256              "RIJNDAEL-ECB-K128-B256"
+#define LN_rijndael_ecb_k128_b256              "rijndael-ecb-k128-b256"
+#define NID_rijndael_ecb_k128_b256             402
+
+#define SN_rijndael_ecb_k192_b256              "RIJNDAEL-ECB-K192-B256"
+#define LN_rijndael_ecb_k192_b256              "rijndael-ecb-k192-b256"
+#define NID_rijndael_ecb_k192_b256             403
+
+#define SN_rijndael_ecb_k256_b256              "RIJNDAEL-ECB-K256-B256"
+#define LN_rijndael_ecb_k256_b256              "rijndael-ecb-k256-b256"
+#define NID_rijndael_ecb_k256_b256             404
+

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index d73a51370f76f72176351070464a56ff999cebbf..94e13b44eb75539a1e505427f5518e955a82ab1f 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -390,3 +390,15 @@ Enterprises                389
 dcObject               390
 domainComponent                391
 Domain         392
+ld_ce          393
+rd_ecb         394
+rijndael_ecb           395
+rijndael_ecb_k128_b128         396
+rijndael_ecb_k192_b128         397
+rijndael_ecb_k256_b128         398
+rijndael_ecb_k128_b192         399
+rijndael_ecb_k192_b192         400
+rijndael_ecb_k256_b192         401
+rijndael_ecb_k128_b256         402
+rijndael_ecb_k192_b256         403
+rijndael_ecb_k256_b256         404

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 3d443cf88479f4c182b5f484f3724351a0462e0d..a203a2bde139d067cc85daee0f08c587106a8f19 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -591,3 +591,13 @@ enterprises 1466 344       : dcobject              : dcObject
 !Cname zlib-compression
 1 1 1 1 666 2          : ZLIB                  : zlib compression
 
+# Rijndael
+                       : RIJNDAEL-ECB-K128-B128: rijndael-ecb-k128-b128
+                       : RIJNDAEL-ECB-K192-B128: rijndael-ecb-k192-b128
+                       : RIJNDAEL-ECB-K256-B128: rijndael-ecb-k256-b128
+                       : RIJNDAEL-ECB-K128-B192: rijndael-ecb-k128-b192
+                       : RIJNDAEL-ECB-K192-B192: rijndael-ecb-k192-b192
+                       : RIJNDAEL-ECB-K256-B192: rijndael-ecb-k256-b192
+                       : RIJNDAEL-ECB-K128-B256: rijndael-ecb-k128-b256
+                       : RIJNDAEL-ECB-K192-B256: rijndael-ecb-k192-b256
+                       : RIJNDAEL-ECB-K256-B256: rijndael-ecb-k256-b256

diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl
index 111dbc1ae46088b492f61509c53d43017efb079c..e26c079b4e0d4b00bfc012d045cdecbf39548fbd 100644 (file)
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@@ -95,11 +95,12 @@ pem_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 pem_all.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 pem_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 pem_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pem_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pem_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pem_all.o: ../cryptlib.h
+pem_all.o: ../../include/openssl/rijndael-alg-fst.h
+pem_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pem_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 pem_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 pem_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 pem_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -114,7 +115,8 @@ pem_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
 pem_err.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
 pem_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pem_err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+pem_err.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+pem_err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 pem_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pem_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pem_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -134,7 +136,9 @@ pem_info.o: ../../include/openssl/opensslconf.h
 pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
 pem_info.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
 pem_info.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pem_info.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+pem_info.o: ../../include/openssl/rc5.h
+pem_info.o: ../../include/openssl/rijndael-alg-fst.h
+pem_info.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 pem_info.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pem_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pem_info.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -155,11 +159,12 @@ pem_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 pem_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pem_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pem_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pem_lib.o: ../cryptlib.h
+pem_lib.o: ../../include/openssl/rijndael-alg-fst.h
+pem_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pem_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 pem_seal.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 pem_seal.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 pem_seal.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -176,11 +181,12 @@ pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
 pem_seal.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
 pem_seal.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 pem_seal.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pem_seal.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pem_seal.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_seal.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_seal.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pem_seal.o: ../cryptlib.h
+pem_seal.o: ../../include/openssl/rijndael-alg-fst.h
+pem_seal.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pem_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 pem_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 pem_sign.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 pem_sign.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -197,8 +203,9 @@ pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
 pem_sign.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
 pem_sign.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 pem_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pem_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pem_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pem_sign.o: ../cryptlib.h
+pem_sign.o: ../../include/openssl/rijndael-alg-fst.h
+pem_sign.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pem_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h

diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile.ssl
index c92dd276398c6f60f75801178fc9ac27c9a55e7d..99539ba3133f29952c3cdb6f544fd30617a26fa5 100644 (file)
--- a/crypto/pkcs12/Makefile.ssl
+++ b/crypto/pkcs12/Makefile.ssl
@@ -99,7 +99,8 @@ p12_add.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p12_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p12_add.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_add.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p12_add.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_add.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p12_add.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p12_add.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p12_add.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_add.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -119,11 +120,12 @@ p12_attr.o: ../../include/openssl/opensslconf.h
 p12_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_attr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_attr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_attr.o: ../cryptlib.h
+p12_attr.o: ../../include/openssl/rijndael-alg-fst.h
+p12_attr.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_attr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_attr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_bags.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 p12_bags.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 p12_bags.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -139,11 +141,12 @@ p12_bags.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p12_bags.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_bags.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_bags.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_bags.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_bags.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_bags.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_bags.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_bags.o: ../cryptlib.h
+p12_bags.o: ../../include/openssl/rijndael-alg-fst.h
+p12_bags.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_bags.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_bags.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_bags.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_bags.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_crpt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p12_crpt.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p12_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -159,11 +162,12 @@ p12_crpt.o: ../../include/openssl/opensslconf.h
 p12_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_crpt.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_crpt.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_crpt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_crpt.o: ../cryptlib.h
+p12_crpt.o: ../../include/openssl/rijndael-alg-fst.h
+p12_crpt.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_crt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p12_crt.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p12_crt.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -178,7 +182,8 @@ p12_crt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p12_crt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p12_crt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_crt.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p12_crt.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_crt.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p12_crt.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p12_crt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p12_crt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_crt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -198,11 +203,12 @@ p12_decr.o: ../../include/openssl/opensslconf.h
 p12_decr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_decr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_decr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_decr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_decr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_decr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_decr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_decr.o: ../cryptlib.h
+p12_decr.o: ../../include/openssl/rijndael-alg-fst.h
+p12_decr.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_decr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_decr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_decr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_decr.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_init.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p12_init.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p12_init.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -218,11 +224,12 @@ p12_init.o: ../../include/openssl/opensslconf.h
 p12_init.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_init.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_init.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_init.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_init.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_init.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_init.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_init.o: ../cryptlib.h
+p12_init.o: ../../include/openssl/rijndael-alg-fst.h
+p12_init.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_init.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_init.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_init.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_init.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p12_key.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p12_key.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -237,7 +244,8 @@ p12_key.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p12_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p12_key.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_key.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p12_key.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_key.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p12_key.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p12_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p12_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_key.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -257,11 +265,12 @@ p12_kiss.o: ../../include/openssl/opensslconf.h
 p12_kiss.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_kiss.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_kiss.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_kiss.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_kiss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_kiss.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_kiss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_kiss.o: ../cryptlib.h
+p12_kiss.o: ../../include/openssl/rijndael-alg-fst.h
+p12_kiss.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_kiss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_kiss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_kiss.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_kiss.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 p12_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 p12_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -277,11 +286,12 @@ p12_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p12_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_lib.o: ../cryptlib.h
+p12_lib.o: ../../include/openssl/rijndael-alg-fst.h
+p12_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_mac.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 p12_mac.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 p12_mac.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -297,11 +307,12 @@ p12_mac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p12_mac.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_mac.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_mac.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_mac.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_mac.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_mac.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_mac.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_mac.o: ../cryptlib.h
+p12_mac.o: ../../include/openssl/rijndael-alg-fst.h
+p12_mac.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_mac.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_mac.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_mac.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_mac.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_mutl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p12_mutl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p12_mutl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -317,7 +328,9 @@ p12_mutl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p12_mutl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_mutl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
 p12_mutl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p12_mutl.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_mutl.o: ../../include/openssl/rc5.h
+p12_mutl.o: ../../include/openssl/rijndael-alg-fst.h
+p12_mutl.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p12_mutl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p12_mutl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_mutl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -337,10 +350,12 @@ p12_npas.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
 p12_npas.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
 p12_npas.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_npas.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_npas.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_npas.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_npas.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_npas.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p12_npas.o: ../../include/openssl/rijndael-alg-fst.h
+p12_npas.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_npas.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_npas.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_npas.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_npas.o: ../../include/openssl/x509_vfy.h
 p12_sbag.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 p12_sbag.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 p12_sbag.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -356,11 +371,12 @@ p12_sbag.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 p12_sbag.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 p12_sbag.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 p12_sbag.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_sbag.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_sbag.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_sbag.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-p12_sbag.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_sbag.o: ../cryptlib.h
+p12_sbag.o: ../../include/openssl/rijndael-alg-fst.h
+p12_sbag.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+p12_sbag.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_sbag.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_sbag.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+p12_sbag.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 p12_utl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p12_utl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 p12_utl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -375,7 +391,8 @@ p12_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 p12_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 p12_utl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
 p12_utl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p12_utl.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_utl.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+p12_utl.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 p12_utl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 p12_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p12_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -394,7 +411,9 @@ pk12err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
 pk12err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 pk12err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pk12err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pk12err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk12err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk12err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+pk12err.o: ../../include/openssl/rijndael-alg-fst.h
+pk12err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pk12err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk12err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk12err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pk12err.o: ../../include/openssl/x509_vfy.h

diff --git a/crypto/pkcs7/Makefile.ssl b/crypto/pkcs7/Makefile.ssl
index 5e8a6808d357d6236a31425b92ab0f89a5c29212..32b51e5e2355997b98094e4b5fd46c4ff08af3b3 100644 (file)
--- a/crypto/pkcs7/Makefile.ssl
+++ b/crypto/pkcs7/Makefile.ssl
@@ -112,7 +112,9 @@ pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
 pk7_attr.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
 pk7_attr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pk7_attr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+pk7_attr.o: ../../include/openssl/rc5.h
+pk7_attr.o: ../../include/openssl/rijndael-alg-fst.h
+pk7_attr.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 pk7_attr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pk7_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pk7_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -133,11 +135,13 @@ pk7_doit.o: ../../include/openssl/opensslconf.h
 pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 pk7_doit.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 pk7_doit.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pk7_doit.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pk7_doit.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk7_doit.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk7_doit.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pk7_doit.o: ../../include/openssl/x509v3.h ../cryptlib.h
+pk7_doit.o: ../../include/openssl/rijndael-alg-fst.h
+pk7_doit.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pk7_doit.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk7_doit.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk7_doit.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pk7_doit.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+pk7_doit.o: ../cryptlib.h
 pk7_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 pk7_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 pk7_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -152,11 +156,12 @@ pk7_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 pk7_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 pk7_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pk7_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pk7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk7_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pk7_lib.o: ../cryptlib.h
+pk7_lib.o: ../../include/openssl/rijndael-alg-fst.h
+pk7_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pk7_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk7_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk7_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pk7_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 pk7_mime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 pk7_mime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 pk7_mime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -172,11 +177,12 @@ pk7_mime.o: ../../include/openssl/opensslconf.h
 pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 pk7_mime.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
 pk7_mime.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-pk7_mime.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-pk7_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pk7_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pk7_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pk7_mime.o: ../cryptlib.h
+pk7_mime.o: ../../include/openssl/rijndael-alg-fst.h
+pk7_mime.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+pk7_mime.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pk7_mime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pk7_mime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pk7_mime.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 pk7_smime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 pk7_smime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 pk7_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -192,7 +198,9 @@ pk7_smime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 pk7_smime.o: ../../include/openssl/opensslconf.h
 pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 pk7_smime.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pk7_smime.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+pk7_smime.o: ../../include/openssl/rc5.h
+pk7_smime.o: ../../include/openssl/rijndael-alg-fst.h
+pk7_smime.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 pk7_smime.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pk7_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -211,7 +219,9 @@ pkcs7err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pkcs7err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 pkcs7err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pkcs7err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+pkcs7err.o: ../../include/openssl/rc5.h
+pkcs7err.o: ../../include/openssl/rijndael-alg-fst.h
+pkcs7err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 pkcs7err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pkcs7err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 pkcs7err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

diff --git a/crypto/rijndael/Makefile.ssl b/crypto/rijndael/Makefile.ssl
new file mode 100644 (file)
index 0000000..01da7ac
--- /dev/null
+++ b/crypto/rijndael/Makefile.ssl
@@ -0,0 +1,86 @@
+#
+# SSLeay/crypto/blowfish/Makefile
+#
+
+DIR=   rijndael
+TOP=   ../..
+CC=    cc
+CPP=   $(CC) -E
+INCLUDES=
+CFLAG=-g
+INSTALL_PREFIX=
+OPENSSLDIR=     /usr/local/ssl
+INSTALLTOP=/usr/local/ssl
+MAKE=          make -f Makefile.ssl
+MAKEDEPEND=    $(TOP)/util/domd $(TOP)
+MAKEFILE=      Makefile.ssl
+AR=            ar r
+
+RD_ENC=                rd_enc.o
+# or use
+#DES_ENC=      bx86-elf.o
+
+CFLAGS= $(INCLUDES) $(CFLAG) -DINTERMEDIATE_VALUE_KAT -DBINARY_KEY_MATERIAL
+
+GENERAL=Makefile
+#TEST=rijndael-test-fst.c table.128 table.192 table.256
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=rijndael-alg-fst.c
+LIBOBJ=rijndael-alg-fst.o
+
+SRC= $(LIBSRC)
+
+EXHEADER=rijndael-alg-fst.h rijndael.h
+
+top:
+       (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:   lib
+
+lib:   $(LIBOBJ)
+       $(AR) $(LIB) $(LIBOBJ)
+       $(RANLIB) $(LIB)
+       @touch lib
+
+files:
+       $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+
+links:
+       @$(TOP)/util/point.sh Makefile.ssl Makefile
+       @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+       @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+       @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install: installs
+
+installs:
+       @for i in $(EXHEADER) ; \
+       do  \
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       done;
+
+tags:
+       ctags $(SRC)
+
+tests:
+
+lint:
+       lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+       $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
+
+dclean:
+       $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+       mv -f Makefile.new $(MAKEFILE)
+
+clean:
+       rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE
+
+rijndael-alg-fst.o: boxes-fst-corrected.dat rijndael-alg-fst.h

diff --git a/crypto/rijndael/README b/crypto/rijndael/README
new file mode 100755 (executable)
index 0000000..6d6f19f
--- /dev/null
+++ b/crypto/rijndael/README
@@ -0,0 +1,84 @@
+Rijndael
+Joan Daemen
+
+Optimised ANSI C  v2.4
+-----------------------------------------------------------
+
+This archive contains the following files:
+
+Makefile:      A file that allows for easy compiling of the code with
+               Unix `make' (tested with GNU make).
+README:        This file.
+boxes-fst.dat: Tables that are needed by the reference implementation.
+               The tables implement the S-box and its inverse, and also
+               some temporary tables needed for multiplying in the finite
+               field GF(2^8).
+rijndael-alg-fst.c:
+rijndael-alg-fst.h:
+               Algorithm implementation.
+rijndael-api-fst.c:
+rijndael-api-fst.h:
+               Interface to the C API.
+rijndaeltest-fst.c:
+               Implementation of the KAT and MCT.
+table.128:
+table.192:
+table.256:
+               Files needed for the KAT (for the Table Known Answer Test).
+
+
+
+Instructions for the KAT and MCT software:
+
+1) Compile the C code and put the executable in the same directory as the
+   table.??? files.
+2) Run the executable. It generates all the tables in the NIST format.
+3) Compare the generated tables with the original provided tables, e.g.
+   in Unix, with `diff'. 
+4) The code is independent of the ENDIANness of the machine.
+   However, the code casts char pointers to int pointers.
+   On some platforms, this casting can cause problems. 
+   This will cause malfunctioning of the CBC Monte Carlo tests.
+   In this case, the compile parameter STRICT_ALIGN should be set to 1. 
+   (Of course this results in slower code.) 
+
+
+Changes with respect to v1.0 (= round 1 submission)
+---------------------------------------------------
+
+1) Removed the parameter blockLen from makeKey() and cipherInit().
+   The parameter is still present in the structures keyInstance and
+   cipherInstance.
+2) Removed some calls to sscan().
+3) Corrected the CBC decryption Monte Carlo test code.
+4) Provided code for platforms with pointer alignment problems.
+ 
+----------------------------------------------------------------------
+
+Changes from v2.0 (= round 2 submission)
+----------------------------------------
+
+Various bug fixes in CBC encryption and decryption mode.
+
+----------------------------------------------------------------------
+
+Changes from v2.2
+-----------------
+
+--  Moved number of rounds to the keyInstance structure
+    to make implementation thread-safe
+--  Functions used only to generate the Intermediate Value
+    Known Answer Test are now conditionally compiled
+    via #define INTERMEDIATE_VALUE_KAT
+--  Further optimized for the default 128-bit block size
+--  Fixed CBC decryption bug (chained IV was lost if input
+    and outBuffer were the same)
+--  Added padding capability to CBC mode (allows encryption
+    of any number of octets, not only full blocks)
+
+----------------------------------------------------------------------
+
+Changes from v2.3
+-----------------
+
+Fixed a small bug in CBC mode.

diff --git a/crypto/rijndael/boxes-fst-corrected.dat b/crypto/rijndael/boxes-fst-corrected.dat
new file mode 100644 (file)
index 0000000..d3d01c0
--- /dev/null
+++ b/crypto/rijndael/boxes-fst-corrected.dat
@@ -0,0 +1,3986 @@
+word8 S[256] = {
+ 99, 124, 119, 123, 242, 107, 111, 197,  48,   1, 103,  43, 254, 215, 171, 118, 
+202, 130, 201, 125, 250,  89,  71, 240, 173, 212, 162, 175, 156, 164, 114, 192, 
+183, 253, 147,  38,  54,  63, 247, 204,  52, 165, 229, 241, 113, 216,  49,  21, 
+  4, 199,  35, 195,  24, 150,   5, 154,   7,  18, 128, 226, 235,  39, 178, 117, 
+  9, 131,  44,  26,  27, 110,  90, 160,  82,  59, 214, 179,  41, 227,  47, 132, 
+ 83, 209,   0, 237,  32, 252, 177,  91, 106, 203, 190,  57,  74,  76,  88, 207, 
+208, 239, 170, 251,  67,  77,  51, 133,  69, 249,   2, 127,  80,  60, 159, 168, 
+ 81, 163,  64, 143, 146, 157,  56, 245, 188, 182, 218,  33,  16, 255, 243, 210, 
+205,  12,  19, 236,  95, 151,  68,  23, 196, 167, 126,  61, 100,  93,  25, 115, 
+ 96, 129,  79, 220,  34,  42, 144, 136,  70, 238, 184,  20, 222,  94,  11, 219, 
+224,  50,  58,  10,  73,   6,  36,  92, 194, 211, 172,  98, 145, 149, 228, 121, 
+231, 200,  55, 109, 141, 213,  78, 169, 108,  86, 244, 234, 101, 122, 174,   8, 
+186, 120,  37,  46,  28, 166, 180, 198, 232, 221, 116,  31,  75, 189, 139, 138, 
+112,  62, 181, 102,  72,   3, 246,  14,  97,  53,  87, 185, 134, 193,  29, 158, 
+225, 248, 152,  17, 105, 217, 142, 148, 155,  30, 135, 233, 206,  85,  40, 223, 
+140, 161, 137,  13, 191, 230,  66, 104,  65, 153,  45,  15, 176,  84, 187,  22
+};
+
+#ifdef INTERMEDIATE_VALUE_KAT
+word8 Si[256] = {
+ 82,   9, 106, 213,  48,  54, 165,  56, 191,  64, 163, 158, 129, 243, 215, 251, 
+124, 227,  57, 130, 155,  47, 255, 135,  52, 142,  67,  68, 196, 222, 233, 203, 
+ 84, 123, 148,  50, 166, 194,  35,  61, 238,  76, 149,  11,  66, 250, 195,  78, 
+  8,  46, 161, 102,  40, 217,  36, 178, 118,  91, 162,  73, 109, 139, 209,  37, 
+114, 248, 246, 100, 134, 104, 152,  22, 212, 164,  92, 204,  93, 101, 182, 146, 
+108, 112,  72,  80, 253, 237, 185, 218,  94,  21,  70,  87, 167, 141, 157, 132, 
+144, 216, 171,   0, 140, 188, 211,  10, 247, 228,  88,   5, 184, 179,  69,   6, 
+208,  44,  30, 143, 202,  63,  15,   2, 193, 175, 189,   3,   1,  19, 138, 107, 
+ 58, 145,  17,  65,  79, 103, 220, 234, 151, 242, 207, 206, 240, 180, 230, 115, 
+150, 172, 116,  34, 231, 173,  53, 133, 226, 249,  55, 232,  28, 117, 223, 110, 
+ 71, 241,  26, 113,  29,  41, 197, 137, 111, 183,  98,  14, 170,  24, 190,  27, 
+252,  86,  62,  75, 198, 210, 121,  32, 154, 219, 192, 254, 120, 205,  90, 244, 
+ 31, 221, 168,  51, 136,   7, 199,  49, 177,  18,  16,  89,  39, 128, 236,  95, 
+ 96,  81, 127, 169,  25, 181,  74,  13,  45, 229, 122, 159, 147, 201, 156, 239, 
+160, 224,  59,  77, 174,  42, 245, 176, 200, 235, 187,  60, 131,  83, 153,  97, 
+ 23,  43,   4, 126, 186, 119, 214,  38, 225, 105,  20,  99,  85,  33,  12, 125
+};
+#endif /* INTERMEDIATE_VALUE_KAT */
+
+word8 T1[256][4] = {
+    {0xc6,0x63,0x63,0xa5},
+    {0xf8,0x7c,0x7c,0x84},
+    {0xee,0x77,0x77,0x99},
+    {0xf6,0x7b,0x7b,0x8d},
+
+    {0xff,0xf2,0xf2,0x0d},
+    {0xd6,0x6b,0x6b,0xbd},
+    {0xde,0x6f,0x6f,0xb1},
+    {0x91,0xc5,0xc5,0x54},
+
+    {0x60,0x30,0x30,0x50},
+    {0x02,0x01,0x01,0x03},
+    {0xce,0x67,0x67,0xa9},
+    {0x56,0x2b,0x2b,0x7d},
+
+    {0xe7,0xfe,0xfe,0x19},
+    {0xb5,0xd7,0xd7,0x62},
+    {0x4d,0xab,0xab,0xe6},
+    {0xec,0x76,0x76,0x9a},
+
+    {0x8f,0xca,0xca,0x45},
+    {0x1f,0x82,0x82,0x9d},
+    {0x89,0xc9,0xc9,0x40},
+    {0xfa,0x7d,0x7d,0x87},
+
+    {0xef,0xfa,0xfa,0x15},
+    {0xb2,0x59,0x59,0xeb},
+    {0x8e,0x47,0x47,0xc9},
+    {0xfb,0xf0,0xf0,0x0b},
+
+    {0x41,0xad,0xad,0xec},
+    {0xb3,0xd4,0xd4,0x67},
+    {0x5f,0xa2,0xa2,0xfd},
+    {0x45,0xaf,0xaf,0xea},
+
+    {0x23,0x9c,0x9c,0xbf},
+    {0x53,0xa4,0xa4,0xf7},
+    {0xe4,0x72,0x72,0x96},
+    {0x9b,0xc0,0xc0,0x5b},
+
+    {0x75,0xb7,0xb7,0xc2},
+    {0xe1,0xfd,0xfd,0x1c},
+    {0x3d,0x93,0x93,0xae},
+    {0x4c,0x26,0x26,0x6a},
+
+    {0x6c,0x36,0x36,0x5a},
+    {0x7e,0x3f,0x3f,0x41},
+    {0xf5,0xf7,0xf7,0x02},
+    {0x83,0xcc,0xcc,0x4f},
+
+    {0x68,0x34,0x34,0x5c},
+    {0x51,0xa5,0xa5,0xf4},
+    {0xd1,0xe5,0xe5,0x34},
+    {0xf9,0xf1,0xf1,0x08},
+
+    {0xe2,0x71,0x71,0x93},
+    {0xab,0xd8,0xd8,0x73},
+    {0x62,0x31,0x31,0x53},
+    {0x2a,0x15,0x15,0x3f},
+
+    {0x08,0x04,0x04,0x0c},
+    {0x95,0xc7,0xc7,0x52},
+    {0x46,0x23,0x23,0x65},
+    {0x9d,0xc3,0xc3,0x5e},
+
+    {0x30,0x18,0x18,0x28},
+    {0x37,0x96,0x96,0xa1},
+    {0x0a,0x05,0x05,0x0f},
+    {0x2f,0x9a,0x9a,0xb5},
+
+    {0x0e,0x07,0x07,0x09},
+    {0x24,0x12,0x12,0x36},
+    {0x1b,0x80,0x80,0x9b},
+    {0xdf,0xe2,0xe2,0x3d},
+
+    {0xcd,0xeb,0xeb,0x26},
+    {0x4e,0x27,0x27,0x69},
+    {0x7f,0xb2,0xb2,0xcd},
+    {0xea,0x75,0x75,0x9f},
+
+    {0x12,0x09,0x09,0x1b},
+    {0x1d,0x83,0x83,0x9e},
+    {0x58,0x2c,0x2c,0x74},
+    {0x34,0x1a,0x1a,0x2e},
+
+    {0x36,0x1b,0x1b,0x2d},
+    {0xdc,0x6e,0x6e,0xb2},
+    {0xb4,0x5a,0x5a,0xee},
+    {0x5b,0xa0,0xa0,0xfb},
+
+    {0xa4,0x52,0x52,0xf6},
+    {0x76,0x3b,0x3b,0x4d},
+    {0xb7,0xd6,0xd6,0x61},
+    {0x7d,0xb3,0xb3,0xce},
+
+    {0x52,0x29,0x29,0x7b},
+    {0xdd,0xe3,0xe3,0x3e},
+    {0x5e,0x2f,0x2f,0x71},
+    {0x13,0x84,0x84,0x97},
+
+    {0xa6,0x53,0x53,0xf5},
+    {0xb9,0xd1,0xd1,0x68},
+    {0x00,0x00,0x00,0x00},
+    {0xc1,0xed,0xed,0x2c},
+
+    {0x40,0x20,0x20,0x60},
+    {0xe3,0xfc,0xfc,0x1f},
+    {0x79,0xb1,0xb1,0xc8},
+    {0xb6,0x5b,0x5b,0xed},
+
+    {0xd4,0x6a,0x6a,0xbe},
+    {0x8d,0xcb,0xcb,0x46},
+    {0x67,0xbe,0xbe,0xd9},
+    {0x72,0x39,0x39,0x4b},
+
+    {0x94,0x4a,0x4a,0xde},
+    {0x98,0x4c,0x4c,0xd4},
+    {0xb0,0x58,0x58,0xe8},
+    {0x85,0xcf,0xcf,0x4a},
+
+    {0xbb,0xd0,0xd0,0x6b},
+    {0xc5,0xef,0xef,0x2a},
+    {0x4f,0xaa,0xaa,0xe5},
+    {0xed,0xfb,0xfb,0x16},
+
+    {0x86,0x43,0x43,0xc5},
+    {0x9a,0x4d,0x4d,0xd7},
+    {0x66,0x33,0x33,0x55},
+    {0x11,0x85,0x85,0x94},
+
+    {0x8a,0x45,0x45,0xcf},
+    {0xe9,0xf9,0xf9,0x10},
+    {0x04,0x02,0x02,0x06},
+    {0xfe,0x7f,0x7f,0x81},
+
+    {0xa0,0x50,0x50,0xf0},
+    {0x78,0x3c,0x3c,0x44},
+    {0x25,0x9f,0x9f,0xba},
+    {0x4b,0xa8,0xa8,0xe3},
+
+    {0xa2,0x51,0x51,0xf3},
+    {0x5d,0xa3,0xa3,0xfe},
+    {0x80,0x40,0x40,0xc0},
+    {0x05,0x8f,0x8f,0x8a},
+
+    {0x3f,0x92,0x92,0xad},
+    {0x21,0x9d,0x9d,0xbc},
+    {0x70,0x38,0x38,0x48},
+    {0xf1,0xf5,0xf5,0x04},
+
+    {0x63,0xbc,0xbc,0xdf},
+    {0x77,0xb6,0xb6,0xc1},
+    {0xaf,0xda,0xda,0x75},
+    {0x42,0x21,0x21,0x63},
+
+    {0x20,0x10,0x10,0x30},
+    {0xe5,0xff,0xff,0x1a},
+    {0xfd,0xf3,0xf3,0x0e},
+    {0xbf,0xd2,0xd2,0x6d},
+
+    {0x81,0xcd,0xcd,0x4c},
+    {0x18,0x0c,0x0c,0x14},
+    {0x26,0x13,0x13,0x35},
+    {0xc3,0xec,0xec,0x2f},
+
+    {0xbe,0x5f,0x5f,0xe1},
+    {0x35,0x97,0x97,0xa2},
+    {0x88,0x44,0x44,0xcc},
+    {0x2e,0x17,0x17,0x39},
+
+    {0x93,0xc4,0xc4,0x57},
+    {0x55,0xa7,0xa7,0xf2},
+    {0xfc,0x7e,0x7e,0x82},
+    {0x7a,0x3d,0x3d,0x47},
+
+    {0xc8,0x64,0x64,0xac},
+    {0xba,0x5d,0x5d,0xe7},
+    {0x32,0x19,0x19,0x2b},
+    {0xe6,0x73,0x73,0x95},
+
+    {0xc0,0x60,0x60,0xa0},
+    {0x19,0x81,0x81,0x98},
+    {0x9e,0x4f,0x4f,0xd1},
+    {0xa3,0xdc,0xdc,0x7f},
+
+    {0x44,0x22,0x22,0x66},
+    {0x54,0x2a,0x2a,0x7e},
+    {0x3b,0x90,0x90,0xab},
+    {0x0b,0x88,0x88,0x83},
+
+    {0x8c,0x46,0x46,0xca},
+    {0xc7,0xee,0xee,0x29},
+    {0x6b,0xb8,0xb8,0xd3},
+    {0x28,0x14,0x14,0x3c},
+
+    {0xa7,0xde,0xde,0x79},
+    {0xbc,0x5e,0x5e,0xe2},
+    {0x16,0x0b,0x0b,0x1d},
+    {0xad,0xdb,0xdb,0x76},
+
+    {0xdb,0xe0,0xe0,0x3b},
+    {0x64,0x32,0x32,0x56},
+    {0x74,0x3a,0x3a,0x4e},
+    {0x14,0x0a,0x0a,0x1e},
+
+    {0x92,0x49,0x49,0xdb},
+    {0x0c,0x06,0x06,0x0a},
+    {0x48,0x24,0x24,0x6c},
+    {0xb8,0x5c,0x5c,0xe4},
+
+    {0x9f,0xc2,0xc2,0x5d},
+    {0xbd,0xd3,0xd3,0x6e},
+    {0x43,0xac,0xac,0xef},
+    {0xc4,0x62,0x62,0xa6},
+
+    {0x39,0x91,0x91,0xa8},
+    {0x31,0x95,0x95,0xa4},
+    {0xd3,0xe4,0xe4,0x37},
+    {0xf2,0x79,0x79,0x8b},
+
+    {0xd5,0xe7,0xe7,0x32},
+    {0x8b,0xc8,0xc8,0x43},
+    {0x6e,0x37,0x37,0x59},
+    {0xda,0x6d,0x6d,0xb7},
+
+    {0x01,0x8d,0x8d,0x8c},
+    {0xb1,0xd5,0xd5,0x64},
+    {0x9c,0x4e,0x4e,0xd2},
+    {0x49,0xa9,0xa9,0xe0},
+
+    {0xd8,0x6c,0x6c,0xb4},
+    {0xac,0x56,0x56,0xfa},
+    {0xf3,0xf4,0xf4,0x07},
+    {0xcf,0xea,0xea,0x25},
+
+    {0xca,0x65,0x65,0xaf},
+    {0xf4,0x7a,0x7a,0x8e},
+    {0x47,0xae,0xae,0xe9},
+    {0x10,0x08,0x08,0x18},
+
+    {0x6f,0xba,0xba,0xd5},
+    {0xf0,0x78,0x78,0x88},
+    {0x4a,0x25,0x25,0x6f},
+    {0x5c,0x2e,0x2e,0x72},
+
+    {0x38,0x1c,0x1c,0x24},
+    {0x57,0xa6,0xa6,0xf1},
+    {0x73,0xb4,0xb4,0xc7},
+    {0x97,0xc6,0xc6,0x51},
+
+    {0xcb,0xe8,0xe8,0x23},
+    {0xa1,0xdd,0xdd,0x7c},
+    {0xe8,0x74,0x74,0x9c},
+    {0x3e,0x1f,0x1f,0x21},
+
+    {0x96,0x4b,0x4b,0xdd},
+    {0x61,0xbd,0xbd,0xdc},
+    {0x0d,0x8b,0x8b,0x86},
+    {0x0f,0x8a,0x8a,0x85},
+
+    {0xe0,0x70,0x70,0x90},
+    {0x7c,0x3e,0x3e,0x42},
+    {0x71,0xb5,0xb5,0xc4},
+    {0xcc,0x66,0x66,0xaa},
+
+    {0x90,0x48,0x48,0xd8},
+    {0x06,0x03,0x03,0x05},
+    {0xf7,0xf6,0xf6,0x01},
+    {0x1c,0x0e,0x0e,0x12},
+
+    {0xc2,0x61,0x61,0xa3},
+    {0x6a,0x35,0x35,0x5f},
+    {0xae,0x57,0x57,0xf9},
+    {0x69,0xb9,0xb9,0xd0},
+
+    {0x17,0x86,0x86,0x91},
+    {0x99,0xc1,0xc1,0x58},
+    {0x3a,0x1d,0x1d,0x27},
+    {0x27,0x9e,0x9e,0xb9},
+
+    {0xd9,0xe1,0xe1,0x38},
+    {0xeb,0xf8,0xf8,0x13},
+    {0x2b,0x98,0x98,0xb3},
+    {0x22,0x11,0x11,0x33},
+
+    {0xd2,0x69,0x69,0xbb},
+    {0xa9,0xd9,0xd9,0x70},
+    {0x07,0x8e,0x8e,0x89},
+    {0x33,0x94,0x94,0xa7},
+
+    {0x2d,0x9b,0x9b,0xb6},
+    {0x3c,0x1e,0x1e,0x22},
+    {0x15,0x87,0x87,0x92},
+    {0xc9,0xe9,0xe9,0x20},
+
+    {0x87,0xce,0xce,0x49},
+    {0xaa,0x55,0x55,0xff},
+    {0x50,0x28,0x28,0x78},
+    {0xa5,0xdf,0xdf,0x7a},
+
+    {0x03,0x8c,0x8c,0x8f},
+    {0x59,0xa1,0xa1,0xf8},
+    {0x09,0x89,0x89,0x80},
+    {0x1a,0x0d,0x0d,0x17},
+
+    {0x65,0xbf,0xbf,0xda},
+    {0xd7,0xe6,0xe6,0x31},
+    {0x84,0x42,0x42,0xc6},
+    {0xd0,0x68,0x68,0xb8},
+
+    {0x82,0x41,0x41,0xc3},
+    {0x29,0x99,0x99,0xb0},
+    {0x5a,0x2d,0x2d,0x77},
+    {0x1e,0x0f,0x0f,0x11},
+
+    {0x7b,0xb0,0xb0,0xcb},
+    {0xa8,0x54,0x54,0xfc},
+    {0x6d,0xbb,0xbb,0xd6},
+    {0x2c,0x16,0x16,0x3a},
+
+};
+
+word8 T2[256][4] = {
+    {0xa5,0xc6,0x63,0x63},
+    {0x84,0xf8,0x7c,0x7c},
+    {0x99,0xee,0x77,0x77},
+    {0x8d,0xf6,0x7b,0x7b},
+
+    {0x0d,0xff,0xf2,0xf2},
+    {0xbd,0xd6,0x6b,0x6b},
+    {0xb1,0xde,0x6f,0x6f},
+    {0x54,0x91,0xc5,0xc5},
+
+    {0x50,0x60,0x30,0x30},
+    {0x03,0x02,0x01,0x01},
+    {0xa9,0xce,0x67,0x67},
+    {0x7d,0x56,0x2b,0x2b},
+
+    {0x19,0xe7,0xfe,0xfe},
+    {0x62,0xb5,0xd7,0xd7},
+    {0xe6,0x4d,0xab,0xab},
+    {0x9a,0xec,0x76,0x76},
+
+    {0x45,0x8f,0xca,0xca},
+    {0x9d,0x1f,0x82,0x82},
+    {0x40,0x89,0xc9,0xc9},
+    {0x87,0xfa,0x7d,0x7d},
+
+    {0x15,0xef,0xfa,0xfa},
+    {0xeb,0xb2,0x59,0x59},
+    {0xc9,0x8e,0x47,0x47},
+    {0x0b,0xfb,0xf0,0xf0},
+
+    {0xec,0x41,0xad,0xad},
+    {0x67,0xb3,0xd4,0xd4},
+    {0xfd,0x5f,0xa2,0xa2},
+    {0xea,0x45,0xaf,0xaf},
+
+    {0xbf,0x23,0x9c,0x9c},
+    {0xf7,0x53,0xa4,0xa4},
+    {0x96,0xe4,0x72,0x72},
+    {0x5b,0x9b,0xc0,0xc0},
+
+    {0xc2,0x75,0xb7,0xb7},
+    {0x1c,0xe1,0xfd,0xfd},
+    {0xae,0x3d,0x93,0x93},
+    {0x6a,0x4c,0x26,0x26},
+
+    {0x5a,0x6c,0x36,0x36},
+    {0x41,0x7e,0x3f,0x3f},
+    {0x02,0xf5,0xf7,0xf7},
+    {0x4f,0x83,0xcc,0xcc},
+
+    {0x5c,0x68,0x34,0x34},
+    {0xf4,0x51,0xa5,0xa5},
+    {0x34,0xd1,0xe5,0xe5},
+    {0x08,0xf9,0xf1,0xf1},
+
+    {0x93,0xe2,0x71,0x71},
+    {0x73,0xab,0xd8,0xd8},
+    {0x53,0x62,0x31,0x31},
+    {0x3f,0x2a,0x15,0x15},
+
+    {0x0c,0x08,0x04,0x04},
+    {0x52,0x95,0xc7,0xc7},
+    {0x65,0x46,0x23,0x23},
+    {0x5e,0x9d,0xc3,0xc3},
+
+    {0x28,0x30,0x18,0x18},
+    {0xa1,0x37,0x96,0x96},
+    {0x0f,0x0a,0x05,0x05},
+    {0xb5,0x2f,0x9a,0x9a},
+
+    {0x09,0x0e,0x07,0x07},
+    {0x36,0x24,0x12,0x12},
+    {0x9b,0x1b,0x80,0x80},
+    {0x3d,0xdf,0xe2,0xe2},
+
+    {0x26,0xcd,0xeb,0xeb},
+    {0x69,0x4e,0x27,0x27},
+    {0xcd,0x7f,0xb2,0xb2},
+    {0x9f,0xea,0x75,0x75},
+
+    {0x1b,0x12,0x09,0x09},
+    {0x9e,0x1d,0x83,0x83},
+    {0x74,0x58,0x2c,0x2c},
+    {0x2e,0x34,0x1a,0x1a},
+
+    {0x2d,0x36,0x1b,0x1b},
+    {0xb2,0xdc,0x6e,0x6e},
+    {0xee,0xb4,0x5a,0x5a},
+    {0xfb,0x5b,0xa0,0xa0},
+
+    {0xf6,0xa4,0x52,0x52},
+    {0x4d,0x76,0x3b,0x3b},
+    {0x61,0xb7,0xd6,0xd6},
+    {0xce,0x7d,0xb3,0xb3},
+
+    {0x7b,0x52,0x29,0x29},
+    {0x3e,0xdd,0xe3,0xe3},
+    {0x71,0x5e,0x2f,0x2f},
+    {0x97,0x13,0x84,0x84},
+
+    {0xf5,0xa6,0x53,0x53},
+    {0x68,0xb9,0xd1,0xd1},
+    {0x00,0x00,0x00,0x00},
+    {0x2c,0xc1,0xed,0xed},
+
+    {0x60,0x40,0x20,0x20},
+    {0x1f,0xe3,0xfc,0xfc},
+    {0xc8,0x79,0xb1,0xb1},
+    {0xed,0xb6,0x5b,0x5b},
+
+    {0xbe,0xd4,0x6a,0x6a},
+    {0x46,0x8d,0xcb,0xcb},
+    {0xd9,0x67,0xbe,0xbe},
+    {0x4b,0x72,0x39,0x39},
+
+    {0xde,0x94,0x4a,0x4a},
+    {0xd4,0x98,0x4c,0x4c},
+    {0xe8,0xb0,0x58,0x58},
+    {0x4a,0x85,0xcf,0xcf},
+
+    {0x6b,0xbb,0xd0,0xd0},
+    {0x2a,0xc5,0xef,0xef},
+    {0xe5,0x4f,0xaa,0xaa},
+    {0x16,0xed,0xfb,0xfb},
+
+    {0xc5,0x86,0x43,0x43},
+    {0xd7,0x9a,0x4d,0x4d},
+    {0x55,0x66,0x33,0x33},
+    {0x94,0x11,0x85,0x85},
+
+    {0xcf,0x8a,0x45,0x45},
+    {0x10,0xe9,0xf9,0xf9},
+    {0x06,0x04,0x02,0x02},
+    {0x81,0xfe,0x7f,0x7f},
+
+    {0xf0,0xa0,0x50,0x50},
+    {0x44,0x78,0x3c,0x3c},
+    {0xba,0x25,0x9f,0x9f},
+    {0xe3,0x4b,0xa8,0xa8},
+
+    {0xf3,0xa2,0x51,0x51},
+    {0xfe,0x5d,0xa3,0xa3},
+    {0xc0,0x80,0x40,0x40},
+    {0x8a,0x05,0x8f,0x8f},
+
+    {0xad,0x3f,0x92,0x92},
+    {0xbc,0x21,0x9d,0x9d},
+    {0x48,0x70,0x38,0x38},
+    {0x04,0xf1,0xf5,0xf5},
+
+    {0xdf,0x63,0xbc,0xbc},
+    {0xc1,0x77,0xb6,0xb6},
+    {0x75,0xaf,0xda,0xda},
+    {0x63,0x42,0x21,0x21},
+
+    {0x30,0x20,0x10,0x10},
+    {0x1a,0xe5,0xff,0xff},
+    {0x0e,0xfd,0xf3,0xf3},
+    {0x6d,0xbf,0xd2,0xd2},
+
+    {0x4c,0x81,0xcd,0xcd},
+    {0x14,0x18,0x0c,0x0c},
+    {0x35,0x26,0x13,0x13},
+    {0x2f,0xc3,0xec,0xec},
+
+    {0xe1,0xbe,0x5f,0x5f},
+    {0xa2,0x35,0x97,0x97},
+    {0xcc,0x88,0x44,0x44},
+    {0x39,0x2e,0x17,0x17},
+
+    {0x57,0x93,0xc4,0xc4},
+    {0xf2,0x55,0xa7,0xa7},
+    {0x82,0xfc,0x7e,0x7e},
+    {0x47,0x7a,0x3d,0x3d},
+
+    {0xac,0xc8,0x64,0x64},
+    {0xe7,0xba,0x5d,0x5d},
+    {0x2b,0x32,0x19,0x19},
+    {0x95,0xe6,0x73,0x73},
+
+    {0xa0,0xc0,0x60,0x60},
+    {0x98,0x19,0x81,0x81},
+    {0xd1,0x9e,0x4f,0x4f},
+    {0x7f,0xa3,0xdc,0xdc},
+
+    {0x66,0x44,0x22,0x22},
+    {0x7e,0x54,0x2a,0x2a},
+    {0xab,0x3b,0x90,0x90},
+    {0x83,0x0b,0x88,0x88},
+
+    {0xca,0x8c,0x46,0x46},
+    {0x29,0xc7,0xee,0xee},
+    {0xd3,0x6b,0xb8,0xb8},
+    {0x3c,0x28,0x14,0x14},
+
+    {0x79,0xa7,0xde,0xde},
+    {0xe2,0xbc,0x5e,0x5e},
+    {0x1d,0x16,0x0b,0x0b},
+    {0x76,0xad,0xdb,0xdb},
+
+    {0x3b,0xdb,0xe0,0xe0},
+    {0x56,0x64,0x32,0x32},
+    {0x4e,0x74,0x3a,0x3a},
+    {0x1e,0x14,0x0a,0x0a},
+
+    {0xdb,0x92,0x49,0x49},
+    {0x0a,0x0c,0x06,0x06},
+    {0x6c,0x48,0x24,0x24},
+    {0xe4,0xb8,0x5c,0x5c},
+
+    {0x5d,0x9f,0xc2,0xc2},
+    {0x6e,0xbd,0xd3,0xd3},
+    {0xef,0x43,0xac,0xac},
+    {0xa6,0xc4,0x62,0x62},
+
+    {0xa8,0x39,0x91,0x91},
+    {0xa4,0x31,0x95,0x95},
+    {0x37,0xd3,0xe4,0xe4},
+    {0x8b,0xf2,0x79,0x79},
+
+    {0x32,0xd5,0xe7,0xe7},
+    {0x43,0x8b,0xc8,0xc8},
+    {0x59,0x6e,0x37,0x37},
+    {0xb7,0xda,0x6d,0x6d},
+
+    {0x8c,0x01,0x8d,0x8d},
+    {0x64,0xb1,0xd5,0xd5},
+    {0xd2,0x9c,0x4e,0x4e},
+    {0xe0,0x49,0xa9,0xa9},
+
+    {0xb4,0xd8,0x6c,0x6c},
+    {0xfa,0xac,0x56,0x56},
+    {0x07,0xf3,0xf4,0xf4},
+    {0x25,0xcf,0xea,0xea},
+
+    {0xaf,0xca,0x65,0x65},
+    {0x8e,0xf4,0x7a,0x7a},
+    {0xe9,0x47,0xae,0xae},
+    {0x18,0x10,0x08,0x08},
+
+    {0xd5,0x6f,0xba,0xba},
+    {0x88,0xf0,0x78,0x78},
+    {0x6f,0x4a,0x25,0x25},
+    {0x72,0x5c,0x2e,0x2e},
+
+    {0x24,0x38,0x1c,0x1c},
+    {0xf1,0x57,0xa6,0xa6},
+    {0xc7,0x73,0xb4,0xb4},
+    {0x51,0x97,0xc6,0xc6},
+
+    {0x23,0xcb,0xe8,0xe8},
+    {0x7c,0xa1,0xdd,0xdd},
+    {0x9c,0xe8,0x74,0x74},
+    {0x21,0x3e,0x1f,0x1f},
+
+    {0xdd,0x96,0x4b,0x4b},
+    {0xdc,0x61,0xbd,0xbd},
+    {0x86,0x0d,0x8b,0x8b},
+    {0x85,0x0f,0x8a,0x8a},
+
+    {0x90,0xe0,0x70,0x70},
+    {0x42,0x7c,0x3e,0x3e},
+    {0xc4,0x71,0xb5,0xb5},
+    {0xaa,0xcc,0x66,0x66},
+
+    {0xd8,0x90,0x48,0x48},
+    {0x05,0x06,0x03,0x03},
+    {0x01,0xf7,0xf6,0xf6},
+    {0x12,0x1c,0x0e,0x0e},
+
+    {0xa3,0xc2,0x61,0x61},
+    {0x5f,0x6a,0x35,0x35},
+    {0xf9,0xae,0x57,0x57},
+    {0xd0,0x69,0xb9,0xb9},
+
+    {0x91,0x17,0x86,0x86},
+    {0x58,0x99,0xc1,0xc1},
+    {0x27,0x3a,0x1d,0x1d},
+    {0xb9,0x27,0x9e,0x9e},
+
+    {0x38,0xd9,0xe1,0xe1},
+    {0x13,0xeb,0xf8,0xf8},
+    {0xb3,0x2b,0x98,0x98},
+    {0x33,0x22,0x11,0x11},
+
+    {0xbb,0xd2,0x69,0x69},
+    {0x70,0xa9,0xd9,0xd9},
+    {0x89,0x07,0x8e,0x8e},
+    {0xa7,0x33,0x94,0x94},
+
+    {0xb6,0x2d,0x9b,0x9b},
+    {0x22,0x3c,0x1e,0x1e},
+    {0x92,0x15,0x87,0x87},
+    {0x20,0xc9,0xe9,0xe9},
+
+    {0x49,0x87,0xce,0xce},
+    {0xff,0xaa,0x55,0x55},
+    {0x78,0x50,0x28,0x28},
+    {0x7a,0xa5,0xdf,0xdf},
+
+    {0x8f,0x03,0x8c,0x8c},
+    {0xf8,0x59,0xa1,0xa1},
+    {0x80,0x09,0x89,0x89},
+    {0x17,0x1a,0x0d,0x0d},
+
+    {0xda,0x65,0xbf,0xbf},
+    {0x31,0xd7,0xe6,0xe6},
+    {0xc6,0x84,0x42,0x42},
+    {0xb8,0xd0,0x68,0x68},
+
+    {0xc3,0x82,0x41,0x41},
+    {0xb0,0x29,0x99,0x99},
+    {0x77,0x5a,0x2d,0x2d},
+    {0x11,0x1e,0x0f,0x0f},
+
+    {0xcb,0x7b,0xb0,0xb0},
+    {0xfc,0xa8,0x54,0x54},
+    {0xd6,0x6d,0xbb,0xbb},
+    {0x3a,0x2c,0x16,0x16},
+
+};
+
+word8 T3[256][4] = {
+    {0x63,0xa5,0xc6,0x63},
+    {0x7c,0x84,0xf8,0x7c},
+    {0x77,0x99,0xee,0x77},
+    {0x7b,0x8d,0xf6,0x7b},
+
+    {0xf2,0x0d,0xff,0xf2},
+    {0x6b,0xbd,0xd6,0x6b},
+    {0x6f,0xb1,0xde,0x6f},
+    {0xc5,0x54,0x91,0xc5},
+
+    {0x30,0x50,0x60,0x30},
+    {0x01,0x03,0x02,0x01},
+    {0x67,0xa9,0xce,0x67},
+    {0x2b,0x7d,0x56,0x2b},
+
+    {0xfe,0x19,0xe7,0xfe},
+    {0xd7,0x62,0xb5,0xd7},
+    {0xab,0xe6,0x4d,0xab},
+    {0x76,0x9a,0xec,0x76},
+
+    {0xca,0x45,0x8f,0xca},
+    {0x82,0x9d,0x1f,0x82},
+    {0xc9,0x40,0x89,0xc9},
+    {0x7d,0x87,0xfa,0x7d},
+
+    {0xfa,0x15,0xef,0xfa},
+    {0x59,0xeb,0xb2,0x59},
+    {0x47,0xc9,0x8e,0x47},
+    {0xf0,0x0b,0xfb,0xf0},
+
+    {0xad,0xec,0x41,0xad},
+    {0xd4,0x67,0xb3,0xd4},
+    {0xa2,0xfd,0x5f,0xa2},
+    {0xaf,0xea,0x45,0xaf},
+
+    {0x9c,0xbf,0x23,0x9c},
+    {0xa4,0xf7,0x53,0xa4},
+    {0x72,0x96,0xe4,0x72},
+    {0xc0,0x5b,0x9b,0xc0},
+
+    {0xb7,0xc2,0x75,0xb7},
+    {0xfd,0x1c,0xe1,0xfd},
+    {0x93,0xae,0x3d,0x93},
+    {0x26,0x6a,0x4c,0x26},
+
+    {0x36,0x5a,0x6c,0x36},
+    {0x3f,0x41,0x7e,0x3f},
+    {0xf7,0x02,0xf5,0xf7},
+    {0xcc,0x4f,0x83,0xcc},
+
+    {0x34,0x5c,0x68,0x34},
+    {0xa5,0xf4,0x51,0xa5},
+    {0xe5,0x34,0xd1,0xe5},
+    {0xf1,0x08,0xf9,0xf1},
+
+    {0x71,0x93,0xe2,0x71},
+    {0xd8,0x73,0xab,0xd8},
+    {0x31,0x53,0x62,0x31},
+    {0x15,0x3f,0x2a,0x15},
+
+    {0x04,0x0c,0x08,0x04},
+    {0xc7,0x52,0x95,0xc7},
+    {0x23,0x65,0x46,0x23},
+    {0xc3,0x5e,0x9d,0xc3},
+
+    {0x18,0x28,0x30,0x18},
+    {0x96,0xa1,0x37,0x96},
+    {0x05,0x0f,0x0a,0x05},
+    {0x9a,0xb5,0x2f,0x9a},
+
+    {0x07,0x09,0x0e,0x07},
+    {0x12,0x36,0x24,0x12},
+    {0x80,0x9b,0x1b,0x80},
+    {0xe2,0x3d,0xdf,0xe2},
+
+    {0xeb,0x26,0xcd,0xeb},
+    {0x27,0x69,0x4e,0x27},
+    {0xb2,0xcd,0x7f,0xb2},
+    {0x75,0x9f,0xea,0x75},
+
+    {0x09,0x1b,0x12,0x09},
+    {0x83,0x9e,0x1d,0x83},
+    {0x2c,0x74,0x58,0x2c},
+    {0x1a,0x2e,0x34,0x1a},
+
+    {0x1b,0x2d,0x36,0x1b},
+    {0x6e,0xb2,0xdc,0x6e},
+    {0x5a,0xee,0xb4,0x5a},
+    {0xa0,0xfb,0x5b,0xa0},
+
+    {0x52,0xf6,0xa4,0x52},
+    {0x3b,0x4d,0x76,0x3b},
+    {0xd6,0x61,0xb7,0xd6},
+    {0xb3,0xce,0x7d,0xb3},
+
+    {0x29,0x7b,0x52,0x29},
+    {0xe3,0x3e,0xdd,0xe3},
+    {0x2f,0x71,0x5e,0x2f},
+    {0x84,0x97,0x13,0x84},
+
+    {0x53,0xf5,0xa6,0x53},
+    {0xd1,0x68,0xb9,0xd1},
+    {0x00,0x00,0x00,0x00},
+    {0xed,0x2c,0xc1,0xed},
+
+    {0x20,0x60,0x40,0x20},
+    {0xfc,0x1f,0xe3,0xfc},
+    {0xb1,0xc8,0x79,0xb1},
+    {0x5b,0xed,0xb6,0x5b},
+
+    {0x6a,0xbe,0xd4,0x6a},
+    {0xcb,0x46,0x8d,0xcb},
+    {0xbe,0xd9,0x67,0xbe},
+    {0x39,0x4b,0x72,0x39},
+
+    {0x4a,0xde,0x94,0x4a},
+    {0x4c,0xd4,0x98,0x4c},
+    {0x58,0xe8,0xb0,0x58},
+    {0xcf,0x4a,0x85,0xcf},
+
+    {0xd0,0x6b,0xbb,0xd0},
+    {0xef,0x2a,0xc5,0xef},
+    {0xaa,0xe5,0x4f,0xaa},
+    {0xfb,0x16,0xed,0xfb},
+
+    {0x43,0xc5,0x86,0x43},
+    {0x4d,0xd7,0x9a,0x4d},
+    {0x33,0x55,0x66,0x33},
+    {0x85,0x94,0x11,0x85},
+
+    {0x45,0xcf,0x8a,0x45},
+    {0xf9,0x10,0xe9,0xf9},
+    {0x02,0x06,0x04,0x02},
+    {0x7f,0x81,0xfe,0x7f},
+
+    {0x50,0xf0,0xa0,0x50},
+    {0x3c,0x44,0x78,0x3c},
+    {0x9f,0xba,0x25,0x9f},
+    {0xa8,0xe3,0x4b,0xa8},
+
+    {0x51,0xf3,0xa2,0x51},
+    {0xa3,0xfe,0x5d,0xa3},
+    {0x40,0xc0,0x80,0x40},
+    {0x8f,0x8a,0x05,0x8f},
+
+    {0x92,0xad,0x3f,0x92},
+    {0x9d,0xbc,0x21,0x9d},
+    {0x38,0x48,0x70,0x38},
+    {0xf5,0x04,0xf1,0xf5},
+
+    {0xbc,0xdf,0x63,0xbc},
+    {0xb6,0xc1,0x77,0xb6},
+    {0xda,0x75,0xaf,0xda},
+    {0x21,0x63,0x42,0x21},
+
+    {0x10,0x30,0x20,0x10},
+    {0xff,0x1a,0xe5,0xff},
+    {0xf3,0x0e,0xfd,0xf3},
+    {0xd2,0x6d,0xbf,0xd2},
+
+    {0xcd,0x4c,0x81,0xcd},
+    {0x0c,0x14,0x18,0x0c},
+    {0x13,0x35,0x26,0x13},
+    {0xec,0x2f,0xc3,0xec},
+
+    {0x5f,0xe1,0xbe,0x5f},
+    {0x97,0xa2,0x35,0x97},
+    {0x44,0xcc,0x88,0x44},
+    {0x17,0x39,0x2e,0x17},
+
+    {0xc4,0x57,0x93,0xc4},
+    {0xa7,0xf2,0x55,0xa7},
+    {0x7e,0x82,0xfc,0x7e},
+    {0x3d,0x47,0x7a,0x3d},
+
+    {0x64,0xac,0xc8,0x64},
+    {0x5d,0xe7,0xba,0x5d},
+    {0x19,0x2b,0x32,0x19},
+    {0x73,0x95,0xe6,0x73},
+
+    {0x60,0xa0,0xc0,0x60},
+    {0x81,0x98,0x19,0x81},
+    {0x4f,0xd1,0x9e,0x4f},
+    {0xdc,0x7f,0xa3,0xdc},
+
+    {0x22,0x66,0x44,0x22},
+    {0x2a,0x7e,0x54,0x2a},
+    {0x90,0xab,0x3b,0x90},
+    {0x88,0x83,0x0b,0x88},
+
+    {0x46,0xca,0x8c,0x46},
+    {0xee,0x29,0xc7,0xee},
+    {0xb8,0xd3,0x6b,0xb8},
+    {0x14,0x3c,0x28,0x14},
+
+    {0xde,0x79,0xa7,0xde},
+    {0x5e,0xe2,0xbc,0x5e},
+    {0x0b,0x1d,0x16,0x0b},
+    {0xdb,0x76,0xad,0xdb},
+
+    {0xe0,0x3b,0xdb,0xe0},
+    {0x32,0x56,0x64,0x32},
+    {0x3a,0x4e,0x74,0x3a},
+    {0x0a,0x1e,0x14,0x0a},
+
+    {0x49,0xdb,0x92,0x49},
+    {0x06,0x0a,0x0c,0x06},
+    {0x24,0x6c,0x48,0x24},
+    {0x5c,0xe4,0xb8,0x5c},
+
+    {0xc2,0x5d,0x9f,0xc2},
+    {0xd3,0x6e,0xbd,0xd3},
+    {0xac,0xef,0x43,0xac},
+    {0x62,0xa6,0xc4,0x62},
+
+    {0x91,0xa8,0x39,0x91},
+    {0x95,0xa4,0x31,0x95},
+    {0xe4,0x37,0xd3,0xe4},
+    {0x79,0x8b,0xf2,0x79},
+
+    {0xe7,0x32,0xd5,0xe7},
+    {0xc8,0x43,0x8b,0xc8},
+    {0x37,0x59,0x6e,0x37},
+    {0x6d,0xb7,0xda,0x6d},
+
+    {0x8d,0x8c,0x01,0x8d},
+    {0xd5,0x64,0xb1,0xd5},
+    {0x4e,0xd2,0x9c,0x4e},
+    {0xa9,0xe0,0x49,0xa9},
+
+    {0x6c,0xb4,0xd8,0x6c},
+    {0x56,0xfa,0xac,0x56},
+    {0xf4,0x07,0xf3,0xf4},
+    {0xea,0x25,0xcf,0xea},
+
+    {0x65,0xaf,0xca,0x65},
+    {0x7a,0x8e,0xf4,0x7a},
+    {0xae,0xe9,0x47,0xae},
+    {0x08,0x18,0x10,0x08},
+
+    {0xba,0xd5,0x6f,0xba},
+    {0x78,0x88,0xf0,0x78},
+    {0x25,0x6f,0x4a,0x25},
+    {0x2e,0x72,0x5c,0x2e},
+
+    {0x1c,0x24,0x38,0x1c},
+    {0xa6,0xf1,0x57,0xa6},
+    {0xb4,0xc7,0x73,0xb4},
+    {0xc6,0x51,0x97,0xc6},
+
+    {0xe8,0x23,0xcb,0xe8},
+    {0xdd,0x7c,0xa1,0xdd},
+    {0x74,0x9c,0xe8,0x74},
+    {0x1f,0x21,0x3e,0x1f},
+
+    {0x4b,0xdd,0x96,0x4b},
+    {0xbd,0xdc,0x61,0xbd},
+    {0x8b,0x86,0x0d,0x8b},
+    {0x8a,0x85,0x0f,0x8a},
+
+    {0x70,0x90,0xe0,0x70},
+    {0x3e,0x42,0x7c,0x3e},
+    {0xb5,0xc4,0x71,0xb5},
+    {0x66,0xaa,0xcc,0x66},
+
+    {0x48,0xd8,0x90,0x48},
+    {0x03,0x05,0x06,0x03},
+    {0xf6,0x01,0xf7,0xf6},
+    {0x0e,0x12,0x1c,0x0e},
+
+    {0x61,0xa3,0xc2,0x61},
+    {0x35,0x5f,0x6a,0x35},
+    {0x57,0xf9,0xae,0x57},
+    {0xb9,0xd0,0x69,0xb9},
+
+    {0x86,0x91,0x17,0x86},
+    {0xc1,0x58,0x99,0xc1},
+    {0x1d,0x27,0x3a,0x1d},
+    {0x9e,0xb9,0x27,0x9e},
+
+    {0xe1,0x38,0xd9,0xe1},
+    {0xf8,0x13,0xeb,0xf8},
+    {0x98,0xb3,0x2b,0x98},
+    {0x11,0x33,0x22,0x11},
+
+    {0x69,0xbb,0xd2,0x69},
+    {0xd9,0x70,0xa9,0xd9},
+    {0x8e,0x89,0x07,0x8e},
+    {0x94,0xa7,0x33,0x94},
+
+    {0x9b,0xb6,0x2d,0x9b},
+    {0x1e,0x22,0x3c,0x1e},
+    {0x87,0x92,0x15,0x87},
+    {0xe9,0x20,0xc9,0xe9},
+
+    {0xce,0x49,0x87,0xce},
+    {0x55,0xff,0xaa,0x55},
+    {0x28,0x78,0x50,0x28},
+    {0xdf,0x7a,0xa5,0xdf},
+
+    {0x8c,0x8f,0x03,0x8c},
+    {0xa1,0xf8,0x59,0xa1},
+    {0x89,0x80,0x09,0x89},
+    {0x0d,0x17,0x1a,0x0d},
+
+    {0xbf,0xda,0x65,0xbf},
+    {0xe6,0x31,0xd7,0xe6},
+    {0x42,0xc6,0x84,0x42},
+    {0x68,0xb8,0xd0,0x68},
+
+    {0x41,0xc3,0x82,0x41},
+    {0x99,0xb0,0x29,0x99},
+    {0x2d,0x77,0x5a,0x2d},
+    {0x0f,0x11,0x1e,0x0f},
+
+    {0xb0,0xcb,0x7b,0xb0},
+    {0x54,0xfc,0xa8,0x54},
+    {0xbb,0xd6,0x6d,0xbb},
+    {0x16,0x3a,0x2c,0x16},
+
+};
+
+word8 T4[256][4] = {
+    {0x63,0x63,0xa5,0xc6},
+    {0x7c,0x7c,0x84,0xf8},
+    {0x77,0x77,0x99,0xee},
+    {0x7b,0x7b,0x8d,0xf6},
+
+    {0xf2,0xf2,0x0d,0xff},
+    {0x6b,0x6b,0xbd,0xd6},
+    {0x6f,0x6f,0xb1,0xde},
+    {0xc5,0xc5,0x54,0x91},
+
+    {0x30,0x30,0x50,0x60},
+    {0x01,0x01,0x03,0x02},
+    {0x67,0x67,0xa9,0xce},
+    {0x2b,0x2b,0x7d,0x56},
+
+    {0xfe,0xfe,0x19,0xe7},
+    {0xd7,0xd7,0x62,0xb5},
+    {0xab,0xab,0xe6,0x4d},
+    {0x76,0x76,0x9a,0xec},
+
+    {0xca,0xca,0x45,0x8f},
+    {0x82,0x82,0x9d,0x1f},
+    {0xc9,0xc9,0x40,0x89},
+    {0x7d,0x7d,0x87,0xfa},
+
+    {0xfa,0xfa,0x15,0xef},
+    {0x59,0x59,0xeb,0xb2},
+    {0x47,0x47,0xc9,0x8e},
+    {0xf0,0xf0,0x0b,0xfb},
+
+    {0xad,0xad,0xec,0x41},
+    {0xd4,0xd4,0x67,0xb3},
+    {0xa2,0xa2,0xfd,0x5f},
+    {0xaf,0xaf,0xea,0x45},
+
+    {0x9c,0x9c,0xbf,0x23},
+    {0xa4,0xa4,0xf7,0x53},
+    {0x72,0x72,0x96,0xe4},
+    {0xc0,0xc0,0x5b,0x9b},
+
+    {0xb7,0xb7,0xc2,0x75},
+    {0xfd,0xfd,0x1c,0xe1},
+    {0x93,0x93,0xae,0x3d},
+    {0x26,0x26,0x6a,0x4c},
+
+    {0x36,0x36,0x5a,0x6c},
+    {0x3f,0x3f,0x41,0x7e},
+    {0xf7,0xf7,0x02,0xf5},
+    {0xcc,0xcc,0x4f,0x83},
+
+    {0x34,0x34,0x5c,0x68},
+    {0xa5,0xa5,0xf4,0x51},
+    {0xe5,0xe5,0x34,0xd1},
+    {0xf1,0xf1,0x08,0xf9},
+
+    {0x71,0x71,0x93,0xe2},
+    {0xd8,0xd8,0x73,0xab},
+    {0x31,0x31,0x53,0x62},
+    {0x15,0x15,0x3f,0x2a},
+
+    {0x04,0x04,0x0c,0x08},
+    {0xc7,0xc7,0x52,0x95},
+    {0x23,0x23,0x65,0x46},
+    {0xc3,0xc3,0x5e,0x9d},
+
+    {0x18,0x18,0x28,0x30},
+    {0x96,0x96,0xa1,0x37},
+    {0x05,0x05,0x0f,0x0a},
+    {0x9a,0x9a,0xb5,0x2f},
+
+    {0x07,0x07,0x09,0x0e},
+    {0x12,0x12,0x36,0x24},
+    {0x80,0x80,0x9b,0x1b},
+    {0xe2,0xe2,0x3d,0xdf},
+
+    {0xeb,0xeb,0x26,0xcd},
+    {0x27,0x27,0x69,0x4e},
+    {0xb2,0xb2,0xcd,0x7f},
+    {0x75,0x75,0x9f,0xea},
+
+    {0x09,0x09,0x1b,0x12},
+    {0x83,0x83,0x9e,0x1d},
+    {0x2c,0x2c,0x74,0x58},
+    {0x1a,0x1a,0x2e,0x34},
+
+    {0x1b,0x1b,0x2d,0x36},
+    {0x6e,0x6e,0xb2,0xdc},
+    {0x5a,0x5a,0xee,0xb4},
+    {0xa0,0xa0,0xfb,0x5b},
+
+    {0x52,0x52,0xf6,0xa4},
+    {0x3b,0x3b,0x4d,0x76},
+    {0xd6,0xd6,0x61,0xb7},
+    {0xb3,0xb3,0xce,0x7d},
+
+    {0x29,0x29,0x7b,0x52},
+    {0xe3,0xe3,0x3e,0xdd},
+    {0x2f,0x2f,0x71,0x5e},
+    {0x84,0x84,0x97,0x13},
+
+    {0x53,0x53,0xf5,0xa6},
+    {0xd1,0xd1,0x68,0xb9},
+    {0x00,0x00,0x00,0x00},
+    {0xed,0xed,0x2c,0xc1},
+
+    {0x20,0x20,0x60,0x40},
+    {0xfc,0xfc,0x1f,0xe3},
+    {0xb1,0xb1,0xc8,0x79},
+    {0x5b,0x5b,0xed,0xb6},
+
+    {0x6a,0x6a,0xbe,0xd4},
+    {0xcb,0xcb,0x46,0x8d},
+    {0xbe,0xbe,0xd9,0x67},
+    {0x39,0x39,0x4b,0x72},
+
+    {0x4a,0x4a,0xde,0x94},
+    {0x4c,0x4c,0xd4,0x98},
+    {0x58,0x58,0xe8,0xb0},
+    {0xcf,0xcf,0x4a,0x85},
+
+    {0xd0,0xd0,0x6b,0xbb},
+    {0xef,0xef,0x2a,0xc5},
+    {0xaa,0xaa,0xe5,0x4f},
+    {0xfb,0xfb,0x16,0xed},
+
+    {0x43,0x43,0xc5,0x86},
+    {0x4d,0x4d,0xd7,0x9a},
+    {0x33,0x33,0x55,0x66},
+    {0x85,0x85,0x94,0x11},
+
+    {0x45,0x45,0xcf,0x8a},
+    {0xf9,0xf9,0x10,0xe9},
+    {0x02,0x02,0x06,0x04},
+    {0x7f,0x7f,0x81,0xfe},
+
+    {0x50,0x50,0xf0,0xa0},
+    {0x3c,0x3c,0x44,0x78},
+    {0x9f,0x9f,0xba,0x25},
+    {0xa8,0xa8,0xe3,0x4b},
+
+    {0x51,0x51,0xf3,0xa2},
+    {0xa3,0xa3,0xfe,0x5d},
+    {0x40,0x40,0xc0,0x80},
+    {0x8f,0x8f,0x8a,0x05},
+
+    {0x92,0x92,0xad,0x3f},
+    {0x9d,0x9d,0xbc,0x21},
+    {0x38,0x38,0x48,0x70},
+    {0xf5,0xf5,0x04,0xf1},
+
+    {0xbc,0xbc,0xdf,0x63},
+    {0xb6,0xb6,0xc1,0x77},
+    {0xda,0xda,0x75,0xaf},
+    {0x21,0x21,0x63,0x42},
+
+    {0x10,0x10,0x30,0x20},
+    {0xff,0xff,0x1a,0xe5},
+    {0xf3,0xf3,0x0e,0xfd},
+    {0xd2,0xd2,0x6d,0xbf},
+
+    {0xcd,0xcd,0x4c,0x81},
+    {0x0c,0x0c,0x14,0x18},
+    {0x13,0x13,0x35,0x26},
+    {0xec,0xec,0x2f,0xc3},
+
+    {0x5f,0x5f,0xe1,0xbe},
+    {0x97,0x97,0xa2,0x35},
+    {0x44,0x44,0xcc,0x88},
+    {0x17,0x17,0x39,0x2e},
+
+    {0xc4,0xc4,0x57,0x93},
+    {0xa7,0xa7,0xf2,0x55},
+    {0x7e,0x7e,0x82,0xfc},
+    {0x3d,0x3d,0x47,0x7a},
+
+    {0x64,0x64,0xac,0xc8},
+    {0x5d,0x5d,0xe7,0xba},
+    {0x19,0x19,0x2b,0x32},
+    {0x73,0x73,0x95,0xe6},
+
+    {0x60,0x60,0xa0,0xc0},
+    {0x81,0x81,0x98,0x19},
+    {0x4f,0x4f,0xd1,0x9e},
+    {0xdc,0xdc,0x7f,0xa3},
+
+    {0x22,0x22,0x66,0x44},
+    {0x2a,0x2a,0x7e,0x54},
+    {0x90,0x90,0xab,0x3b},
+    {0x88,0x88,0x83,0x0b},
+
+    {0x46,0x46,0xca,0x8c},
+    {0xee,0xee,0x29,0xc7},
+    {0xb8,0xb8,0xd3,0x6b},
+    {0x14,0x14,0x3c,0x28},
+
+    {0xde,0xde,0x79,0xa7},
+    {0x5e,0x5e,0xe2,0xbc},
+    {0x0b,0x0b,0x1d,0x16},
+    {0xdb,0xdb,0x76,0xad},
+
+    {0xe0,0xe0,0x3b,0xdb},
+    {0x32,0x32,0x56,0x64},
+    {0x3a,0x3a,0x4e,0x74},
+    {0x0a,0x0a,0x1e,0x14},
+
+    {0x49,0x49,0xdb,0x92},
+    {0x06,0x06,0x0a,0x0c},
+    {0x24,0x24,0x6c,0x48},
+    {0x5c,0x5c,0xe4,0xb8},
+
+    {0xc2,0xc2,0x5d,0x9f},
+    {0xd3,0xd3,0x6e,0xbd},
+    {0xac,0xac,0xef,0x43},
+    {0x62,0x62,0xa6,0xc4},
+
+    {0x91,0x91,0xa8,0x39},
+    {0x95,0x95,0xa4,0x31},
+    {0xe4,0xe4,0x37,0xd3},
+    {0x79,0x79,0x8b,0xf2},
+
+    {0xe7,0xe7,0x32,0xd5},
+    {0xc8,0xc8,0x43,0x8b},
+    {0x37,0x37,0x59,0x6e},
+    {0x6d,0x6d,0xb7,0xda},
+
+    {0x8d,0x8d,0x8c,0x01},
+    {0xd5,0xd5,0x64,0xb1},
+    {0x4e,0x4e,0xd2,0x9c},
+    {0xa9,0xa9,0xe0,0x49},
+
+    {0x6c,0x6c,0xb4,0xd8},
+    {0x56,0x56,0xfa,0xac},
+    {0xf4,0xf4,0x07,0xf3},
+    {0xea,0xea,0x25,0xcf},
+
+    {0x65,0x65,0xaf,0xca},
+    {0x7a,0x7a,0x8e,0xf4},
+    {0xae,0xae,0xe9,0x47},
+    {0x08,0x08,0x18,0x10},
+
+    {0xba,0xba,0xd5,0x6f},
+    {0x78,0x78,0x88,0xf0},
+    {0x25,0x25,0x6f,0x4a},
+    {0x2e,0x2e,0x72,0x5c},
+
+    {0x1c,0x1c,0x24,0x38},
+    {0xa6,0xa6,0xf1,0x57},
+    {0xb4,0xb4,0xc7,0x73},
+    {0xc6,0xc6,0x51,0x97},
+
+    {0xe8,0xe8,0x23,0xcb},
+    {0xdd,0xdd,0x7c,0xa1},
+    {0x74,0x74,0x9c,0xe8},
+    {0x1f,0x1f,0x21,0x3e},
+
+    {0x4b,0x4b,0xdd,0x96},
+    {0xbd,0xbd,0xdc,0x61},
+    {0x8b,0x8b,0x86,0x0d},
+    {0x8a,0x8a,0x85,0x0f},
+
+    {0x70,0x70,0x90,0xe0},
+    {0x3e,0x3e,0x42,0x7c},
+    {0xb5,0xb5,0xc4,0x71},
+    {0x66,0x66,0xaa,0xcc},
+
+    {0x48,0x48,0xd8,0x90},
+    {0x03,0x03,0x05,0x06},
+    {0xf6,0xf6,0x01,0xf7},
+    {0x0e,0x0e,0x12,0x1c},
+
+    {0x61,0x61,0xa3,0xc2},
+    {0x35,0x35,0x5f,0x6a},
+    {0x57,0x57,0xf9,0xae},
+    {0xb9,0xb9,0xd0,0x69},
+
+    {0x86,0x86,0x91,0x17},
+    {0xc1,0xc1,0x58,0x99},
+    {0x1d,0x1d,0x27,0x3a},
+    {0x9e,0x9e,0xb9,0x27},
+
+    {0xe1,0xe1,0x38,0xd9},
+    {0xf8,0xf8,0x13,0xeb},
+    {0x98,0x98,0xb3,0x2b},
+    {0x11,0x11,0x33,0x22},
+
+    {0x69,0x69,0xbb,0xd2},
+    {0xd9,0xd9,0x70,0xa9},
+    {0x8e,0x8e,0x89,0x07},
+    {0x94,0x94,0xa7,0x33},
+
+    {0x9b,0x9b,0xb6,0x2d},
+    {0x1e,0x1e,0x22,0x3c},
+    {0x87,0x87,0x92,0x15},
+    {0xe9,0xe9,0x20,0xc9},
+
+    {0xce,0xce,0x49,0x87},
+    {0x55,0x55,0xff,0xaa},
+    {0x28,0x28,0x78,0x50},
+    {0xdf,0xdf,0x7a,0xa5},
+
+    {0x8c,0x8c,0x8f,0x03},
+    {0xa1,0xa1,0xf8,0x59},
+    {0x89,0x89,0x80,0x09},
+    {0x0d,0x0d,0x17,0x1a},
+
+    {0xbf,0xbf,0xda,0x65},
+    {0xe6,0xe6,0x31,0xd7},
+    {0x42,0x42,0xc6,0x84},
+    {0x68,0x68,0xb8,0xd0},
+
+    {0x41,0x41,0xc3,0x82},
+    {0x99,0x99,0xb0,0x29},
+    {0x2d,0x2d,0x77,0x5a},
+    {0x0f,0x0f,0x11,0x1e},
+
+    {0xb0,0xb0,0xcb,0x7b},
+    {0x54,0x54,0xfc,0xa8},
+    {0xbb,0xbb,0xd6,0x6d},
+    {0x16,0x16,0x3a,0x2c},
+
+};
+
+word8 T5[256][4] = {
+    {0x51,0xf4,0xa7,0x50},
+    {0x7e,0x41,0x65,0x53},
+    {0x1a,0x17,0xa4,0xc3},
+    {0x3a,0x27,0x5e,0x96},
+
+    {0x3b,0xab,0x6b,0xcb},
+    {0x1f,0x9d,0x45,0xf1},
+    {0xac,0xfa,0x58,0xab},
+    {0x4b,0xe3,0x03,0x93},
+
+    {0x20,0x30,0xfa,0x55},
+    {0xad,0x76,0x6d,0xf6},
+    {0x88,0xcc,0x76,0x91},
+    {0xf5,0x02,0x4c,0x25},
+
+    {0x4f,0xe5,0xd7,0xfc},
+    {0xc5,0x2a,0xcb,0xd7},
+    {0x26,0x35,0x44,0x80},
+    {0xb5,0x62,0xa3,0x8f},
+
+    {0xde,0xb1,0x5a,0x49},
+    {0x25,0xba,0x1b,0x67},
+    {0x45,0xea,0x0e,0x98},
+    {0x5d,0xfe,0xc0,0xe1},
+
+    {0xc3,0x2f,0x75,0x02},
+    {0x81,0x4c,0xf0,0x12},
+    {0x8d,0x46,0x97,0xa3},
+    {0x6b,0xd3,0xf9,0xc6},
+
+    {0x03,0x8f,0x5f,0xe7},
+    {0x15,0x92,0x9c,0x95},
+    {0xbf,0x6d,0x7a,0xeb},
+    {0x95,0x52,0x59,0xda},
+
+    {0xd4,0xbe,0x83,0x2d},
+    {0x58,0x74,0x21,0xd3},
+    {0x49,0xe0,0x69,0x29},
+    {0x8e,0xc9,0xc8,0x44},
+
+    {0x75,0xc2,0x89,0x6a},
+    {0xf4,0x8e,0x79,0x78},
+    {0x99,0x58,0x3e,0x6b},
+    {0x27,0xb9,0x71,0xdd},
+
+    {0xbe,0xe1,0x4f,0xb6},
+    {0xf0,0x88,0xad,0x17},
+    {0xc9,0x20,0xac,0x66},
+    {0x7d,0xce,0x3a,0xb4},
+
+    {0x63,0xdf,0x4a,0x18},
+    {0xe5,0x1a,0x31,0x82},
+    {0x97,0x51,0x33,0x60},
+    {0x62,0x53,0x7f,0x45},
+
+    {0xb1,0x64,0x77,0xe0},
+    {0xbb,0x6b,0xae,0x84},
+    {0xfe,0x81,0xa0,0x1c},
+    {0xf9,0x08,0x2b,0x94},
+
+    {0x70,0x48,0x68,0x58},
+    {0x8f,0x45,0xfd,0x19},
+    {0x94,0xde,0x6c,0x87},
+    {0x52,0x7b,0xf8,0xb7},
+
+    {0xab,0x73,0xd3,0x23},
+    {0x72,0x4b,0x02,0xe2},
+    {0xe3,0x1f,0x8f,0x57},
+    {0x66,0x55,0xab,0x2a},
+
+    {0xb2,0xeb,0x28,0x07},
+    {0x2f,0xb5,0xc2,0x03},
+    {0x86,0xc5,0x7b,0x9a},
+    {0xd3,0x37,0x08,0xa5},
+
+    {0x30,0x28,0x87,0xf2},
+    {0x23,0xbf,0xa5,0xb2},
+    {0x02,0x03,0x6a,0xba},
+    {0xed,0x16,0x82,0x5c},
+
+    {0x8a,0xcf,0x1c,0x2b},
+    {0xa7,0x79,0xb4,0x92},
+    {0xf3,0x07,0xf2,0xf0},
+    {0x4e,0x69,0xe2,0xa1},
+
+    {0x65,0xda,0xf4,0xcd},
+    {0x06,0x05,0xbe,0xd5},
+    {0xd1,0x34,0x62,0x1f},
+    {0xc4,0xa6,0xfe,0x8a},
+
+    {0x34,0x2e,0x53,0x9d},
+    {0xa2,0xf3,0x55,0xa0},
+    {0x05,0x8a,0xe1,0x32},
+    {0xa4,0xf6,0xeb,0x75},
+
+    {0x0b,0x83,0xec,0x39},
+    {0x40,0x60,0xef,0xaa},
+    {0x5e,0x71,0x9f,0x06},
+    {0xbd,0x6e,0x10,0x51},
+
+    {0x3e,0x21,0x8a,0xf9},
+    {0x96,0xdd,0x06,0x3d},
+    {0xdd,0x3e,0x05,0xae},
+    {0x4d,0xe6,0xbd,0x46},
+
+    {0x91,0x54,0x8d,0xb5},
+    {0x71,0xc4,0x5d,0x05},
+    {0x04,0x06,0xd4,0x6f},
+    {0x60,0x50,0x15,0xff},
+
+    {0x19,0x98,0xfb,0x24},
+    {0xd6,0xbd,0xe9,0x97},
+    {0x89,0x40,0x43,0xcc},
+    {0x67,0xd9,0x9e,0x77},
+
+    {0xb0,0xe8,0x42,0xbd},
+    {0x07,0x89,0x8b,0x88},
+    {0xe7,0x19,0x5b,0x38},
+    {0x79,0xc8,0xee,0xdb},
+
+    {0xa1,0x7c,0x0a,0x47},
+    {0x7c,0x42,0x0f,0xe9},
+    {0xf8,0x84,0x1e,0xc9},
+    {0x00,0x00,0x00,0x00},
+
+    {0x09,0x80,0x86,0x83},
+    {0x32,0x2b,0xed,0x48},
+    {0x1e,0x11,0x70,0xac},
+    {0x6c,0x5a,0x72,0x4e},
+
+    {0xfd,0x0e,0xff,0xfb},
+    {0x0f,0x85,0x38,0x56},
+    {0x3d,0xae,0xd5,0x1e},
+    {0x36,0x2d,0x39,0x27},
+
+    {0x0a,0x0f,0xd9,0x64},
+    {0x68,0x5c,0xa6,0x21},
+    {0x9b,0x5b,0x54,0xd1},
+    {0x24,0x36,0x2e,0x3a},
+
+    {0x0c,0x0a,0x67,0xb1},
+    {0x93,0x57,0xe7,0x0f},
+    {0xb4,0xee,0x96,0xd2},
+    {0x1b,0x9b,0x91,0x9e},
+
+    {0x80,0xc0,0xc5,0x4f},
+    {0x61,0xdc,0x20,0xa2},
+    {0x5a,0x77,0x4b,0x69},
+    {0x1c,0x12,0x1a,0x16},
+
+    {0xe2,0x93,0xba,0x0a},
+    {0xc0,0xa0,0x2a,0xe5},
+    {0x3c,0x22,0xe0,0x43},
+    {0x12,0x1b,0x17,0x1d},
+
+    {0x0e,0x09,0x0d,0x0b},
+    {0xf2,0x8b,0xc7,0xad},
+    {0x2d,0xb6,0xa8,0xb9},
+    {0x14,0x1e,0xa9,0xc8},
+
+    {0x57,0xf1,0x19,0x85},
+    {0xaf,0x75,0x07,0x4c},
+    {0xee,0x99,0xdd,0xbb},
+    {0xa3,0x7f,0x60,0xfd},
+
+    {0xf7,0x01,0x26,0x9f},
+    {0x5c,0x72,0xf5,0xbc},
+    {0x44,0x66,0x3b,0xc5},
+    {0x5b,0xfb,0x7e,0x34},
+
+    {0x8b,0x43,0x29,0x76},
+    {0xcb,0x23,0xc6,0xdc},
+    {0xb6,0xed,0xfc,0x68},
+    {0xb8,0xe4,0xf1,0x63},
+
+    {0xd7,0x31,0xdc,0xca},
+    {0x42,0x63,0x85,0x10},
+    {0x13,0x97,0x22,0x40},
+    {0x84,0xc6,0x11,0x20},
+
+    {0x85,0x4a,0x24,0x7d},
+    {0xd2,0xbb,0x3d,0xf8},
+    {0xae,0xf9,0x32,0x11},
+    {0xc7,0x29,0xa1,0x6d},
+
+    {0x1d,0x9e,0x2f,0x4b},
+    {0xdc,0xb2,0x30,0xf3},
+    {0x0d,0x86,0x52,0xec},
+    {0x77,0xc1,0xe3,0xd0},
+
+    {0x2b,0xb3,0x16,0x6c},
+    {0xa9,0x70,0xb9,0x99},
+    {0x11,0x94,0x48,0xfa},
+    {0x47,0xe9,0x64,0x22},
+
+    {0xa8,0xfc,0x8c,0xc4},
+    {0xa0,0xf0,0x3f,0x1a},
+    {0x56,0x7d,0x2c,0xd8},
+    {0x22,0x33,0x90,0xef},
+
+    {0x87,0x49,0x4e,0xc7},
+    {0xd9,0x38,0xd1,0xc1},
+    {0x8c,0xca,0xa2,0xfe},
+    {0x98,0xd4,0x0b,0x36},
+
+    {0xa6,0xf5,0x81,0xcf},
+    {0xa5,0x7a,0xde,0x28},
+    {0xda,0xb7,0x8e,0x26},
+    {0x3f,0xad,0xbf,0xa4},
+
+    {0x2c,0x3a,0x9d,0xe4},
+    {0x50,0x78,0x92,0x0d},
+    {0x6a,0x5f,0xcc,0x9b},
+    {0x54,0x7e,0x46,0x62},
+
+    {0xf6,0x8d,0x13,0xc2},
+    {0x90,0xd8,0xb8,0xe8},
+    {0x2e,0x39,0xf7,0x5e},
+    {0x82,0xc3,0xaf,0xf5},
+
+    {0x9f,0x5d,0x80,0xbe},
+    {0x69,0xd0,0x93,0x7c},
+    {0x6f,0xd5,0x2d,0xa9},
+    {0xcf,0x25,0x12,0xb3},
+
+    {0xc8,0xac,0x99,0x3b},
+    {0x10,0x18,0x7d,0xa7},
+    {0xe8,0x9c,0x63,0x6e},
+    {0xdb,0x3b,0xbb,0x7b},
+
+    {0xcd,0x26,0x78,0x09},
+    {0x6e,0x59,0x18,0xf4},
+    {0xec,0x9a,0xb7,0x01},
+    {0x83,0x4f,0x9a,0xa8},
+
+    {0xe6,0x95,0x6e,0x65},
+    {0xaa,0xff,0xe6,0x7e},
+    {0x21,0xbc,0xcf,0x08},
+    {0xef,0x15,0xe8,0xe6},
+
+    {0xba,0xe7,0x9b,0xd9},
+    {0x4a,0x6f,0x36,0xce},
+    {0xea,0x9f,0x09,0xd4},
+    {0x29,0xb0,0x7c,0xd6},
+
+    {0x31,0xa4,0xb2,0xaf},
+    {0x2a,0x3f,0x23,0x31},
+    {0xc6,0xa5,0x94,0x30},
+    {0x35,0xa2,0x66,0xc0},
+
+    {0x74,0x4e,0xbc,0x37},
+    {0xfc,0x82,0xca,0xa6},
+    {0xe0,0x90,0xd0,0xb0},
+    {0x33,0xa7,0xd8,0x15},
+
+    {0xf1,0x04,0x98,0x4a},
+    {0x41,0xec,0xda,0xf7},
+    {0x7f,0xcd,0x50,0x0e},
+    {0x17,0x91,0xf6,0x2f},
+
+    {0x76,0x4d,0xd6,0x8d},
+    {0x43,0xef,0xb0,0x4d},
+    {0xcc,0xaa,0x4d,0x54},
+    {0xe4,0x96,0x04,0xdf},
+
+    {0x9e,0xd1,0xb5,0xe3},
+    {0x4c,0x6a,0x88,0x1b},
+    {0xc1,0x2c,0x1f,0xb8},
+    {0x46,0x65,0x51,0x7f},
+
+    {0x9d,0x5e,0xea,0x04},
+    {0x01,0x8c,0x35,0x5d},
+    {0xfa,0x87,0x74,0x73},
+    {0xfb,0x0b,0x41,0x2e},
+
+    {0xb3,0x67,0x1d,0x5a},
+    {0x92,0xdb,0xd2,0x52},
+    {0xe9,0x10,0x56,0x33},
+    {0x6d,0xd6,0x47,0x13},
+
+    {0x9a,0xd7,0x61,0x8c},
+    {0x37,0xa1,0x0c,0x7a},
+    {0x59,0xf8,0x14,0x8e},
+    {0xeb,0x13,0x3c,0x89},
+
+    {0xce,0xa9,0x27,0xee},
+    {0xb7,0x61,0xc9,0x35},
+    {0xe1,0x1c,0xe5,0xed},
+    {0x7a,0x47,0xb1,0x3c},
+
+    {0x9c,0xd2,0xdf,0x59},
+    {0x55,0xf2,0x73,0x3f},
+    {0x18,0x14,0xce,0x79},
+    {0x73,0xc7,0x37,0xbf},
+
+    {0x53,0xf7,0xcd,0xea},
+    {0x5f,0xfd,0xaa,0x5b},
+    {0xdf,0x3d,0x6f,0x14},
+    {0x78,0x44,0xdb,0x86},
+
+    {0xca,0xaf,0xf3,0x81},
+    {0xb9,0x68,0xc4,0x3e},
+    {0x38,0x24,0x34,0x2c},
+    {0xc2,0xa3,0x40,0x5f},
+
+    {0x16,0x1d,0xc3,0x72},
+    {0xbc,0xe2,0x25,0x0c},
+    {0x28,0x3c,0x49,0x8b},
+    {0xff,0x0d,0x95,0x41},
+
+    {0x39,0xa8,0x01,0x71},
+    {0x08,0x0c,0xb3,0xde},
+    {0xd8,0xb4,0xe4,0x9c},
+    {0x64,0x56,0xc1,0x90},
+
+    {0x7b,0xcb,0x84,0x61},
+    {0xd5,0x32,0xb6,0x70},
+    {0x48,0x6c,0x5c,0x74},
+    {0xd0,0xb8,0x57,0x42},
+
+};
+
+word8 T6[256][4] = {
+    {0x50,0x51,0xf4,0xa7},
+    {0x53,0x7e,0x41,0x65},
+    {0xc3,0x1a,0x17,0xa4},
+    {0x96,0x3a,0x27,0x5e},
+
+    {0xcb,0x3b,0xab,0x6b},
+    {0xf1,0x1f,0x9d,0x45},
+    {0xab,0xac,0xfa,0x58},
+    {0x93,0x4b,0xe3,0x03},
+
+    {0x55,0x20,0x30,0xfa},
+    {0xf6,0xad,0x76,0x6d},
+    {0x91,0x88,0xcc,0x76},
+    {0x25,0xf5,0x02,0x4c},
+
+    {0xfc,0x4f,0xe5,0xd7},
+    {0xd7,0xc5,0x2a,0xcb},
+    {0x80,0x26,0x35,0x44},
+    {0x8f,0xb5,0x62,0xa3},
+
+    {0x49,0xde,0xb1,0x5a},
+    {0x67,0x25,0xba,0x1b},
+    {0x98,0x45,0xea,0x0e},
+    {0xe1,0x5d,0xfe,0xc0},
+
+    {0x02,0xc3,0x2f,0x75},
+    {0x12,0x81,0x4c,0xf0},
+    {0xa3,0x8d,0x46,0x97},
+    {0xc6,0x6b,0xd3,0xf9},
+
+    {0xe7,0x03,0x8f,0x5f},
+    {0x95,0x15,0x92,0x9c},
+    {0xeb,0xbf,0x6d,0x7a},
+    {0xda,0x95,0x52,0x59},
+
+    {0x2d,0xd4,0xbe,0x83},
+    {0xd3,0x58,0x74,0x21},
+    {0x29,0x49,0xe0,0x69},
+    {0x44,0x8e,0xc9,0xc8},
+
+    {0x6a,0x75,0xc2,0x89},
+    {0x78,0xf4,0x8e,0x79},
+    {0x6b,0x99,0x58,0x3e},
+    {0xdd,0x27,0xb9,0x71},
+
+    {0xb6,0xbe,0xe1,0x4f},
+    {0x17,0xf0,0x88,0xad},
+    {0x66,0xc9,0x20,0xac},
+    {0xb4,0x7d,0xce,0x3a},
+
+    {0x18,0x63,0xdf,0x4a},
+    {0x82,0xe5,0x1a,0x31},
+    {0x60,0x97,0x51,0x33},
+    {0x45,0x62,0x53,0x7f},
+
+    {0xe0,0xb1,0x64,0x77},
+    {0x84,0xbb,0x6b,0xae},
+    {0x1c,0xfe,0x81,0xa0},
+    {0x94,0xf9,0x08,0x2b},
+
+    {0x58,0x70,0x48,0x68},
+    {0x19,0x8f,0x45,0xfd},
+    {0x87,0x94,0xde,0x6c},
+    {0xb7,0x52,0x7b,0xf8},
+
+    {0x23,0xab,0x73,0xd3},
+    {0xe2,0x72,0x4b,0x02},
+    {0x57,0xe3,0x1f,0x8f},
+    {0x2a,0x66,0x55,0xab},
+
+    {0x07,0xb2,0xeb,0x28},
+    {0x03,0x2f,0xb5,0xc2},
+    {0x9a,0x86,0xc5,0x7b},
+    {0xa5,0xd3,0x37,0x08},
+
+    {0xf2,0x30,0x28,0x87},
+    {0xb2,0x23,0xbf,0xa5},
+    {0xba,0x02,0x03,0x6a},
+    {0x5c,0xed,0x16,0x82},
+
+    {0x2b,0x8a,0xcf,0x1c},
+    {0x92,0xa7,0x79,0xb4},
+    {0xf0,0xf3,0x07,0xf2},
+    {0xa1,0x4e,0x69,0xe2},
+
+    {0xcd,0x65,0xda,0xf4},
+    {0xd5,0x06,0x05,0xbe},
+    {0x1f,0xd1,0x34,0x62},
+    {0x8a,0xc4,0xa6,0xfe},
+
+    {0x9d,0x34,0x2e,0x53},
+    {0xa0,0xa2,0xf3,0x55},
+    {0x32,0x05,0x8a,0xe1},
+    {0x75,0xa4,0xf6,0xeb},
+
+    {0x39,0x0b,0x83,0xec},
+    {0xaa,0x40,0x60,0xef},
+    {0x06,0x5e,0x71,0x9f},
+    {0x51,0xbd,0x6e,0x10},
+
+    {0xf9,0x3e,0x21,0x8a},
+    {0x3d,0x96,0xdd,0x06},
+    {0xae,0xdd,0x3e,0x05},
+    {0x46,0x4d,0xe6,0xbd},
+
+    {0xb5,0x91,0x54,0x8d},
+    {0x05,0x71,0xc4,0x5d},
+    {0x6f,0x04,0x06,0xd4},
+    {0xff,0x60,0x50,0x15},
+
+    {0x24,0x19,0x98,0xfb},
+    {0x97,0xd6,0xbd,0xe9},
+    {0xcc,0x89,0x40,0x43},
+    {0x77,0x67,0xd9,0x9e},
+
+    {0xbd,0xb0,0xe8,0x42},
+    {0x88,0x07,0x89,0x8b},
+    {0x38,0xe7,0x19,0x5b},
+    {0xdb,0x79,0xc8,0xee},
+
+    {0x47,0xa1,0x7c,0x0a},
+    {0xe9,0x7c,0x42,0x0f},
+    {0xc9,0xf8,0x84,0x1e},
+    {0x00,0x00,0x00,0x00},
+
+    {0x83,0x09,0x80,0x86},
+    {0x48,0x32,0x2b,0xed},
+    {0xac,0x1e,0x11,0x70},
+    {0x4e,0x6c,0x5a,0x72},
+
+    {0xfb,0xfd,0x0e,0xff},
+    {0x56,0x0f,0x85,0x38},
+    {0x1e,0x3d,0xae,0xd5},
+    {0x27,0x36,0x2d,0x39},
+
+    {0x64,0x0a,0x0f,0xd9},
+    {0x21,0x68,0x5c,0xa6},
+    {0xd1,0x9b,0x5b,0x54},
+    {0x3a,0x24,0x36,0x2e},
+
+    {0xb1,0x0c,0x0a,0x67},
+    {0x0f,0x93,0x57,0xe7},
+    {0xd2,0xb4,0xee,0x96},
+    {0x9e,0x1b,0x9b,0x91},
+
+    {0x4f,0x80,0xc0,0xc5},
+    {0xa2,0x61,0xdc,0x20},
+    {0x69,0x5a,0x77,0x4b},
+    {0x16,0x1c,0x12,0x1a},
+
+    {0x0a,0xe2,0x93,0xba},
+    {0xe5,0xc0,0xa0,0x2a},
+    {0x43,0x3c,0x22,0xe0},
+    {0x1d,0x12,0x1b,0x17},
+
+    {0x0b,0x0e,0x09,0x0d},
+    {0xad,0xf2,0x8b,0xc7},
+    {0xb9,0x2d,0xb6,0xa8},
+    {0xc8,0x14,0x1e,0xa9},
+
+    {0x85,0x57,0xf1,0x19},
+    {0x4c,0xaf,0x75,0x07},
+    {0xbb,0xee,0x99,0xdd},
+    {0xfd,0xa3,0x7f,0x60},
+
+    {0x9f,0xf7,0x01,0x26},
+    {0xbc,0x5c,0x72,0xf5},
+    {0xc5,0x44,0x66,0x3b},
+    {0x34,0x5b,0xfb,0x7e},
+
+    {0x76,0x8b,0x43,0x29},
+    {0xdc,0xcb,0x23,0xc6},
+    {0x68,0xb6,0xed,0xfc},
+    {0x63,0xb8,0xe4,0xf1},
+
+    {0xca,0xd7,0x31,0xdc},
+    {0x10,0x42,0x63,0x85},
+    {0x40,0x13,0x97,0x22},
+    {0x20,0x84,0xc6,0x11},
+
+    {0x7d,0x85,0x4a,0x24},
+    {0xf8,0xd2,0xbb,0x3d},
+    {0x11,0xae,0xf9,0x32},
+    {0x6d,0xc7,0x29,0xa1},
+
+    {0x4b,0x1d,0x9e,0x2f},
+    {0xf3,0xdc,0xb2,0x30},
+    {0xec,0x0d,0x86,0x52},
+    {0xd0,0x77,0xc1,0xe3},
+
+    {0x6c,0x2b,0xb3,0x16},
+    {0x99,0xa9,0x70,0xb9},
+    {0xfa,0x11,0x94,0x48},
+    {0x22,0x47,0xe9,0x64},
+
+    {0xc4,0xa8,0xfc,0x8c},
+    {0x1a,0xa0,0xf0,0x3f},
+    {0xd8,0x56,0x7d,0x2c},
+    {0xef,0x22,0x33,0x90},
+
+    {0xc7,0x87,0x49,0x4e},
+    {0xc1,0xd9,0x38,0xd1},
+    {0xfe,0x8c,0xca,0xa2},
+    {0x36,0x98,0xd4,0x0b},
+
+    {0xcf,0xa6,0xf5,0x81},
+    {0x28,0xa5,0x7a,0xde},
+    {0x26,0xda,0xb7,0x8e},
+    {0xa4,0x3f,0xad,0xbf},
+
+    {0xe4,0x2c,0x3a,0x9d},
+    {0x0d,0x50,0x78,0x92},
+    {0x9b,0x6a,0x5f,0xcc},
+    {0x62,0x54,0x7e,0x46},
+
+    {0xc2,0xf6,0x8d,0x13},
+    {0xe8,0x90,0xd8,0xb8},
+    {0x5e,0x2e,0x39,0xf7},
+    {0xf5,0x82,0xc3,0xaf},
+
+    {0xbe,0x9f,0x5d,0x80},
+    {0x7c,0x69,0xd0,0x93},
+    {0xa9,0x6f,0xd5,0x2d},
+    {0xb3,0xcf,0x25,0x12},
+
+    {0x3b,0xc8,0xac,0x99},
+    {0xa7,0x10,0x18,0x7d},
+    {0x6e,0xe8,0x9c,0x63},
+    {0x7b,0xdb,0x3b,0xbb},
+
+    {0x09,0xcd,0x26,0x78},
+    {0xf4,0x6e,0x59,0x18},
+    {0x01,0xec,0x9a,0xb7},
+    {0xa8,0x83,0x4f,0x9a},
+
+    {0x65,0xe6,0x95,0x6e},
+    {0x7e,0xaa,0xff,0xe6},
+    {0x08,0x21,0xbc,0xcf},
+    {0xe6,0xef,0x15,0xe8},
+
+    {0xd9,0xba,0xe7,0x9b},
+    {0xce,0x4a,0x6f,0x36},
+    {0xd4,0xea,0x9f,0x09},
+    {0xd6,0x29,0xb0,0x7c},
+
+    {0xaf,0x31,0xa4,0xb2},
+    {0x31,0x2a,0x3f,0x23},
+    {0x30,0xc6,0xa5,0x94},
+    {0xc0,0x35,0xa2,0x66},
+
+    {0x37,0x74,0x4e,0xbc},
+    {0xa6,0xfc,0x82,0xca},
+    {0xb0,0xe0,0x90,0xd0},
+    {0x15,0x33,0xa7,0xd8},
+
+    {0x4a,0xf1,0x04,0x98},
+    {0xf7,0x41,0xec,0xda},
+    {0x0e,0x7f,0xcd,0x50},
+    {0x2f,0x17,0x91,0xf6},
+
+    {0x8d,0x76,0x4d,0xd6},
+    {0x4d,0x43,0xef,0xb0},
+    {0x54,0xcc,0xaa,0x4d},
+    {0xdf,0xe4,0x96,0x04},
+
+    {0xe3,0x9e,0xd1,0xb5},
+    {0x1b,0x4c,0x6a,0x88},
+    {0xb8,0xc1,0x2c,0x1f},
+    {0x7f,0x46,0x65,0x51},
+
+    {0x04,0x9d,0x5e,0xea},
+    {0x5d,0x01,0x8c,0x35},
+    {0x73,0xfa,0x87,0x74},
+    {0x2e,0xfb,0x0b,0x41},
+
+    {0x5a,0xb3,0x67,0x1d},
+    {0x52,0x92,0xdb,0xd2},
+    {0x33,0xe9,0x10,0x56},
+    {0x13,0x6d,0xd6,0x47},
+
+    {0x8c,0x9a,0xd7,0x61},
+    {0x7a,0x37,0xa1,0x0c},
+    {0x8e,0x59,0xf8,0x14},
+    {0x89,0xeb,0x13,0x3c},
+
+    {0xee,0xce,0xa9,0x27},
+    {0x35,0xb7,0x61,0xc9},
+    {0xed,0xe1,0x1c,0xe5},
+    {0x3c,0x7a,0x47,0xb1},
+
+    {0x59,0x9c,0xd2,0xdf},
+    {0x3f,0x55,0xf2,0x73},
+    {0x79,0x18,0x14,0xce},
+    {0xbf,0x73,0xc7,0x37},
+
+    {0xea,0x53,0xf7,0xcd},
+    {0x5b,0x5f,0xfd,0xaa},
+    {0x14,0xdf,0x3d,0x6f},
+    {0x86,0x78,0x44,0xdb},
+
+    {0x81,0xca,0xaf,0xf3},
+    {0x3e,0xb9,0x68,0xc4},
+    {0x2c,0x38,0x24,0x34},
+    {0x5f,0xc2,0xa3,0x40},
+
+    {0x72,0x16,0x1d,0xc3},
+    {0x0c,0xbc,0xe2,0x25},
+    {0x8b,0x28,0x3c,0x49},
+    {0x41,0xff,0x0d,0x95},
+
+    {0x71,0x39,0xa8,0x01},
+    {0xde,0x08,0x0c,0xb3},
+    {0x9c,0xd8,0xb4,0xe4},
+    {0x90,0x64,0x56,0xc1},
+
+    {0x61,0x7b,0xcb,0x84},
+    {0x70,0xd5,0x32,0xb6},
+    {0x74,0x48,0x6c,0x5c},
+    {0x42,0xd0,0xb8,0x57},
+
+};
+
+word8 T7[256][4] = {
+    {0xa7,0x50,0x51,0xf4},
+    {0x65,0x53,0x7e,0x41},
+    {0xa4,0xc3,0x1a,0x17},
+    {0x5e,0x96,0x3a,0x27},
+
+    {0x6b,0xcb,0x3b,0xab},
+    {0x45,0xf1,0x1f,0x9d},
+    {0x58,0xab,0xac,0xfa},
+    {0x03,0x93,0x4b,0xe3},
+
+    {0xfa,0x55,0x20,0x30},
+    {0x6d,0xf6,0xad,0x76},
+    {0x76,0x91,0x88,0xcc},
+    {0x4c,0x25,0xf5,0x02},
+
+    {0xd7,0xfc,0x4f,0xe5},
+    {0xcb,0xd7,0xc5,0x2a},
+    {0x44,0x80,0x26,0x35},
+    {0xa3,0x8f,0xb5,0x62},
+
+    {0x5a,0x49,0xde,0xb1},
+    {0x1b,0x67,0x25,0xba},
+    {0x0e,0x98,0x45,0xea},
+    {0xc0,0xe1,0x5d,0xfe},
+
+    {0x75,0x02,0xc3,0x2f},
+    {0xf0,0x12,0x81,0x4c},
+    {0x97,0xa3,0x8d,0x46},
+    {0xf9,0xc6,0x6b,0xd3},
+
+    {0x5f,0xe7,0x03,0x8f},
+    {0x9c,0x95,0x15,0x92},
+    {0x7a,0xeb,0xbf,0x6d},
+    {0x59,0xda,0x95,0x52},
+
+    {0x83,0x2d,0xd4,0xbe},
+    {0x21,0xd3,0x58,0x74},
+    {0x69,0x29,0x49,0xe0},
+    {0xc8,0x44,0x8e,0xc9},
+
+    {0x89,0x6a,0x75,0xc2},
+    {0x79,0x78,0xf4,0x8e},
+    {0x3e,0x6b,0x99,0x58},
+    {0x71,0xdd,0x27,0xb9},
+
+    {0x4f,0xb6,0xbe,0xe1},
+    {0xad,0x17,0xf0,0x88},
+    {0xac,0x66,0xc9,0x20},
+    {0x3a,0xb4,0x7d,0xce},
+
+    {0x4a,0x18,0x63,0xdf},
+    {0x31,0x82,0xe5,0x1a},
+    {0x33,0x60,0x97,0x51},
+    {0x7f,0x45,0x62,0x53},
+
+    {0x77,0xe0,0xb1,0x64},
+    {0xae,0x84,0xbb,0x6b},
+    {0xa0,0x1c,0xfe,0x81},
+    {0x2b,0x94,0xf9,0x08},
+
+    {0x68,0x58,0x70,0x48},
+    {0xfd,0x19,0x8f,0x45},
+    {0x6c,0x87,0x94,0xde},
+    {0xf8,0xb7,0x52,0x7b},
+
+    {0xd3,0x23,0xab,0x73},
+    {0x02,0xe2,0x72,0x4b},
+    {0x8f,0x57,0xe3,0x1f},
+    {0xab,0x2a,0x66,0x55},
+
+    {0x28,0x07,0xb2,0xeb},
+    {0xc2,0x03,0x2f,0xb5},
+    {0x7b,0x9a,0x86,0xc5},
+    {0x08,0xa5,0xd3,0x37},
+
+    {0x87,0xf2,0x30,0x28},
+    {0xa5,0xb2,0x23,0xbf},
+    {0x6a,0xba,0x02,0x03},
+    {0x82,0x5c,0xed,0x16},
+
+    {0x1c,0x2b,0x8a,0xcf},
+    {0xb4,0x92,0xa7,0x79},
+    {0xf2,0xf0,0xf3,0x07},
+    {0xe2,0xa1,0x4e,0x69},
+
+    {0xf4,0xcd,0x65,0xda},
+    {0xbe,0xd5,0x06,0x05},
+    {0x62,0x1f,0xd1,0x34},
+    {0xfe,0x8a,0xc4,0xa6},
+
+    {0x53,0x9d,0x34,0x2e},
+    {0x55,0xa0,0xa2,0xf3},
+    {0xe1,0x32,0x05,0x8a},
+    {0xeb,0x75,0xa4,0xf6},
+
+    {0xec,0x39,0x0b,0x83},
+    {0xef,0xaa,0x40,0x60},
+    {0x9f,0x06,0x5e,0x71},
+    {0x10,0x51,0xbd,0x6e},
+
+    {0x8a,0xf9,0x3e,0x21},
+    {0x06,0x3d,0x96,0xdd},
+    {0x05,0xae,0xdd,0x3e},
+    {0xbd,0x46,0x4d,0xe6},
+
+    {0x8d,0xb5,0x91,0x54},
+    {0x5d,0x05,0x71,0xc4},
+    {0xd4,0x6f,0x04,0x06},
+    {0x15,0xff,0x60,0x50},
+
+    {0xfb,0x24,0x19,0x98},
+    {0xe9,0x97,0xd6,0xbd},
+    {0x43,0xcc,0x89,0x40},
+    {0x9e,0x77,0x67,0xd9},
+
+    {0x42,0xbd,0xb0,0xe8},
+    {0x8b,0x88,0x07,0x89},
+    {0x5b,0x38,0xe7,0x19},
+    {0xee,0xdb,0x79,0xc8},
+
+    {0x0a,0x47,0xa1,0x7c},
+    {0x0f,0xe9,0x7c,0x42},
+    {0x1e,0xc9,0xf8,0x84},
+    {0x00,0x00,0x00,0x00},
+
+    {0x86,0x83,0x09,0x80},
+    {0xed,0x48,0x32,0x2b},
+    {0x70,0xac,0x1e,0x11},
+    {0x72,0x4e,0x6c,0x5a},
+
+    {0xff,0xfb,0xfd,0x0e},
+    {0x38,0x56,0x0f,0x85},
+    {0xd5,0x1e,0x3d,0xae},
+    {0x39,0x27,0x36,0x2d},
+
+    {0xd9,0x64,0x0a,0x0f},
+    {0xa6,0x21,0x68,0x5c},
+    {0x54,0xd1,0x9b,0x5b},
+    {0x2e,0x3a,0x24,0x36},
+
+    {0x67,0xb1,0x0c,0x0a},
+    {0xe7,0x0f,0x93,0x57},
+    {0x96,0xd2,0xb4,0xee},
+    {0x91,0x9e,0x1b,0x9b},
+
+    {0xc5,0x4f,0x80,0xc0},
+    {0x20,0xa2,0x61,0xdc},
+    {0x4b,0x69,0x5a,0x77},
+    {0x1a,0x16,0x1c,0x12},
+
+    {0xba,0x0a,0xe2,0x93},
+    {0x2a,0xe5,0xc0,0xa0},
+    {0xe0,0x43,0x3c,0x22},
+    {0x17,0x1d,0x12,0x1b},
+
+    {0x0d,0x0b,0x0e,0x09},
+    {0xc7,0xad,0xf2,0x8b},
+    {0xa8,0xb9,0x2d,0xb6},
+    {0xa9,0xc8,0x14,0x1e},
+
+    {0x19,0x85,0x57,0xf1},
+    {0x07,0x4c,0xaf,0x75},
+    {0xdd,0xbb,0xee,0x99},
+    {0x60,0xfd,0xa3,0x7f},
+
+    {0x26,0x9f,0xf7,0x01},
+    {0xf5,0xbc,0x5c,0x72},
+    {0x3b,0xc5,0x44,0x66},
+    {0x7e,0x34,0x5b,0xfb},
+
+    {0x29,0x76,0x8b,0x43},
+    {0xc6,0xdc,0xcb,0x23},
+    {0xfc,0x68,0xb6,0xed},
+    {0xf1,0x63,0xb8,0xe4},
+
+    {0xdc,0xca,0xd7,0x31},
+    {0x85,0x10,0x42,0x63},
+    {0x22,0x40,0x13,0x97},
+    {0x11,0x20,0x84,0xc6},
+
+    {0x24,0x7d,0x85,0x4a},
+    {0x3d,0xf8,0xd2,0xbb},
+    {0x32,0x11,0xae,0xf9},
+    {0xa1,0x6d,0xc7,0x29},
+
+    {0x2f,0x4b,0x1d,0x9e},
+    {0x30,0xf3,0xdc,0xb2},
+    {0x52,0xec,0x0d,0x86},
+    {0xe3,0xd0,0x77,0xc1},
+
+    {0x16,0x6c,0x2b,0xb3},
+    {0xb9,0x99,0xa9,0x70},
+    {0x48,0xfa,0x11,0x94},
+    {0x64,0x22,0x47,0xe9},
+
+    {0x8c,0xc4,0xa8,0xfc},
+    {0x3f,0x1a,0xa0,0xf0},
+    {0x2c,0xd8,0x56,0x7d},
+    {0x90,0xef,0x22,0x33},
+
+    {0x4e,0xc7,0x87,0x49},
+    {0xd1,0xc1,0xd9,0x38},
+    {0xa2,0xfe,0x8c,0xca},
+    {0x0b,0x36,0x98,0xd4},
+
+    {0x81,0xcf,0xa6,0xf5},
+    {0xde,0x28,0xa5,0x7a},
+    {0x8e,0x26,0xda,0xb7},
+    {0xbf,0xa4,0x3f,0xad},
+
+    {0x9d,0xe4,0x2c,0x3a},
+    {0x92,0x0d,0x50,0x78},
+    {0xcc,0x9b,0x6a,0x5f},
+    {0x46,0x62,0x54,0x7e},
+
+    {0x13,0xc2,0xf6,0x8d},
+    {0xb8,0xe8,0x90,0xd8},
+    {0xf7,0x5e,0x2e,0x39},
+    {0xaf,0xf5,0x82,0xc3},
+
+    {0x80,0xbe,0x9f,0x5d},
+    {0x93,0x7c,0x69,0xd0},
+    {0x2d,0xa9,0x6f,0xd5},
+    {0x12,0xb3,0xcf,0x25},
+
+    {0x99,0x3b,0xc8,0xac},
+    {0x7d,0xa7,0x10,0x18},
+    {0x63,0x6e,0xe8,0x9c},
+    {0xbb,0x7b,0xdb,0x3b},
+
+    {0x78,0x09,0xcd,0x26},
+    {0x18,0xf4,0x6e,0x59},
+    {0xb7,0x01,0xec,0x9a},
+    {0x9a,0xa8,0x83,0x4f},
+
+    {0x6e,0x65,0xe6,0x95},
+    {0xe6,0x7e,0xaa,0xff},
+    {0xcf,0x08,0x21,0xbc},
+    {0xe8,0xe6,0xef,0x15},
+
+    {0x9b,0xd9,0xba,0xe7},
+    {0x36,0xce,0x4a,0x6f},
+    {0x09,0xd4,0xea,0x9f},
+    {0x7c,0xd6,0x29,0xb0},
+
+    {0xb2,0xaf,0x31,0xa4},
+    {0x23,0x31,0x2a,0x3f},
+    {0x94,0x30,0xc6,0xa5},
+    {0x66,0xc0,0x35,0xa2},
+
+    {0xbc,0x37,0x74,0x4e},
+    {0xca,0xa6,0xfc,0x82},
+    {0xd0,0xb0,0xe0,0x90},
+    {0xd8,0x15,0x33,0xa7},
+
+    {0x98,0x4a,0xf1,0x04},
+    {0xda,0xf7,0x41,0xec},
+    {0x50,0x0e,0x7f,0xcd},
+    {0xf6,0x2f,0x17,0x91},
+
+    {0xd6,0x8d,0x76,0x4d},
+    {0xb0,0x4d,0x43,0xef},
+    {0x4d,0x54,0xcc,0xaa},
+    {0x04,0xdf,0xe4,0x96},
+
+    {0xb5,0xe3,0x9e,0xd1},
+    {0x88,0x1b,0x4c,0x6a},
+    {0x1f,0xb8,0xc1,0x2c},
+    {0x51,0x7f,0x46,0x65},
+
+    {0xea,0x04,0x9d,0x5e},
+    {0x35,0x5d,0x01,0x8c},
+    {0x74,0x73,0xfa,0x87},
+    {0x41,0x2e,0xfb,0x0b},
+
+    {0x1d,0x5a,0xb3,0x67},
+    {0xd2,0x52,0x92,0xdb},
+    {0x56,0x33,0xe9,0x10},
+    {0x47,0x13,0x6d,0xd6},
+
+    {0x61,0x8c,0x9a,0xd7},
+    {0x0c,0x7a,0x37,0xa1},
+    {0x14,0x8e,0x59,0xf8},
+    {0x3c,0x89,0xeb,0x13},
+
+    {0x27,0xee,0xce,0xa9},
+    {0xc9,0x35,0xb7,0x61},
+    {0xe5,0xed,0xe1,0x1c},
+    {0xb1,0x3c,0x7a,0x47},
+
+    {0xdf,0x59,0x9c,0xd2},
+    {0x73,0x3f,0x55,0xf2},
+    {0xce,0x79,0x18,0x14},
+    {0x37,0xbf,0x73,0xc7},
+
+    {0xcd,0xea,0x53,0xf7},
+    {0xaa,0x5b,0x5f,0xfd},
+    {0x6f,0x14,0xdf,0x3d},
+    {0xdb,0x86,0x78,0x44},
+
+    {0xf3,0x81,0xca,0xaf},
+    {0xc4,0x3e,0xb9,0x68},
+    {0x34,0x2c,0x38,0x24},
+    {0x40,0x5f,0xc2,0xa3},
+
+    {0xc3,0x72,0x16,0x1d},
+    {0x25,0x0c,0xbc,0xe2},
+    {0x49,0x8b,0x28,0x3c},
+    {0x95,0x41,0xff,0x0d},
+
+    {0x01,0x71,0x39,0xa8},
+    {0xb3,0xde,0x08,0x0c},
+    {0xe4,0x9c,0xd8,0xb4},
+    {0xc1,0x90,0x64,0x56},
+
+    {0x84,0x61,0x7b,0xcb},
+    {0xb6,0x70,0xd5,0x32},
+    {0x5c,0x74,0x48,0x6c},
+    {0x57,0x42,0xd0,0xb8},
+
+};
+
+word8 T8[256][4] = {
+    {0xf4,0xa7,0x50,0x51},
+    {0x41,0x65,0x53,0x7e},
+    {0x17,0xa4,0xc3,0x1a},
+    {0x27,0x5e,0x96,0x3a},
+
+    {0xab,0x6b,0xcb,0x3b},
+    {0x9d,0x45,0xf1,0x1f},
+    {0xfa,0x58,0xab,0xac},
+    {0xe3,0x03,0x93,0x4b},
+
+    {0x30,0xfa,0x55,0x20},
+    {0x76,0x6d,0xf6,0xad},
+    {0xcc,0x76,0x91,0x88},
+    {0x02,0x4c,0x25,0xf5},
+
+    {0xe5,0xd7,0xfc,0x4f},
+    {0x2a,0xcb,0xd7,0xc5},
+    {0x35,0x44,0x80,0x26},
+    {0x62,0xa3,0x8f,0xb5},
+
+    {0xb1,0x5a,0x49,0xde},
+    {0xba,0x1b,0x67,0x25},
+    {0xea,0x0e,0x98,0x45},
+    {0xfe,0xc0,0xe1,0x5d},
+
+    {0x2f,0x75,0x02,0xc3},
+    {0x4c,0xf0,0x12,0x81},
+    {0x46,0x97,0xa3,0x8d},
+    {0xd3,0xf9,0xc6,0x6b},
+
+    {0x8f,0x5f,0xe7,0x03},
+    {0x92,0x9c,0x95,0x15},
+    {0x6d,0x7a,0xeb,0xbf},
+    {0x52,0x59,0xda,0x95},
+
+    {0xbe,0x83,0x2d,0xd4},
+    {0x74,0x21,0xd3,0x58},
+    {0xe0,0x69,0x29,0x49},
+    {0xc9,0xc8,0x44,0x8e},
+
+    {0xc2,0x89,0x6a,0x75},
+    {0x8e,0x79,0x78,0xf4},
+    {0x58,0x3e,0x6b,0x99},
+    {0xb9,0x71,0xdd,0x27},
+
+    {0xe1,0x4f,0xb6,0xbe},
+    {0x88,0xad,0x17,0xf0},
+    {0x20,0xac,0x66,0xc9},
+    {0xce,0x3a,0xb4,0x7d},
+
+    {0xdf,0x4a,0x18,0x63},
+    {0x1a,0x31,0x82,0xe5},
+    {0x51,0x33,0x60,0x97},
+    {0x53,0x7f,0x45,0x62},
+
+    {0x64,0x77,0xe0,0xb1},
+    {0x6b,0xae,0x84,0xbb},
+    {0x81,0xa0,0x1c,0xfe},
+    {0x08,0x2b,0x94,0xf9},
+
+    {0x48,0x68,0x58,0x70},
+    {0x45,0xfd,0x19,0x8f},
+    {0xde,0x6c,0x87,0x94},
+    {0x7b,0xf8,0xb7,0x52},
+
+    {0x73,0xd3,0x23,0xab},
+    {0x4b,0x02,0xe2,0x72},
+    {0x1f,0x8f,0x57,0xe3},
+    {0x55,0xab,0x2a,0x66},
+
+    {0xeb,0x28,0x07,0xb2},
+    {0xb5,0xc2,0x03,0x2f},
+    {0xc5,0x7b,0x9a,0x86},
+    {0x37,0x08,0xa5,0xd3},
+
+    {0x28,0x87,0xf2,0x30},
+    {0xbf,0xa5,0xb2,0x23},
+    {0x03,0x6a,0xba,0x02},
+    {0x16,0x82,0x5c,0xed},
+
+    {0xcf,0x1c,0x2b,0x8a},
+    {0x79,0xb4,0x92,0xa7},
+    {0x07,0xf2,0xf0,0xf3},
+    {0x69,0xe2,0xa1,0x4e},
+
+    {0xda,0xf4,0xcd,0x65},
+    {0x05,0xbe,0xd5,0x06},
+    {0x34,0x62,0x1f,0xd1},
+    {0xa6,0xfe,0x8a,0xc4},
+
+    {0x2e,0x53,0x9d,0x34},
+    {0xf3,0x55,0xa0,0xa2},
+    {0x8a,0xe1,0x32,0x05},
+    {0xf6,0xeb,0x75,0xa4},
+
+    {0x83,0xec,0x39,0x0b},
+    {0x60,0xef,0xaa,0x40},
+    {0x71,0x9f,0x06,0x5e},
+    {0x6e,0x10,0x51,0xbd},
+
+    {0x21,0x8a,0xf9,0x3e},
+    {0xdd,0x06,0x3d,0x96},
+    {0x3e,0x05,0xae,0xdd},
+    {0xe6,0xbd,0x46,0x4d},
+
+    {0x54,0x8d,0xb5,0x91},
+    {0xc4,0x5d,0x05,0x71},
+    {0x06,0xd4,0x6f,0x04},
+    {0x50,0x15,0xff,0x60},
+
+    {0x98,0xfb,0x24,0x19},
+    {0xbd,0xe9,0x97,0xd6},
+    {0x40,0x43,0xcc,0x89},
+    {0xd9,0x9e,0x77,0x67},
+
+    {0xe8,0x42,0xbd,0xb0},
+    {0x89,0x8b,0x88,0x07},
+    {0x19,0x5b,0x38,0xe7},
+    {0xc8,0xee,0xdb,0x79},
+
+    {0x7c,0x0a,0x47,0xa1},
+    {0x42,0x0f,0xe9,0x7c},
+    {0x84,0x1e,0xc9,0xf8},
+    {0x00,0x00,0x00,0x00},
+
+    {0x80,0x86,0x83,0x09},
+    {0x2b,0xed,0x48,0x32},
+    {0x11,0x70,0xac,0x1e},
+    {0x5a,0x72,0x4e,0x6c},
+
+    {0x0e,0xff,0xfb,0xfd},
+    {0x85,0x38,0x56,0x0f},
+    {0xae,0xd5,0x1e,0x3d},
+    {0x2d,0x39,0x27,0x36},
+
+    {0x0f,0xd9,0x64,0x0a},
+    {0x5c,0xa6,0x21,0x68},
+    {0x5b,0x54,0xd1,0x9b},
+    {0x36,0x2e,0x3a,0x24},
+
+    {0x0a,0x67,0xb1,0x0c},
+    {0x57,0xe7,0x0f,0x93},
+    {0xee,0x96,0xd2,0xb4},
+    {0x9b,0x91,0x9e,0x1b},
+
+    {0xc0,0xc5,0x4f,0x80},
+    {0xdc,0x20,0xa2,0x61},
+    {0x77,0x4b,0x69,0x5a},
+    {0x12,0x1a,0x16,0x1c},
+
+    {0x93,0xba,0x0a,0xe2},
+    {0xa0,0x2a,0xe5,0xc0},
+    {0x22,0xe0,0x43,0x3c},
+    {0x1b,0x17,0x1d,0x12},
+
+    {0x09,0x0d,0x0b,0x0e},
+    {0x8b,0xc7,0xad,0xf2},
+    {0xb6,0xa8,0xb9,0x2d},
+    {0x1e,0xa9,0xc8,0x14},
+
+    {0xf1,0x19,0x85,0x57},
+    {0x75,0x07,0x4c,0xaf},
+    {0x99,0xdd,0xbb,0xee},
+    {0x7f,0x60,0xfd,0xa3},
+
+    {0x01,0x26,0x9f,0xf7},
+    {0x72,0xf5,0xbc,0x5c},
+    {0x66,0x3b,0xc5,0x44},
+    {0xfb,0x7e,0x34,0x5b},
+
+    {0x43,0x29,0x76,0x8b},
+    {0x23,0xc6,0xdc,0xcb},
+    {0xed,0xfc,0x68,0xb6},
+    {0xe4,0xf1,0x63,0xb8},
+
+    {0x31,0xdc,0xca,0xd7},
+    {0x63,0x85,0x10,0x42},
+    {0x97,0x22,0x40,0x13},
+    {0xc6,0x11,0x20,0x84},
+
+    {0x4a,0x24,0x7d,0x85},
+    {0xbb,0x3d,0xf8,0xd2},
+    {0xf9,0x32,0x11,0xae},
+    {0x29,0xa1,0x6d,0xc7},
+
+    {0x9e,0x2f,0x4b,0x1d},
+    {0xb2,0x30,0xf3,0xdc},
+    {0x86,0x52,0xec,0x0d},
+    {0xc1,0xe3,0xd0,0x77},
+
+    {0xb3,0x16,0x6c,0x2b},
+    {0x70,0xb9,0x99,0xa9},
+    {0x94,0x48,0xfa,0x11},
+    {0xe9,0x64,0x22,0x47},
+
+    {0xfc,0x8c,0xc4,0xa8},
+    {0xf0,0x3f,0x1a,0xa0},
+    {0x7d,0x2c,0xd8,0x56},
+    {0x33,0x90,0xef,0x22},
+
+    {0x49,0x4e,0xc7,0x87},
+    {0x38,0xd1,0xc1,0xd9},
+    {0xca,0xa2,0xfe,0x8c},
+    {0xd4,0x0b,0x36,0x98},
+
+    {0xf5,0x81,0xcf,0xa6},
+    {0x7a,0xde,0x28,0xa5},
+    {0xb7,0x8e,0x26,0xda},
+    {0xad,0xbf,0xa4,0x3f},
+
+    {0x3a,0x9d,0xe4,0x2c},
+    {0x78,0x92,0x0d,0x50},
+    {0x5f,0xcc,0x9b,0x6a},
+    {0x7e,0x46,0x62,0x54},
+
+    {0x8d,0x13,0xc2,0xf6},
+    {0xd8,0xb8,0xe8,0x90},
+    {0x39,0xf7,0x5e,0x2e},
+    {0xc3,0xaf,0xf5,0x82},
+
+    {0x5d,0x80,0xbe,0x9f},
+    {0xd0,0x93,0x7c,0x69},
+    {0xd5,0x2d,0xa9,0x6f},
+    {0x25,0x12,0xb3,0xcf},
+
+    {0xac,0x99,0x3b,0xc8},
+    {0x18,0x7d,0xa7,0x10},
+    {0x9c,0x63,0x6e,0xe8},
+    {0x3b,0xbb,0x7b,0xdb},
+
+    {0x26,0x78,0x09,0xcd},
+    {0x59,0x18,0xf4,0x6e},
+    {0x9a,0xb7,0x01,0xec},
+    {0x4f,0x9a,0xa8,0x83},
+
+    {0x95,0x6e,0x65,0xe6},
+    {0xff,0xe6,0x7e,0xaa},
+    {0xbc,0xcf,0x08,0x21},
+    {0x15,0xe8,0xe6,0xef},
+
+    {0xe7,0x9b,0xd9,0xba},
+    {0x6f,0x36,0xce,0x4a},
+    {0x9f,0x09,0xd4,0xea},
+    {0xb0,0x7c,0xd6,0x29},
+
+    {0xa4,0xb2,0xaf,0x31},
+    {0x3f,0x23,0x31,0x2a},
+    {0xa5,0x94,0x30,0xc6},
+    {0xa2,0x66,0xc0,0x35},
+
+    {0x4e,0xbc,0x37,0x74},
+    {0x82,0xca,0xa6,0xfc},
+    {0x90,0xd0,0xb0,0xe0},
+    {0xa7,0xd8,0x15,0x33},
+
+    {0x04,0x98,0x4a,0xf1},
+    {0xec,0xda,0xf7,0x41},
+    {0xcd,0x50,0x0e,0x7f},
+    {0x91,0xf6,0x2f,0x17},
+
+    {0x4d,0xd6,0x8d,0x76},
+    {0xef,0xb0,0x4d,0x43},
+    {0xaa,0x4d,0x54,0xcc},
+    {0x96,0x04,0xdf,0xe4},
+
+    {0xd1,0xb5,0xe3,0x9e},
+    {0x6a,0x88,0x1b,0x4c},
+    {0x2c,0x1f,0xb8,0xc1},
+    {0x65,0x51,0x7f,0x46},
+
+    {0x5e,0xea,0x04,0x9d},
+    {0x8c,0x35,0x5d,0x01},
+    {0x87,0x74,0x73,0xfa},
+    {0x0b,0x41,0x2e,0xfb},
+
+    {0x67,0x1d,0x5a,0xb3},
+    {0xdb,0xd2,0x52,0x92},
+    {0x10,0x56,0x33,0xe9},
+    {0xd6,0x47,0x13,0x6d},
+
+    {0xd7,0x61,0x8c,0x9a},
+    {0xa1,0x0c,0x7a,0x37},
+    {0xf8,0x14,0x8e,0x59},
+    {0x13,0x3c,0x89,0xeb},
+
+    {0xa9,0x27,0xee,0xce},
+    {0x61,0xc9,0x35,0xb7},
+    {0x1c,0xe5,0xed,0xe1},
+    {0x47,0xb1,0x3c,0x7a},
+
+    {0xd2,0xdf,0x59,0x9c},
+    {0xf2,0x73,0x3f,0x55},
+    {0x14,0xce,0x79,0x18},
+    {0xc7,0x37,0xbf,0x73},
+
+    {0xf7,0xcd,0xea,0x53},
+    {0xfd,0xaa,0x5b,0x5f},
+    {0x3d,0x6f,0x14,0xdf},
+    {0x44,0xdb,0x86,0x78},
+
+    {0xaf,0xf3,0x81,0xca},
+    {0x68,0xc4,0x3e,0xb9},
+    {0x24,0x34,0x2c,0x38},
+    {0xa3,0x40,0x5f,0xc2},
+
+    {0x1d,0xc3,0x72,0x16},
+    {0xe2,0x25,0x0c,0xbc},
+    {0x3c,0x49,0x8b,0x28},
+    {0x0d,0x95,0x41,0xff},
+
+    {0xa8,0x01,0x71,0x39},
+    {0x0c,0xb3,0xde,0x08},
+    {0xb4,0xe4,0x9c,0xd8},
+    {0x56,0xc1,0x90,0x64},
+
+    {0xcb,0x84,0x61,0x7b},
+    {0x32,0xb6,0x70,0xd5},
+    {0x6c,0x5c,0x74,0x48},
+    {0xb8,0x57,0x42,0xd0},
+
+};
+
+word8 S5[256] = {
+0x52,0x09,0x6a,0xd5,
+0x30,0x36,0xa5,0x38,
+0xbf,0x40,0xa3,0x9e,
+0x81,0xf3,0xd7,0xfb,
+0x7c,0xe3,0x39,0x82,
+0x9b,0x2f,0xff,0x87,
+0x34,0x8e,0x43,0x44,
+0xc4,0xde,0xe9,0xcb,
+0x54,0x7b,0x94,0x32,
+0xa6,0xc2,0x23,0x3d,
+0xee,0x4c,0x95,0x0b,
+0x42,0xfa,0xc3,0x4e,
+0x08,0x2e,0xa1,0x66,
+0x28,0xd9,0x24,0xb2,
+0x76,0x5b,0xa2,0x49,
+0x6d,0x8b,0xd1,0x25,
+0x72,0xf8,0xf6,0x64,
+0x86,0x68,0x98,0x16,
+0xd4,0xa4,0x5c,0xcc,
+0x5d,0x65,0xb6,0x92,
+0x6c,0x70,0x48,0x50,
+0xfd,0xed,0xb9,0xda,
+0x5e,0x15,0x46,0x57,
+0xa7,0x8d,0x9d,0x84,
+0x90,0xd8,0xab,0x00,
+0x8c,0xbc,0xd3,0x0a,
+0xf7,0xe4,0x58,0x05,
+0xb8,0xb3,0x45,0x06,
+0xd0,0x2c,0x1e,0x8f,
+0xca,0x3f,0x0f,0x02,
+0xc1,0xaf,0xbd,0x03,
+0x01,0x13,0x8a,0x6b,
+0x3a,0x91,0x11,0x41,
+0x4f,0x67,0xdc,0xea,
+0x97,0xf2,0xcf,0xce,
+0xf0,0xb4,0xe6,0x73,
+0x96,0xac,0x74,0x22,
+0xe7,0xad,0x35,0x85,
+0xe2,0xf9,0x37,0xe8,
+0x1c,0x75,0xdf,0x6e,
+0x47,0xf1,0x1a,0x71,
+0x1d,0x29,0xc5,0x89,
+0x6f,0xb7,0x62,0x0e,
+0xaa,0x18,0xbe,0x1b,
+0xfc,0x56,0x3e,0x4b,
+0xc6,0xd2,0x79,0x20,
+0x9a,0xdb,0xc0,0xfe,
+0x78,0xcd,0x5a,0xf4,
+0x1f,0xdd,0xa8,0x33,
+0x88,0x07,0xc7,0x31,
+0xb1,0x12,0x10,0x59,
+0x27,0x80,0xec,0x5f,
+0x60,0x51,0x7f,0xa9,
+0x19,0xb5,0x4a,0x0d,
+0x2d,0xe5,0x7a,0x9f,
+0x93,0xc9,0x9c,0xef,
+0xa0,0xe0,0x3b,0x4d,
+0xae,0x2a,0xf5,0xb0,
+0xc8,0xeb,0xbb,0x3c,
+0x83,0x53,0x99,0x61,
+0x17,0x2b,0x04,0x7e,
+0xba,0x77,0xd6,0x26,
+0xe1,0x69,0x14,0x63,
+0x55,0x21,0x0c,0x7d
+};
+
+word8 U1[256][4] = {
+    {0x00,0x00,0x00,0x00},
+    {0x0e,0x09,0x0d,0x0b},
+    {0x1c,0x12,0x1a,0x16},
+    {0x12,0x1b,0x17,0x1d},
+
+    {0x38,0x24,0x34,0x2c},
+    {0x36,0x2d,0x39,0x27},
+    {0x24,0x36,0x2e,0x3a},
+    {0x2a,0x3f,0x23,0x31},
+
+    {0x70,0x48,0x68,0x58},
+    {0x7e,0x41,0x65,0x53},
+    {0x6c,0x5a,0x72,0x4e},
+    {0x62,0x53,0x7f,0x45},
+
+    {0x48,0x6c,0x5c,0x74},
+    {0x46,0x65,0x51,0x7f},
+    {0x54,0x7e,0x46,0x62},
+    {0x5a,0x77,0x4b,0x69},
+
+    {0xe0,0x90,0xd0,0xb0},
+    {0xee,0x99,0xdd,0xbb},
+    {0xfc,0x82,0xca,0xa6},
+    {0xf2,0x8b,0xc7,0xad},
+
+    {0xd8,0xb4,0xe4,0x9c},
+    {0xd6,0xbd,0xe9,0x97},
+    {0xc4,0xa6,0xfe,0x8a},
+    {0xca,0xaf,0xf3,0x81},
+
+    {0x90,0xd8,0xb8,0xe8},
+    {0x9e,0xd1,0xb5,0xe3},
+    {0x8c,0xca,0xa2,0xfe},
+    {0x82,0xc3,0xaf,0xf5},
+
+    {0xa8,0xfc,0x8c,0xc4},
+    {0xa6,0xf5,0x81,0xcf},
+    {0xb4,0xee,0x96,0xd2},
+    {0xba,0xe7,0x9b,0xd9},
+
+    {0xdb,0x3b,0xbb,0x7b},
+    {0xd5,0x32,0xb6,0x70},
+    {0xc7,0x29,0xa1,0x6d},
+    {0xc9,0x20,0xac,0x66},
+
+    {0xe3,0x1f,0x8f,0x57},
+    {0xed,0x16,0x82,0x5c},
+    {0xff,0x0d,0x95,0x41},
+    {0xf1,0x04,0x98,0x4a},
+
+    {0xab,0x73,0xd3,0x23},
+    {0xa5,0x7a,0xde,0x28},
+    {0xb7,0x61,0xc9,0x35},
+    {0xb9,0x68,0xc4,0x3e},
+
+    {0x93,0x57,0xe7,0x0f},
+    {0x9d,0x5e,0xea,0x04},
+    {0x8f,0x45,0xfd,0x19},
+    {0x81,0x4c,0xf0,0x12},
+
+    {0x3b,0xab,0x6b,0xcb},
+    {0x35,0xa2,0x66,0xc0},
+    {0x27,0xb9,0x71,0xdd},
+    {0x29,0xb0,0x7c,0xd6},
+
+    {0x03,0x8f,0x5f,0xe7},
+    {0x0d,0x86,0x52,0xec},
+    {0x1f,0x9d,0x45,0xf1},
+    {0x11,0x94,0x48,0xfa},
+
+    {0x4b,0xe3,0x03,0x93},
+    {0x45,0xea,0x0e,0x98},
+    {0x57,0xf1,0x19,0x85},
+    {0x59,0xf8,0x14,0x8e},
+
+    {0x73,0xc7,0x37,0xbf},
+    {0x7d,0xce,0x3a,0xb4},
+    {0x6f,0xd5,0x2d,0xa9},
+    {0x61,0xdc,0x20,0xa2},
+
+    {0xad,0x76,0x6d,0xf6},
+    {0xa3,0x7f,0x60,0xfd},
+    {0xb1,0x64,0x77,0xe0},
+    {0xbf,0x6d,0x7a,0xeb},
+
+    {0x95,0x52,0x59,0xda},
+    {0x9b,0x5b,0x54,0xd1},
+    {0x89,0x40,0x43,0xcc},
+    {0x87,0x49,0x4e,0xc7},
+
+    {0xdd,0x3e,0x05,0xae},
+    {0xd3,0x37,0x08,0xa5},
+    {0xc1,0x2c,0x1f,0xb8},
+    {0xcf,0x25,0x12,0xb3},
+
+    {0xe5,0x1a,0x31,0x82},
+    {0xeb,0x13,0x3c,0x89},
+    {0xf9,0x08,0x2b,0x94},
+    {0xf7,0x01,0x26,0x9f},
+
+    {0x4d,0xe6,0xbd,0x46},
+    {0x43,0xef,0xb0,0x4d},
+    {0x51,0xf4,0xa7,0x50},
+    {0x5f,0xfd,0xaa,0x5b},
+
+    {0x75,0xc2,0x89,0x6a},
+    {0x7b,0xcb,0x84,0x61},
+    {0x69,0xd0,0x93,0x7c},
+    {0x67,0xd9,0x9e,0x77},
+
+    {0x3d,0xae,0xd5,0x1e},
+    {0x33,0xa7,0xd8,0x15},
+    {0x21,0xbc,0xcf,0x08},
+    {0x2f,0xb5,0xc2,0x03},
+
+    {0x05,0x8a,0xe1,0x32},
+    {0x0b,0x83,0xec,0x39},
+    {0x19,0x98,0xfb,0x24},
+    {0x17,0x91,0xf6,0x2f},
+
+    {0x76,0x4d,0xd6,0x8d},
+    {0x78,0x44,0xdb,0x86},
+    {0x6a,0x5f,0xcc,0x9b},
+    {0x64,0x56,0xc1,0x90},
+
+    {0x4e,0x69,0xe2,0xa1},
+    {0x40,0x60,0xef,0xaa},
+    {0x52,0x7b,0xf8,0xb7},
+    {0x5c,0x72,0xf5,0xbc},
+
+    {0x06,0x05,0xbe,0xd5},
+    {0x08,0x0c,0xb3,0xde},
+    {0x1a,0x17,0xa4,0xc3},
+    {0x14,0x1e,0xa9,0xc8},
+
+    {0x3e,0x21,0x8a,0xf9},
+    {0x30,0x28,0x87,0xf2},
+    {0x22,0x33,0x90,0xef},
+    {0x2c,0x3a,0x9d,0xe4},
+
+    {0x96,0xdd,0x06,0x3d},
+    {0x98,0xd4,0x0b,0x36},
+    {0x8a,0xcf,0x1c,0x2b},
+    {0x84,0xc6,0x11,0x20},
+
+    {0xae,0xf9,0x32,0x11},
+    {0xa0,0xf0,0x3f,0x1a},
+    {0xb2,0xeb,0x28,0x07},
+    {0xbc,0xe2,0x25,0x0c},
+
+    {0xe6,0x95,0x6e,0x65},
+    {0xe8,0x9c,0x63,0x6e},
+    {0xfa,0x87,0x74,0x73},
+    {0xf4,0x8e,0x79,0x78},
+
+    {0xde,0xb1,0x5a,0x49},
+    {0xd0,0xb8,0x57,0x42},
+    {0xc2,0xa3,0x40,0x5f},
+    {0xcc,0xaa,0x4d,0x54},
+
+    {0x41,0xec,0xda,0xf7},
+    {0x4f,0xe5,0xd7,0xfc},
+    {0x5d,0xfe,0xc0,0xe1},
+    {0x53,0xf7,0xcd,0xea},
+
+    {0x79,0xc8,0xee,0xdb},
+    {0x77,0xc1,0xe3,0xd0},
+    {0x65,0xda,0xf4,0xcd},
+    {0x6b,0xd3,0xf9,0xc6},
+
+    {0x31,0xa4,0xb2,0xaf},
+    {0x3f,0xad,0xbf,0xa4},
+    {0x2d,0xb6,0xa8,0xb9},
+    {0x23,0xbf,0xa5,0xb2},
+
+    {0x09,0x80,0x86,0x83},
+    {0x07,0x89,0x8b,0x88},
+    {0x15,0x92,0x9c,0x95},
+    {0x1b,0x9b,0x91,0x9e},
+
+    {0xa1,0x7c,0x0a,0x47},
+    {0xaf,0x75,0x07,0x4c},
+    {0xbd,0x6e,0x10,0x51},
+    {0xb3,0x67,0x1d,0x5a},
+
+    {0x99,0x58,0x3e,0x6b},
+    {0x97,0x51,0x33,0x60},
+    {0x85,0x4a,0x24,0x7d},
+    {0x8b,0x43,0x29,0x76},
+
+    {0xd1,0x34,0x62,0x1f},
+    {0xdf,0x3d,0x6f,0x14},
+    {0xcd,0x26,0x78,0x09},
+    {0xc3,0x2f,0x75,0x02},
+
+    {0xe9,0x10,0x56,0x33},
+    {0xe7,0x19,0x5b,0x38},
+    {0xf5,0x02,0x4c,0x25},
+    {0xfb,0x0b,0x41,0x2e},
+
+    {0x9a,0xd7,0x61,0x8c},
+    {0x94,0xde,0x6c,0x87},
+    {0x86,0xc5,0x7b,0x9a},
+    {0x88,0xcc,0x76,0x91},
+
+    {0xa2,0xf3,0x55,0xa0},
+    {0xac,0xfa,0x58,0xab},
+    {0xbe,0xe1,0x4f,0xb6},
+    {0xb0,0xe8,0x42,0xbd},
+
+    {0xea,0x9f,0x09,0xd4},
+    {0xe4,0x96,0x04,0xdf},
+    {0xf6,0x8d,0x13,0xc2},
+    {0xf8,0x84,0x1e,0xc9},
+
+    {0xd2,0xbb,0x3d,0xf8},
+    {0xdc,0xb2,0x30,0xf3},
+    {0xce,0xa9,0x27,0xee},
+    {0xc0,0xa0,0x2a,0xe5},
+
+    {0x7a,0x47,0xb1,0x3c},
+    {0x74,0x4e,0xbc,0x37},
+    {0x66,0x55,0xab,0x2a},
+    {0x68,0x5c,0xa6,0x21},
+
+    {0x42,0x63,0x85,0x10},
+    {0x4c,0x6a,0x88,0x1b},
+    {0x5e,0x71,0x9f,0x06},
+    {0x50,0x78,0x92,0x0d},
+
+    {0x0a,0x0f,0xd9,0x64},
+    {0x04,0x06,0xd4,0x6f},
+    {0x16,0x1d,0xc3,0x72},
+    {0x18,0x14,0xce,0x79},
+
+    {0x32,0x2b,0xed,0x48},
+    {0x3c,0x22,0xe0,0x43},
+    {0x2e,0x39,0xf7,0x5e},
+    {0x20,0x30,0xfa,0x55},
+
+    {0xec,0x9a,0xb7,0x01},
+    {0xe2,0x93,0xba,0x0a},
+    {0xf0,0x88,0xad,0x17},
+    {0xfe,0x81,0xa0,0x1c},
+
+    {0xd4,0xbe,0x83,0x2d},
+    {0xda,0xb7,0x8e,0x26},
+    {0xc8,0xac,0x99,0x3b},
+    {0xc6,0xa5,0x94,0x30},
+
+    {0x9c,0xd2,0xdf,0x59},
+    {0x92,0xdb,0xd2,0x52},
+    {0x80,0xc0,0xc5,0x4f},
+    {0x8e,0xc9,0xc8,0x44},
+
+    {0xa4,0xf6,0xeb,0x75},
+    {0xaa,0xff,0xe6,0x7e},
+    {0xb8,0xe4,0xf1,0x63},
+    {0xb6,0xed,0xfc,0x68},
+
+    {0x0c,0x0a,0x67,0xb1},
+    {0x02,0x03,0x6a,0xba},
+    {0x10,0x18,0x7d,0xa7},
+    {0x1e,0x11,0x70,0xac},
+
+    {0x34,0x2e,0x53,0x9d},
+    {0x3a,0x27,0x5e,0x96},
+    {0x28,0x3c,0x49,0x8b},
+    {0x26,0x35,0x44,0x80},
+
+    {0x7c,0x42,0x0f,0xe9},
+    {0x72,0x4b,0x02,0xe2},
+    {0x60,0x50,0x15,0xff},
+    {0x6e,0x59,0x18,0xf4},
+
+    {0x44,0x66,0x3b,0xc5},
+    {0x4a,0x6f,0x36,0xce},
+    {0x58,0x74,0x21,0xd3},
+    {0x56,0x7d,0x2c,0xd8},
+
+    {0x37,0xa1,0x0c,0x7a},
+    {0x39,0xa8,0x01,0x71},
+    {0x2b,0xb3,0x16,0x6c},
+    {0x25,0xba,0x1b,0x67},
+
+    {0x0f,0x85,0x38,0x56},
+    {0x01,0x8c,0x35,0x5d},
+    {0x13,0x97,0x22,0x40},
+    {0x1d,0x9e,0x2f,0x4b},
+
+    {0x47,0xe9,0x64,0x22},
+    {0x49,0xe0,0x69,0x29},
+    {0x5b,0xfb,0x7e,0x34},
+    {0x55,0xf2,0x73,0x3f},
+
+    {0x7f,0xcd,0x50,0x0e},
+    {0x71,0xc4,0x5d,0x05},
+    {0x63,0xdf,0x4a,0x18},
+    {0x6d,0xd6,0x47,0x13},
+
+    {0xd7,0x31,0xdc,0xca},
+    {0xd9,0x38,0xd1,0xc1},
+    {0xcb,0x23,0xc6,0xdc},
+    {0xc5,0x2a,0xcb,0xd7},
+
+    {0xef,0x15,0xe8,0xe6},
+    {0xe1,0x1c,0xe5,0xed},
+    {0xf3,0x07,0xf2,0xf0},
+    {0xfd,0x0e,0xff,0xfb},
+
+    {0xa7,0x79,0xb4,0x92},
+    {0xa9,0x70,0xb9,0x99},
+    {0xbb,0x6b,0xae,0x84},
+    {0xb5,0x62,0xa3,0x8f},
+
+    {0x9f,0x5d,0x80,0xbe},
+    {0x91,0x54,0x8d,0xb5},
+    {0x83,0x4f,0x9a,0xa8},
+    {0x8d,0x46,0x97,0xa3},
+
+};
+
+word8 U2[256][4] = {
+    {0x00,0x00,0x00,0x00},
+    {0x0b,0x0e,0x09,0x0d},
+    {0x16,0x1c,0x12,0x1a},
+    {0x1d,0x12,0x1b,0x17},
+
+    {0x2c,0x38,0x24,0x34},
+    {0x27,0x36,0x2d,0x39},
+    {0x3a,0x24,0x36,0x2e},
+    {0x31,0x2a,0x3f,0x23},
+
+    {0x58,0x70,0x48,0x68},
+    {0x53,0x7e,0x41,0x65},
+    {0x4e,0x6c,0x5a,0x72},
+    {0x45,0x62,0x53,0x7f},
+
+    {0x74,0x48,0x6c,0x5c},
+    {0x7f,0x46,0x65,0x51},
+    {0x62,0x54,0x7e,0x46},
+    {0x69,0x5a,0x77,0x4b},
+
+    {0xb0,0xe0,0x90,0xd0},
+    {0xbb,0xee,0x99,0xdd},
+    {0xa6,0xfc,0x82,0xca},
+    {0xad,0xf2,0x8b,0xc7},
+
+    {0x9c,0xd8,0xb4,0xe4},
+    {0x97,0xd6,0xbd,0xe9},
+    {0x8a,0xc4,0xa6,0xfe},
+    {0x81,0xca,0xaf,0xf3},
+
+    {0xe8,0x90,0xd8,0xb8},
+    {0xe3,0x9e,0xd1,0xb5},
+    {0xfe,0x8c,0xca,0xa2},
+    {0xf5,0x82,0xc3,0xaf},
+
+    {0xc4,0xa8,0xfc,0x8c},
+    {0xcf,0xa6,0xf5,0x81},
+    {0xd2,0xb4,0xee,0x96},
+    {0xd9,0xba,0xe7,0x9b},
+
+    {0x7b,0xdb,0x3b,0xbb},
+    {0x70,0xd5,0x32,0xb6},
+    {0x6d,0xc7,0x29,0xa1},
+    {0x66,0xc9,0x20,0xac},
+
+    {0x57,0xe3,0x1f,0x8f},
+    {0x5c,0xed,0x16,0x82},
+    {0x41,0xff,0x0d,0x95},
+    {0x4a,0xf1,0x04,0x98},
+
+    {0x23,0xab,0x73,0xd3},
+    {0x28,0xa5,0x7a,0xde},
+    {0x35,0xb7,0x61,0xc9},
+    {0x3e,0xb9,0x68,0xc4},
+
+    {0x0f,0x93,0x57,0xe7},
+    {0x04,0x9d,0x5e,0xea},
+    {0x19,0x8f,0x45,0xfd},
+    {0x12,0x81,0x4c,0xf0},
+
+    {0xcb,0x3b,0xab,0x6b},
+    {0xc0,0x35,0xa2,0x66},
+    {0xdd,0x27,0xb9,0x71},
+    {0xd6,0x29,0xb0,0x7c},
+
+    {0xe7,0x03,0x8f,0x5f},
+    {0xec,0x0d,0x86,0x52},
+    {0xf1,0x1f,0x9d,0x45},
+    {0xfa,0x11,0x94,0x48},
+
+    {0x93,0x4b,0xe3,0x03},
+    {0x98,0x45,0xea,0x0e},
+    {0x85,0x57,0xf1,0x19},
+    {0x8e,0x59,0xf8,0x14},
+
+    {0xbf,0x73,0xc7,0x37},
+    {0xb4,0x7d,0xce,0x3a},
+    {0xa9,0x6f,0xd5,0x2d},
+    {0xa2,0x61,0xdc,0x20},
+
+    {0xf6,0xad,0x76,0x6d},
+    {0xfd,0xa3,0x7f,0x60},
+    {0xe0,0xb1,0x64,0x77},
+    {0xeb,0xbf,0x6d,0x7a},
+
+    {0xda,0x95,0x52,0x59},
+    {0xd1,0x9b,0x5b,0x54},
+    {0xcc,0x89,0x40,0x43},
+    {0xc7,0x87,0x49,0x4e},
+
+    {0xae,0xdd,0x3e,0x05},
+    {0xa5,0xd3,0x37,0x08},
+    {0xb8,0xc1,0x2c,0x1f},
+    {0xb3,0xcf,0x25,0x12},
+
+    {0x82,0xe5,0x1a,0x31},
+    {0x89,0xeb,0x13,0x3c},
+    {0x94,0xf9,0x08,0x2b},
+    {0x9f,0xf7,0x01,0x26},
+
+    {0x46,0x4d,0xe6,0xbd},
+    {0x4d,0x43,0xef,0xb0},
+    {0x50,0x51,0xf4,0xa7},
+    {0x5b,0x5f,0xfd,0xaa},
+
+    {0x6a,0x75,0xc2,0x89},
+    {0x61,0x7b,0xcb,0x84},
+    {0x7c,0x69,0xd0,0x93},
+    {0x77,0x67,0xd9,0x9e},
+
+    {0x1e,0x3d,0xae,0xd5},
+    {0x15,0x33,0xa7,0xd8},
+    {0x08,0x21,0xbc,0xcf},
+    {0x03,0x2f,0xb5,0xc2},
+
+    {0x32,0x05,0x8a,0xe1},
+    {0x39,0x0b,0x83,0xec},
+    {0x24,0x19,0x98,0xfb},
+    {0x2f,0x17,0x91,0xf6},
+
+    {0x8d,0x76,0x4d,0xd6},
+    {0x86,0x78,0x44,0xdb},
+    {0x9b,0x6a,0x5f,0xcc},
+    {0x90,0x64,0x56,0xc1},
+
+    {0xa1,0x4e,0x69,0xe2},
+    {0xaa,0x40,0x60,0xef},
+    {0xb7,0x52,0x7b,0xf8},
+    {0xbc,0x5c,0x72,0xf5},
+
+    {0xd5,0x06,0x05,0xbe},
+    {0xde,0x08,0x0c,0xb3},
+    {0xc3,0x1a,0x17,0xa4},
+    {0xc8,0x14,0x1e,0xa9},
+
+    {0xf9,0x3e,0x21,0x8a},
+    {0xf2,0x30,0x28,0x87},
+    {0xef,0x22,0x33,0x90},
+    {0xe4,0x2c,0x3a,0x9d},
+
+    {0x3d,0x96,0xdd,0x06},
+    {0x36,0x98,0xd4,0x0b},
+    {0x2b,0x8a,0xcf,0x1c},
+    {0x20,0x84,0xc6,0x11},
+
+    {0x11,0xae,0xf9,0x32},
+    {0x1a,0xa0,0xf0,0x3f},
+    {0x07,0xb2,0xeb,0x28},
+    {0x0c,0xbc,0xe2,0x25},
+
+    {0x65,0xe6,0x95,0x6e},
+    {0x6e,0xe8,0x9c,0x63},
+    {0x73,0xfa,0x87,0x74},
+    {0x78,0xf4,0x8e,0x79},
+
+    {0x49,0xde,0xb1,0x5a},
+    {0x42,0xd0,0xb8,0x57},
+    {0x5f,0xc2,0xa3,0x40},
+    {0x54,0xcc,0xaa,0x4d},
+
+    {0xf7,0x41,0xec,0xda},
+    {0xfc,0x4f,0xe5,0xd7},
+    {0xe1,0x5d,0xfe,0xc0},
+    {0xea,0x53,0xf7,0xcd},
+
+    {0xdb,0x79,0xc8,0xee},
+    {0xd0,0x77,0xc1,0xe3},
+    {0xcd,0x65,0xda,0xf4},
+    {0xc6,0x6b,0xd3,0xf9},
+
+    {0xaf,0x31,0xa4,0xb2},
+    {0xa4,0x3f,0xad,0xbf},
+    {0xb9,0x2d,0xb6,0xa8},
+    {0xb2,0x23,0xbf,0xa5},
+
+    {0x83,0x09,0x80,0x86},
+    {0x88,0x07,0x89,0x8b},
+    {0x95,0x15,0x92,0x9c},
+    {0x9e,0x1b,0x9b,0x91},
+
+    {0x47,0xa1,0x7c,0x0a},
+    {0x4c,0xaf,0x75,0x07},
+    {0x51,0xbd,0x6e,0x10},
+    {0x5a,0xb3,0x67,0x1d},
+
+    {0x6b,0x99,0x58,0x3e},
+    {0x60,0x97,0x51,0x33},
+    {0x7d,0x85,0x4a,0x24},
+    {0x76,0x8b,0x43,0x29},
+
+    {0x1f,0xd1,0x34,0x62},
+    {0x14,0xdf,0x3d,0x6f},
+    {0x09,0xcd,0x26,0x78},
+    {0x02,0xc3,0x2f,0x75},
+
+    {0x33,0xe9,0x10,0x56},
+    {0x38,0xe7,0x19,0x5b},
+    {0x25,0xf5,0x02,0x4c},
+    {0x2e,0xfb,0x0b,0x41},
+
+    {0x8c,0x9a,0xd7,0x61},
+    {0x87,0x94,0xde,0x6c},
+    {0x9a,0x86,0xc5,0x7b},
+    {0x91,0x88,0xcc,0x76},
+
+    {0xa0,0xa2,0xf3,0x55},
+    {0xab,0xac,0xfa,0x58},
+    {0xb6,0xbe,0xe1,0x4f},
+    {0xbd,0xb0,0xe8,0x42},
+
+    {0xd4,0xea,0x9f,0x09},
+    {0xdf,0xe4,0x96,0x04},
+    {0xc2,0xf6,0x8d,0x13},
+    {0xc9,0xf8,0x84,0x1e},
+
+    {0xf8,0xd2,0xbb,0x3d},
+    {0xf3,0xdc,0xb2,0x30},
+    {0xee,0xce,0xa9,0x27},
+    {0xe5,0xc0,0xa0,0x2a},
+
+    {0x3c,0x7a,0x47,0xb1},
+    {0x37,0x74,0x4e,0xbc},
+    {0x2a,0x66,0x55,0xab},
+    {0x21,0x68,0x5c,0xa6},
+
+    {0x10,0x42,0x63,0x85},
+    {0x1b,0x4c,0x6a,0x88},
+    {0x06,0x5e,0x71,0x9f},
+    {0x0d,0x50,0x78,0x92},
+
+    {0x64,0x0a,0x0f,0xd9},
+    {0x6f,0x04,0x06,0xd4},
+    {0x72,0x16,0x1d,0xc3},
+    {0x79,0x18,0x14,0xce},
+
+    {0x48,0x32,0x2b,0xed},
+    {0x43,0x3c,0x22,0xe0},
+    {0x5e,0x2e,0x39,0xf7},
+    {0x55,0x20,0x30,0xfa},
+
+    {0x01,0xec,0x9a,0xb7},
+    {0x0a,0xe2,0x93,0xba},
+    {0x17,0xf0,0x88,0xad},
+    {0x1c,0xfe,0x81,0xa0},
+
+    {0x2d,0xd4,0xbe,0x83},
+    {0x26,0xda,0xb7,0x8e},
+    {0x3b,0xc8,0xac,0x99},
+    {0x30,0xc6,0xa5,0x94},
+
+    {0x59,0x9c,0xd2,0xdf},
+    {0x52,0x92,0xdb,0xd2},
+    {0x4f,0x80,0xc0,0xc5},
+    {0x44,0x8e,0xc9,0xc8},
+
+    {0x75,0xa4,0xf6,0xeb},
+    {0x7e,0xaa,0xff,0xe6},
+    {0x63,0xb8,0xe4,0xf1},
+    {0x68,0xb6,0xed,0xfc},
+
+    {0xb1,0x0c,0x0a,0x67},
+    {0xba,0x02,0x03,0x6a},
+    {0xa7,0x10,0x18,0x7d},
+    {0xac,0x1e,0x11,0x70},
+
+    {0x9d,0x34,0x2e,0x53},
+    {0x96,0x3a,0x27,0x5e},
+    {0x8b,0x28,0x3c,0x49},
+    {0x80,0x26,0x35,0x44},
+
+    {0xe9,0x7c,0x42,0x0f},
+    {0xe2,0x72,0x4b,0x02},
+    {0xff,0x60,0x50,0x15},
+    {0xf4,0x6e,0x59,0x18},
+
+    {0xc5,0x44,0x66,0x3b},
+    {0xce,0x4a,0x6f,0x36},
+    {0xd3,0x58,0x74,0x21},
+    {0xd8,0x56,0x7d,0x2c},
+
+    {0x7a,0x37,0xa1,0x0c},
+    {0x71,0x39,0xa8,0x01},
+    {0x6c,0x2b,0xb3,0x16},
+    {0x67,0x25,0xba,0x1b},
+
+    {0x56,0x0f,0x85,0x38},
+    {0x5d,0x01,0x8c,0x35},
+    {0x40,0x13,0x97,0x22},
+    {0x4b,0x1d,0x9e,0x2f},
+
+    {0x22,0x47,0xe9,0x64},
+    {0x29,0x49,0xe0,0x69},
+    {0x34,0x5b,0xfb,0x7e},
+    {0x3f,0x55,0xf2,0x73},
+
+    {0x0e,0x7f,0xcd,0x50},
+    {0x05,0x71,0xc4,0x5d},
+    {0x18,0x63,0xdf,0x4a},
+    {0x13,0x6d,0xd6,0x47},
+
+    {0xca,0xd7,0x31,0xdc},
+    {0xc1,0xd9,0x38,0xd1},
+    {0xdc,0xcb,0x23,0xc6},
+    {0xd7,0xc5,0x2a,0xcb},
+
+    {0xe6,0xef,0x15,0xe8},
+    {0xed,0xe1,0x1c,0xe5},
+    {0xf0,0xf3,0x07,0xf2},
+    {0xfb,0xfd,0x0e,0xff},
+
+    {0x92,0xa7,0x79,0xb4},
+    {0x99,0xa9,0x70,0xb9},
+    {0x84,0xbb,0x6b,0xae},
+    {0x8f,0xb5,0x62,0xa3},
+
+    {0xbe,0x9f,0x5d,0x80},
+    {0xb5,0x91,0x54,0x8d},
+    {0xa8,0x83,0x4f,0x9a},
+    {0xa3,0x8d,0x46,0x97},
+
+};
+
+word8 U3[256][4] = {
+    {0x00,0x00,0x00,0x00},
+    {0x0d,0x0b,0x0e,0x09},
+    {0x1a,0x16,0x1c,0x12},
+    {0x17,0x1d,0x12,0x1b},
+
+    {0x34,0x2c,0x38,0x24},
+    {0x39,0x27,0x36,0x2d},
+    {0x2e,0x3a,0x24,0x36},
+    {0x23,0x31,0x2a,0x3f},
+
+    {0x68,0x58,0x70,0x48},
+    {0x65,0x53,0x7e,0x41},
+    {0x72,0x4e,0x6c,0x5a},
+    {0x7f,0x45,0x62,0x53},
+
+    {0x5c,0x74,0x48,0x6c},
+    {0x51,0x7f,0x46,0x65},
+    {0x46,0x62,0x54,0x7e},
+    {0x4b,0x69,0x5a,0x77},
+
+    {0xd0,0xb0,0xe0,0x90},
+    {0xdd,0xbb,0xee,0x99},
+    {0xca,0xa6,0xfc,0x82},
+    {0xc7,0xad,0xf2,0x8b},
+
+    {0xe4,0x9c,0xd8,0xb4},
+    {0xe9,0x97,0xd6,0xbd},
+    {0xfe,0x8a,0xc4,0xa6},
+    {0xf3,0x81,0xca,0xaf},
+
+    {0xb8,0xe8,0x90,0xd8},
+    {0xb5,0xe3,0x9e,0xd1},
+    {0xa2,0xfe,0x8c,0xca},
+    {0xaf,0xf5,0x82,0xc3},
+
+    {0x8c,0xc4,0xa8,0xfc},
+    {0x81,0xcf,0xa6,0xf5},
+    {0x96,0xd2,0xb4,0xee},
+    {0x9b,0xd9,0xba,0xe7},
+
+    {0xbb,0x7b,0xdb,0x3b},
+    {0xb6,0x70,0xd5,0x32},
+    {0xa1,0x6d,0xc7,0x29},
+    {0xac,0x66,0xc9,0x20},
+
+    {0x8f,0x57,0xe3,0x1f},
+    {0x82,0x5c,0xed,0x16},
+    {0x95,0x41,0xff,0x0d},
+    {0x98,0x4a,0xf1,0x04},
+
+    {0xd3,0x23,0xab,0x73},
+    {0xde,0x28,0xa5,0x7a},
+    {0xc9,0x35,0xb7,0x61},
+    {0xc4,0x3e,0xb9,0x68},
+
+    {0xe7,0x0f,0x93,0x57},
+    {0xea,0x04,0x9d,0x5e},
+    {0xfd,0x19,0x8f,0x45},
+    {0xf0,0x12,0x81,0x4c},
+
+    {0x6b,0xcb,0x3b,0xab},
+    {0x66,0xc0,0x35,0xa2},
+    {0x71,0xdd,0x27,0xb9},
+    {0x7c,0xd6,0x29,0xb0},
+
+    {0x5f,0xe7,0x03,0x8f},
+    {0x52,0xec,0x0d,0x86},
+    {0x45,0xf1,0x1f,0x9d},
+    {0x48,0xfa,0x11,0x94},
+
+    {0x03,0x93,0x4b,0xe3},
+    {0x0e,0x98,0x45,0xea},
+    {0x19,0x85,0x57,0xf1},
+    {0x14,0x8e,0x59,0xf8},
+
+    {0x37,0xbf,0x73,0xc7},
+    {0x3a,0xb4,0x7d,0xce},
+    {0x2d,0xa9,0x6f,0xd5},
+    {0x20,0xa2,0x61,0xdc},
+
+    {0x6d,0xf6,0xad,0x76},
+    {0x60,0xfd,0xa3,0x7f},
+    {0x77,0xe0,0xb1,0x64},
+    {0x7a,0xeb,0xbf,0x6d},
+
+    {0x59,0xda,0x95,0x52},
+    {0x54,0xd1,0x9b,0x5b},
+    {0x43,0xcc,0x89,0x40},
+    {0x4e,0xc7,0x87,0x49},
+
+    {0x05,0xae,0xdd,0x3e},
+    {0x08,0xa5,0xd3,0x37},
+    {0x1f,0xb8,0xc1,0x2c},
+    {0x12,0xb3,0xcf,0x25},
+
+    {0x31,0x82,0xe5,0x1a},
+    {0x3c,0x89,0xeb,0x13},
+    {0x2b,0x94,0xf9,0x08},
+    {0x26,0x9f,0xf7,0x01},
+
+    {0xbd,0x46,0x4d,0xe6},
+    {0xb0,0x4d,0x43,0xef},
+    {0xa7,0x50,0x51,0xf4},
+    {0xaa,0x5b,0x5f,0xfd},
+
+    {0x89,0x6a,0x75,0xc2},
+    {0x84,0x61,0x7b,0xcb},
+    {0x93,0x7c,0x69,0xd0},
+    {0x9e,0x77,0x67,0xd9},
+
+    {0xd5,0x1e,0x3d,0xae},
+    {0xd8,0x15,0x33,0xa7},
+    {0xcf,0x08,0x21,0xbc},
+    {0xc2,0x03,0x2f,0xb5},
+
+    {0xe1,0x32,0x05,0x8a},
+    {0xec,0x39,0x0b,0x83},
+    {0xfb,0x24,0x19,0x98},
+    {0xf6,0x2f,0x17,0x91},
+
+    {0xd6,0x8d,0x76,0x4d},
+    {0xdb,0x86,0x78,0x44},
+    {0xcc,0x9b,0x6a,0x5f},
+    {0xc1,0x90,0x64,0x56},
+
+    {0xe2,0xa1,0x4e,0x69},
+    {0xef,0xaa,0x40,0x60},
+    {0xf8,0xb7,0x52,0x7b},
+    {0xf5,0xbc,0x5c,0x72},
+
+    {0xbe,0xd5,0x06,0x05},
+    {0xb3,0xde,0x08,0x0c},
+    {0xa4,0xc3,0x1a,0x17},
+    {0xa9,0xc8,0x14,0x1e},
+
+    {0x8a,0xf9,0x3e,0x21},
+    {0x87,0xf2,0x30,0x28},
+    {0x90,0xef,0x22,0x33},
+    {0x9d,0xe4,0x2c,0x3a},
+
+    {0x06,0x3d,0x96,0xdd},
+    {0x0b,0x36,0x98,0xd4},
+    {0x1c,0x2b,0x8a,0xcf},
+    {0x11,0x20,0x84,0xc6},
+
+    {0x32,0x11,0xae,0xf9},
+    {0x3f,0x1a,0xa0,0xf0},
+    {0x28,0x07,0xb2,0xeb},
+    {0x25,0x0c,0xbc,0xe2},
+
+    {0x6e,0x65,0xe6,0x95},
+    {0x63,0x6e,0xe8,0x9c},
+    {0x74,0x73,0xfa,0x87},
+    {0x79,0x78,0xf4,0x8e},
+
+    {0x5a,0x49,0xde,0xb1},
+    {0x57,0x42,0xd0,0xb8},
+    {0x40,0x5f,0xc2,0xa3},
+    {0x4d,0x54,0xcc,0xaa},
+
+    {0xda,0xf7,0x41,0xec},
+    {0xd7,0xfc,0x4f,0xe5},
+    {0xc0,0xe1,0x5d,0xfe},
+    {0xcd,0xea,0x53,0xf7},
+
+    {0xee,0xdb,0x79,0xc8},
+    {0xe3,0xd0,0x77,0xc1},
+    {0xf4,0xcd,0x65,0xda},
+    {0xf9,0xc6,0x6b,0xd3},
+
+    {0xb2,0xaf,0x31,0xa4},
+    {0xbf,0xa4,0x3f,0xad},
+    {0xa8,0xb9,0x2d,0xb6},
+    {0xa5,0xb2,0x23,0xbf},
+
+    {0x86,0x83,0x09,0x80},
+    {0x8b,0x88,0x07,0x89},
+    {0x9c,0x95,0x15,0x92},
+    {0x91,0x9e,0x1b,0x9b},
+
+    {0x0a,0x47,0xa1,0x7c},
+    {0x07,0x4c,0xaf,0x75},
+    {0x10,0x51,0xbd,0x6e},
+    {0x1d,0x5a,0xb3,0x67},
+
+    {0x3e,0x6b,0x99,0x58},
+    {0x33,0x60,0x97,0x51},
+    {0x24,0x7d,0x85,0x4a},
+    {0x29,0x76,0x8b,0x43},
+
+    {0x62,0x1f,0xd1,0x34},
+    {0x6f,0x14,0xdf,0x3d},
+    {0x78,0x09,0xcd,0x26},
+    {0x75,0x02,0xc3,0x2f},
+
+    {0x56,0x33,0xe9,0x10},
+    {0x5b,0x38,0xe7,0x19},
+    {0x4c,0x25,0xf5,0x02},
+    {0x41,0x2e,0xfb,0x0b},
+
+    {0x61,0x8c,0x9a,0xd7},
+    {0x6c,0x87,0x94,0xde},
+    {0x7b,0x9a,0x86,0xc5},
+    {0x76,0x91,0x88,0xcc},
+
+    {0x55,0xa0,0xa2,0xf3},
+    {0x58,0xab,0xac,0xfa},
+    {0x4f,0xb6,0xbe,0xe1},
+    {0x42,0xbd,0xb0,0xe8},
+
+    {0x09,0xd4,0xea,0x9f},
+    {0x04,0xdf,0xe4,0x96},
+    {0x13,0xc2,0xf6,0x8d},
+    {0x1e,0xc9,0xf8,0x84},
+
+    {0x3d,0xf8,0xd2,0xbb},
+    {0x30,0xf3,0xdc,0xb2},
+    {0x27,0xee,0xce,0xa9},
+    {0x2a,0xe5,0xc0,0xa0},
+
+    {0xb1,0x3c,0x7a,0x47},
+    {0xbc,0x37,0x74,0x4e},
+    {0xab,0x2a,0x66,0x55},
+    {0xa6,0x21,0x68,0x5c},
+
+    {0x85,0x10,0x42,0x63},
+    {0x88,0x1b,0x4c,0x6a},
+    {0x9f,0x06,0x5e,0x71},
+    {0x92,0x0d,0x50,0x78},
+
+    {0xd9,0x64,0x0a,0x0f},
+    {0xd4,0x6f,0x04,0x06},
+    {0xc3,0x72,0x16,0x1d},
+    {0xce,0x79,0x18,0x14},
+
+    {0xed,0x48,0x32,0x2b},
+    {0xe0,0x43,0x3c,0x22},
+    {0xf7,0x5e,0x2e,0x39},
+    {0xfa,0x55,0x20,0x30},
+
+    {0xb7,0x01,0xec,0x9a},
+    {0xba,0x0a,0xe2,0x93},
+    {0xad,0x17,0xf0,0x88},
+    {0xa0,0x1c,0xfe,0x81},
+
+    {0x83,0x2d,0xd4,0xbe},
+    {0x8e,0x26,0xda,0xb7},
+    {0x99,0x3b,0xc8,0xac},
+    {0x94,0x30,0xc6,0xa5},
+
+    {0xdf,0x59,0x9c,0xd2},
+    {0xd2,0x52,0x92,0xdb},
+    {0xc5,0x4f,0x80,0xc0},
+    {0xc8,0x44,0x8e,0xc9},
+
+    {0xeb,0x75,0xa4,0xf6},
+    {0xe6,0x7e,0xaa,0xff},
+    {0xf1,0x63,0xb8,0xe4},
+    {0xfc,0x68,0xb6,0xed},
+
+    {0x67,0xb1,0x0c,0x0a},
+    {0x6a,0xba,0x02,0x03},
+    {0x7d,0xa7,0x10,0x18},
+    {0x70,0xac,0x1e,0x11},
+
+    {0x53,0x9d,0x34,0x2e},
+    {0x5e,0x96,0x3a,0x27},
+    {0x49,0x8b,0x28,0x3c},
+    {0x44,0x80,0x26,0x35},
+
+    {0x0f,0xe9,0x7c,0x42},
+    {0x02,0xe2,0x72,0x4b},
+    {0x15,0xff,0x60,0x50},
+    {0x18,0xf4,0x6e,0x59},
+
+    {0x3b,0xc5,0x44,0x66},
+    {0x36,0xce,0x4a,0x6f},
+    {0x21,0xd3,0x58,0x74},
+    {0x2c,0xd8,0x56,0x7d},
+
+    {0x0c,0x7a,0x37,0xa1},
+    {0x01,0x71,0x39,0xa8},
+    {0x16,0x6c,0x2b,0xb3},
+    {0x1b,0x67,0x25,0xba},
+
+    {0x38,0x56,0x0f,0x85},
+    {0x35,0x5d,0x01,0x8c},
+    {0x22,0x40,0x13,0x97},
+    {0x2f,0x4b,0x1d,0x9e},
+
+    {0x64,0x22,0x47,0xe9},
+    {0x69,0x29,0x49,0xe0},
+    {0x7e,0x34,0x5b,0xfb},
+    {0x73,0x3f,0x55,0xf2},
+
+    {0x50,0x0e,0x7f,0xcd},
+    {0x5d,0x05,0x71,0xc4},
+    {0x4a,0x18,0x63,0xdf},
+    {0x47,0x13,0x6d,0xd6},
+
+    {0xdc,0xca,0xd7,0x31},
+    {0xd1,0xc1,0xd9,0x38},
+    {0xc6,0xdc,0xcb,0x23},
+    {0xcb,0xd7,0xc5,0x2a},
+
+    {0xe8,0xe6,0xef,0x15},
+    {0xe5,0xed,0xe1,0x1c},
+    {0xf2,0xf0,0xf3,0x07},
+    {0xff,0xfb,0xfd,0x0e},
+
+    {0xb4,0x92,0xa7,0x79},
+    {0xb9,0x99,0xa9,0x70},
+    {0xae,0x84,0xbb,0x6b},
+    {0xa3,0x8f,0xb5,0x62},
+
+    {0x80,0xbe,0x9f,0x5d},
+    {0x8d,0xb5,0x91,0x54},
+    {0x9a,0xa8,0x83,0x4f},
+    {0x97,0xa3,0x8d,0x46},
+
+};
+
+word8 U4[256][4] = {
+    {0x00,0x00,0x00,0x00},
+    {0x09,0x0d,0x0b,0x0e},
+    {0x12,0x1a,0x16,0x1c},
+    {0x1b,0x17,0x1d,0x12},
+
+    {0x24,0x34,0x2c,0x38},
+    {0x2d,0x39,0x27,0x36},
+    {0x36,0x2e,0x3a,0x24},
+    {0x3f,0x23,0x31,0x2a},
+
+    {0x48,0x68,0x58,0x70},
+    {0x41,0x65,0x53,0x7e},
+    {0x5a,0x72,0x4e,0x6c},
+    {0x53,0x7f,0x45,0x62},
+
+    {0x6c,0x5c,0x74,0x48},
+    {0x65,0x51,0x7f,0x46},
+    {0x7e,0x46,0x62,0x54},
+    {0x77,0x4b,0x69,0x5a},
+
+    {0x90,0xd0,0xb0,0xe0},
+    {0x99,0xdd,0xbb,0xee},
+    {0x82,0xca,0xa6,0xfc},
+    {0x8b,0xc7,0xad,0xf2},
+
+    {0xb4,0xe4,0x9c,0xd8},
+    {0xbd,0xe9,0x97,0xd6},
+    {0xa6,0xfe,0x8a,0xc4},
+    {0xaf,0xf3,0x81,0xca},
+
+    {0xd8,0xb8,0xe8,0x90},
+    {0xd1,0xb5,0xe3,0x9e},
+    {0xca,0xa2,0xfe,0x8c},
+    {0xc3,0xaf,0xf5,0x82},
+
+    {0xfc,0x8c,0xc4,0xa8},
+    {0xf5,0x81,0xcf,0xa6},
+    {0xee,0x96,0xd2,0xb4},
+    {0xe7,0x9b,0xd9,0xba},
+
+    {0x3b,0xbb,0x7b,0xdb},
+    {0x32,0xb6,0x70,0xd5},
+    {0x29,0xa1,0x6d,0xc7},
+    {0x20,0xac,0x66,0xc9},
+
+    {0x1f,0x8f,0x57,0xe3},
+    {0x16,0x82,0x5c,0xed},
+    {0x0d,0x95,0x41,0xff},
+    {0x04,0x98,0x4a,0xf1},
+
+    {0x73,0xd3,0x23,0xab},
+    {0x7a,0xde,0x28,0xa5},
+    {0x61,0xc9,0x35,0xb7},
+    {0x68,0xc4,0x3e,0xb9},
+
+    {0x57,0xe7,0x0f,0x93},
+    {0x5e,0xea,0x04,0x9d},
+    {0x45,0xfd,0x19,0x8f},
+    {0x4c,0xf0,0x12,0x81},
+
+    {0xab,0x6b,0xcb,0x3b},
+    {0xa2,0x66,0xc0,0x35},
+    {0xb9,0x71,0xdd,0x27},
+    {0xb0,0x7c,0xd6,0x29},
+
+    {0x8f,0x5f,0xe7,0x03},
+    {0x86,0x52,0xec,0x0d},
+    {0x9d,0x45,0xf1,0x1f},
+    {0x94,0x48,0xfa,0x11},
+
+    {0xe3,0x03,0x93,0x4b},
+    {0xea,0x0e,0x98,0x45},
+    {0xf1,0x19,0x85,0x57},
+    {0xf8,0x14,0x8e,0x59},
+
+    {0xc7,0x37,0xbf,0x73},
+    {0xce,0x3a,0xb4,0x7d},
+    {0xd5,0x2d,0xa9,0x6f},
+    {0xdc,0x20,0xa2,0x61},
+
+    {0x76,0x6d,0xf6,0xad},
+    {0x7f,0x60,0xfd,0xa3},
+    {0x64,0x77,0xe0,0xb1},
+    {0x6d,0x7a,0xeb,0xbf},
+
+    {0x52,0x59,0xda,0x95},
+    {0x5b,0x54,0xd1,0x9b},
+    {0x40,0x43,0xcc,0x89},
+    {0x49,0x4e,0xc7,0x87},
+
+    {0x3e,0x05,0xae,0xdd},
+    {0x37,0x08,0xa5,0xd3},
+    {0x2c,0x1f,0xb8,0xc1},
+    {0x25,0x12,0xb3,0xcf},
+
+    {0x1a,0x31,0x82,0xe5},
+    {0x13,0x3c,0x89,0xeb},
+    {0x08,0x2b,0x94,0xf9},
+    {0x01,0x26,0x9f,0xf7},
+
+    {0xe6,0xbd,0x46,0x4d},
+    {0xef,0xb0,0x4d,0x43},
+    {0xf4,0xa7,0x50,0x51},
+    {0xfd,0xaa,0x5b,0x5f},
+
+    {0xc2,0x89,0x6a,0x75},
+    {0xcb,0x84,0x61,0x7b},
+    {0xd0,0x93,0x7c,0x69},
+    {0xd9,0x9e,0x77,0x67},
+
+    {0xae,0xd5,0x1e,0x3d},
+    {0xa7,0xd8,0x15,0x33},
+    {0xbc,0xcf,0x08,0x21},
+    {0xb5,0xc2,0x03,0x2f},
+
+    {0x8a,0xe1,0x32,0x05},
+    {0x83,0xec,0x39,0x0b},
+    {0x98,0xfb,0x24,0x19},
+    {0x91,0xf6,0x2f,0x17},
+
+    {0x4d,0xd6,0x8d,0x76},
+    {0x44,0xdb,0x86,0x78},
+    {0x5f,0xcc,0x9b,0x6a},
+    {0x56,0xc1,0x90,0x64},
+
+    {0x69,0xe2,0xa1,0x4e},
+    {0x60,0xef,0xaa,0x40},
+    {0x7b,0xf8,0xb7,0x52},
+    {0x72,0xf5,0xbc,0x5c},
+
+    {0x05,0xbe,0xd5,0x06},
+    {0x0c,0xb3,0xde,0x08},
+    {0x17,0xa4,0xc3,0x1a},
+    {0x1e,0xa9,0xc8,0x14},
+
+    {0x21,0x8a,0xf9,0x3e},
+    {0x28,0x87,0xf2,0x30},
+    {0x33,0x90,0xef,0x22},
+    {0x3a,0x9d,0xe4,0x2c},
+
+    {0xdd,0x06,0x3d,0x96},
+    {0xd4,0x0b,0x36,0x98},
+    {0xcf,0x1c,0x2b,0x8a},
+    {0xc6,0x11,0x20,0x84},
+
+    {0xf9,0x32,0x11,0xae},
+    {0xf0,0x3f,0x1a,0xa0},
+    {0xeb,0x28,0x07,0xb2},
+    {0xe2,0x25,0x0c,0xbc},
+
+    {0x95,0x6e,0x65,0xe6},
+    {0x9c,0x63,0x6e,0xe8},
+    {0x87,0x74,0x73,0xfa},
+    {0x8e,0x79,0x78,0xf4},
+
+    {0xb1,0x5a,0x49,0xde},
+    {0xb8,0x57,0x42,0xd0},
+    {0xa3,0x40,0x5f,0xc2},
+    {0xaa,0x4d,0x54,0xcc},
+
+    {0xec,0xda,0xf7,0x41},
+    {0xe5,0xd7,0xfc,0x4f},
+    {0xfe,0xc0,0xe1,0x5d},
+    {0xf7,0xcd,0xea,0x53},
+
+    {0xc8,0xee,0xdb,0x79},
+    {0xc1,0xe3,0xd0,0x77},
+    {0xda,0xf4,0xcd,0x65},
+    {0xd3,0xf9,0xc6,0x6b},
+
+    {0xa4,0xb2,0xaf,0x31},
+    {0xad,0xbf,0xa4,0x3f},
+    {0xb6,0xa8,0xb9,0x2d},
+    {0xbf,0xa5,0xb2,0x23},
+
+    {0x80,0x86,0x83,0x09},
+    {0x89,0x8b,0x88,0x07},
+    {0x92,0x9c,0x95,0x15},
+    {0x9b,0x91,0x9e,0x1b},
+
+    {0x7c,0x0a,0x47,0xa1},
+    {0x75,0x07,0x4c,0xaf},
+    {0x6e,0x10,0x51,0xbd},
+    {0x67,0x1d,0x5a,0xb3},
+
+    {0x58,0x3e,0x6b,0x99},
+    {0x51,0x33,0x60,0x97},
+    {0x4a,0x24,0x7d,0x85},
+    {0x43,0x29,0x76,0x8b},
+
+    {0x34,0x62,0x1f,0xd1},
+    {0x3d,0x6f,0x14,0xdf},
+    {0x26,0x78,0x09,0xcd},
+    {0x2f,0x75,0x02,0xc3},
+
+    {0x10,0x56,0x33,0xe9},
+    {0x19,0x5b,0x38,0xe7},
+    {0x02,0x4c,0x25,0xf5},
+    {0x0b,0x41,0x2e,0xfb},
+
+    {0xd7,0x61,0x8c,0x9a},
+    {0xde,0x6c,0x87,0x94},
+    {0xc5,0x7b,0x9a,0x86},
+    {0xcc,0x76,0x91,0x88},
+
+    {0xf3,0x55,0xa0,0xa2},
+    {0xfa,0x58,0xab,0xac},
+    {0xe1,0x4f,0xb6,0xbe},
+    {0xe8,0x42,0xbd,0xb0},
+
+    {0x9f,0x09,0xd4,0xea},
+    {0x96,0x04,0xdf,0xe4},
+    {0x8d,0x13,0xc2,0xf6},
+    {0x84,0x1e,0xc9,0xf8},
+
+    {0xbb,0x3d,0xf8,0xd2},
+    {0xb2,0x30,0xf3,0xdc},
+    {0xa9,0x27,0xee,0xce},
+    {0xa0,0x2a,0xe5,0xc0},
+
+    {0x47,0xb1,0x3c,0x7a},
+    {0x4e,0xbc,0x37,0x74},
+    {0x55,0xab,0x2a,0x66},
+    {0x5c,0xa6,0x21,0x68},
+
+    {0x63,0x85,0x10,0x42},
+    {0x6a,0x88,0x1b,0x4c},
+    {0x71,0x9f,0x06,0x5e},
+    {0x78,0x92,0x0d,0x50},
+
+    {0x0f,0xd9,0x64,0x0a},
+    {0x06,0xd4,0x6f,0x04},
+    {0x1d,0xc3,0x72,0x16},
+    {0x14,0xce,0x79,0x18},
+
+    {0x2b,0xed,0x48,0x32},
+    {0x22,0xe0,0x43,0x3c},
+    {0x39,0xf7,0x5e,0x2e},
+    {0x30,0xfa,0x55,0x20},
+
+    {0x9a,0xb7,0x01,0xec},
+    {0x93,0xba,0x0a,0xe2},
+    {0x88,0xad,0x17,0xf0},
+    {0x81,0xa0,0x1c,0xfe},
+
+    {0xbe,0x83,0x2d,0xd4},
+    {0xb7,0x8e,0x26,0xda},
+    {0xac,0x99,0x3b,0xc8},
+    {0xa5,0x94,0x30,0xc6},
+
+    {0xd2,0xdf,0x59,0x9c},
+    {0xdb,0xd2,0x52,0x92},
+    {0xc0,0xc5,0x4f,0x80},
+    {0xc9,0xc8,0x44,0x8e},
+
+    {0xf6,0xeb,0x75,0xa4},
+    {0xff,0xe6,0x7e,0xaa},
+    {0xe4,0xf1,0x63,0xb8},
+    {0xed,0xfc,0x68,0xb6},
+
+    {0x0a,0x67,0xb1,0x0c},
+    {0x03,0x6a,0xba,0x02},
+    {0x18,0x7d,0xa7,0x10},
+    {0x11,0x70,0xac,0x1e},
+
+    {0x2e,0x53,0x9d,0x34},
+    {0x27,0x5e,0x96,0x3a},
+    {0x3c,0x49,0x8b,0x28},
+    {0x35,0x44,0x80,0x26},
+
+    {0x42,0x0f,0xe9,0x7c},
+    {0x4b,0x02,0xe2,0x72},
+    {0x50,0x15,0xff,0x60},
+    {0x59,0x18,0xf4,0x6e},
+
+    {0x66,0x3b,0xc5,0x44},
+    {0x6f,0x36,0xce,0x4a},
+    {0x74,0x21,0xd3,0x58},
+    {0x7d,0x2c,0xd8,0x56},
+
+    {0xa1,0x0c,0x7a,0x37},
+    {0xa8,0x01,0x71,0x39},
+    {0xb3,0x16,0x6c,0x2b},
+    {0xba,0x1b,0x67,0x25},
+
+    {0x85,0x38,0x56,0x0f},
+    {0x8c,0x35,0x5d,0x01},
+    {0x97,0x22,0x40,0x13},
+    {0x9e,0x2f,0x4b,0x1d},
+
+    {0xe9,0x64,0x22,0x47},
+    {0xe0,0x69,0x29,0x49},
+    {0xfb,0x7e,0x34,0x5b},
+    {0xf2,0x73,0x3f,0x55},
+
+    {0xcd,0x50,0x0e,0x7f},
+    {0xc4,0x5d,0x05,0x71},
+    {0xdf,0x4a,0x18,0x63},
+    {0xd6,0x47,0x13,0x6d},
+
+    {0x31,0xdc,0xca,0xd7},
+    {0x38,0xd1,0xc1,0xd9},
+    {0x23,0xc6,0xdc,0xcb},
+    {0x2a,0xcb,0xd7,0xc5},
+
+    {0x15,0xe8,0xe6,0xef},
+    {0x1c,0xe5,0xed,0xe1},
+    {0x07,0xf2,0xf0,0xf3},
+    {0x0e,0xff,0xfb,0xfd},
+
+    {0x79,0xb4,0x92,0xa7},
+    {0x70,0xb9,0x99,0xa9},
+    {0x6b,0xae,0x84,0xbb},
+    {0x62,0xa3,0x8f,0xb5},
+
+    {0x5d,0x80,0xbe,0x9f},
+    {0x54,0x8d,0xb5,0x91},
+    {0x4f,0x9a,0xa8,0x83},
+    {0x46,0x97,0xa3,0x8d},
+
+};
+
+word32 rcon[30] = { 
+  0x01,0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91
+};

diff --git a/crypto/rijndael/rijndael-alg-fst.c b/crypto/rijndael/rijndael-alg-fst.c
new file mode 100755 (executable)
index 0000000..136166a
--- /dev/null
+++ b/crypto/rijndael/rijndael-alg-fst.c
@@ -0,0 +1,476 @@
+/*
+ * rijndael-alg-fst.c   v2.4   April '2000
+ *
+ * Optimised ANSI C code
+ *
+ * authors: v1.0: Antoon Bosselaers
+ *          v2.0: Vincent Rijmen
+ *          v2.3: Paulo Barreto
+ *          v2.4: Vincent Rijmen
+ *
+ * This code is placed in the public domain.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "rijndael-alg-fst.h"
+
+#include "boxes-fst-corrected.dat"
+
+int rijndaelKeySched(const word8 k[RIJNDAEL_MAXKC][4],
+                    word8 W[RIJNDAEL_MAXROUNDS+1][4][4],int ROUNDS)
+    {
+    /* Calculate the necessary round keys
+     * The number of calculations depends on keyBits and blockBits
+     */ 
+    int j, r, t, rconpointer = 0;
+    word8 tk[RIJNDAEL_MAXKC][4];
+    int KC = ROUNDS - 6;
+
+    for (j = KC-1; j >= 0; j--)
+       *((word32*)tk[j]) = *((word32*)k[j]);
+    r = 0;
+    t = 0;
+    /* copy values into round key array */
+    for (j = 0; (j < KC) && (r < ROUNDS + 1); )
+       {
+       for (; (j < KC) && (t < 4); j++, t++)
+           *((word32*)W[r][t]) = *((word32*)tk[j]);
+       if (t == 4)
+           {
+           r++;
+           t = 0;
+           }
+       }
+               
+    while (r < ROUNDS + 1)
+       { /* while not enough round key material calculated */
+       /* calculate new values */
+       tk[0][0] ^= S[tk[KC-1][1]];
+       tk[0][1] ^= S[tk[KC-1][2]];
+       tk[0][2] ^= S[tk[KC-1][3]];
+       tk[0][3] ^= S[tk[KC-1][0]];
+       tk[0][0] ^= rcon[rconpointer++];
+
+       if (KC != 8)
+           {
+           for (j = 1; j < KC; j++)
+               {
+               *((word32*)tk[j]) ^= *((word32*)tk[j-1]);
+               }
+           }
+       else
+           {
+           for (j = 1; j < KC/2; j++)
+               {
+               *((word32*)tk[j]) ^= *((word32*)tk[j-1]);
+               }
+           tk[KC/2][0] ^= S[tk[KC/2 - 1][0]];
+           tk[KC/2][1] ^= S[tk[KC/2 - 1][1]];
+           tk[KC/2][2] ^= S[tk[KC/2 - 1][2]];
+           tk[KC/2][3] ^= S[tk[KC/2 - 1][3]];
+           for (j = KC/2 + 1; j < KC; j++)
+               {
+               *((word32*)tk[j]) ^= *((word32*)tk[j-1]);
+               }
+           }
+       /* copy values into round key array */
+       for (j = 0; (j < KC) && (r < ROUNDS + 1); )
+           {
+           for (; (j < KC) && (t < 4); j++, t++)
+               {
+               *((word32*)W[r][t]) = *((word32*)tk[j]);
+               }
+           if (t == 4)
+               {
+               r++;
+               t = 0;
+               }
+           }
+       }       
+    return 0;
+    }
+
+int rijndaelKeyEncToDec(word8 W[RIJNDAEL_MAXROUNDS+1][4][4], int ROUNDS)
+    {
+    int r;
+    word8 *w;
+
+    for (r = 1; r < ROUNDS; r++)
+       {
+       w = W[r][0];
+       *((word32*)w) =
+         *((word32*)U1[w[0]])
+         ^ *((word32*)U2[w[1]])
+         ^ *((word32*)U3[w[2]])
+         ^ *((word32*)U4[w[3]]);
+
+       w = W[r][1];
+       *((word32*)w) =
+         *((word32*)U1[w[0]])
+         ^ *((word32*)U2[w[1]])
+         ^ *((word32*)U3[w[2]])
+         ^ *((word32*)U4[w[3]]);
+
+       w = W[r][2];
+       *((word32*)w) =
+         *((word32*)U1[w[0]])
+         ^ *((word32*)U2[w[1]])
+         ^ *((word32*)U3[w[2]])
+         ^ *((word32*)U4[w[3]]);
+
+       w = W[r][3];
+       *((word32*)w) =
+         *((word32*)U1[w[0]])
+         ^ *((word32*)U2[w[1]])
+         ^ *((word32*)U3[w[2]])
+         ^ *((word32*)U4[w[3]]);
+       }
+    return 0;
+    }
+
+/**
+ * Encrypt a single block. 
+ */
+int rijndaelEncrypt(const word8 a[16],word8 b[16],
+                   word8 rk[RIJNDAEL_MAXROUNDS+1][4][4],
+                   int ROUNDS)
+    {
+    int r;
+    word8 temp[4][4];
+
+    *((word32*)temp[0]) = *((word32*)(a   )) ^ *((word32*)rk[0][0]);
+    *((word32*)temp[1]) = *((word32*)(a+ 4)) ^ *((word32*)rk[0][1]);
+    *((word32*)temp[2]) = *((word32*)(a+ 8)) ^ *((word32*)rk[0][2]);
+    *((word32*)temp[3]) = *((word32*)(a+12)) ^ *((word32*)rk[0][3]);
+    *((word32*)(b    )) = *((word32*)T1[temp[0][0]])
+      ^ *((word32*)T2[temp[1][1]])
+      ^ *((word32*)T3[temp[2][2]]) 
+      ^ *((word32*)T4[temp[3][3]]);
+    *((word32*)(b + 4)) = *((word32*)T1[temp[1][0]])
+      ^ *((word32*)T2[temp[2][1]])
+      ^ *((word32*)T3[temp[3][2]]) 
+      ^ *((word32*)T4[temp[0][3]]);
+    *((word32*)(b + 8)) = *((word32*)T1[temp[2][0]])
+      ^ *((word32*)T2[temp[3][1]])
+      ^ *((word32*)T3[temp[0][2]]) 
+      ^ *((word32*)T4[temp[1][3]]);
+    *((word32*)(b +12)) = *((word32*)T1[temp[3][0]])
+      ^ *((word32*)T2[temp[0][1]])
+      ^ *((word32*)T3[temp[1][2]]) 
+      ^ *((word32*)T4[temp[2][3]]);
+    for (r = 1; r < ROUNDS-1; r++)
+       {
+       *((word32*)temp[0]) = *((word32*)(b   )) ^ *((word32*)rk[r][0]);
+       *((word32*)temp[1]) = *((word32*)(b+ 4)) ^ *((word32*)rk[r][1]);
+       *((word32*)temp[2]) = *((word32*)(b+ 8)) ^ *((word32*)rk[r][2]);
+       *((word32*)temp[3]) = *((word32*)(b+12)) ^ *((word32*)rk[r][3]);
+
+       *((word32*)(b    )) = *((word32*)T1[temp[0][0]])
+         ^ *((word32*)T2[temp[1][1]])
+         ^ *((word32*)T3[temp[2][2]]) 
+         ^ *((word32*)T4[temp[3][3]]);
+       *((word32*)(b + 4)) = *((word32*)T1[temp[1][0]])
+         ^ *((word32*)T2[temp[2][1]])
+         ^ *((word32*)T3[temp[3][2]]) 
+         ^ *((word32*)T4[temp[0][3]]);
+       *((word32*)(b + 8)) = *((word32*)T1[temp[2][0]])
+         ^ *((word32*)T2[temp[3][1]])
+         ^ *((word32*)T3[temp[0][2]]) 
+         ^ *((word32*)T4[temp[1][3]]);
+       *((word32*)(b +12)) = *((word32*)T1[temp[3][0]])
+         ^ *((word32*)T2[temp[0][1]])
+         ^ *((word32*)T3[temp[1][2]]) 
+         ^ *((word32*)T4[temp[2][3]]);
+       }
+    /* last round is special */   
+    *((word32*)temp[0]) = *((word32*)(b   )) ^ *((word32*)rk[ROUNDS-1][0]);
+    *((word32*)temp[1]) = *((word32*)(b+ 4)) ^ *((word32*)rk[ROUNDS-1][1]);
+    *((word32*)temp[2]) = *((word32*)(b+ 8)) ^ *((word32*)rk[ROUNDS-1][2]);
+    *((word32*)temp[3]) = *((word32*)(b+12)) ^ *((word32*)rk[ROUNDS-1][3]);
+    b[ 0] = T1[temp[0][0]][1];
+    b[ 1] = T1[temp[1][1]][1];
+    b[ 2] = T1[temp[2][2]][1];
+    b[ 3] = T1[temp[3][3]][1];
+    b[ 4] = T1[temp[1][0]][1];
+    b[ 5] = T1[temp[2][1]][1];
+    b[ 6] = T1[temp[3][2]][1];
+    b[ 7] = T1[temp[0][3]][1];
+    b[ 8] = T1[temp[2][0]][1];
+    b[ 9] = T1[temp[3][1]][1];
+    b[10] = T1[temp[0][2]][1];
+    b[11] = T1[temp[1][3]][1];
+    b[12] = T1[temp[3][0]][1];
+    b[13] = T1[temp[0][1]][1];
+    b[14] = T1[temp[1][2]][1];
+    b[15] = T1[temp[2][3]][1];
+    *((word32*)(b   )) ^= *((word32*)rk[ROUNDS][0]);
+    *((word32*)(b+ 4)) ^= *((word32*)rk[ROUNDS][1]);
+    *((word32*)(b+ 8)) ^= *((word32*)rk[ROUNDS][2]);
+    *((word32*)(b+12)) ^= *((word32*)rk[ROUNDS][3]);
+
+    return 0;
+    }
+
+#ifdef INTERMEDIATE_VALUE_KAT
+/**
+ * Encrypt only a certain number of rounds.
+ * Only used in the Intermediate Value Known Answer Test.
+ */
+int rijndaelEncryptRound(word8 a[4][4],word8 rk[RIJNDAEL_MAXROUNDS+1][4][4],
+                        int ROUNDS, int rounds)
+    {
+    int r;
+    word8 temp[4][4];
+
+    /* make number of rounds sane */
+    if (rounds > ROUNDS)
+       {
+       rounds = ROUNDS;
+       }
+
+    *((word32*)a[0]) = *((word32*)a[0]) ^ *((word32*)rk[0][0]);
+    *((word32*)a[1]) = *((word32*)a[1]) ^ *((word32*)rk[0][1]);
+    *((word32*)a[2]) = *((word32*)a[2]) ^ *((word32*)rk[0][2]);
+    *((word32*)a[3]) = *((word32*)a[3]) ^ *((word32*)rk[0][3]);
+
+    for (r = 1; (r <= rounds) && (r < ROUNDS); r++) {
+    *((word32*)temp[0]) = *((word32*)T1[a[0][0]])
+      ^ *((word32*)T2[a[1][1]])
+      ^ *((word32*)T3[a[2][2]]) 
+      ^ *((word32*)T4[a[3][3]]);
+    *((word32*)temp[1]) = *((word32*)T1[a[1][0]])
+      ^ *((word32*)T2[a[2][1]])
+      ^ *((word32*)T3[a[3][2]]) 
+      ^ *((word32*)T4[a[0][3]]);
+    *((word32*)temp[2]) = *((word32*)T1[a[2][0]])
+      ^ *((word32*)T2[a[3][1]])
+      ^ *((word32*)T3[a[0][2]]) 
+      ^ *((word32*)T4[a[1][3]]);
+    *((word32*)temp[3]) = *((word32*)T1[a[3][0]])
+      ^ *((word32*)T2[a[0][1]])
+      ^ *((word32*)T3[a[1][2]]) 
+      ^ *((word32*)T4[a[2][3]]);
+    *((word32*)a[0]) = *((word32*)temp[0]) ^ *((word32*)rk[r][0]);
+    *((word32*)a[1]) = *((word32*)temp[1]) ^ *((word32*)rk[r][1]);
+    *((word32*)a[2]) = *((word32*)temp[2]) ^ *((word32*)rk[r][2]);
+    *((word32*)a[3]) = *((word32*)temp[3]) ^ *((word32*)rk[r][3]);
+    }
+    if (rounds == ROUNDS)
+       {
+       /* last round is special */   
+       temp[0][0] = T1[a[0][0]][1];
+       temp[0][1] = T1[a[1][1]][1];
+       temp[0][2] = T1[a[2][2]][1]; 
+       temp[0][3] = T1[a[3][3]][1];
+       temp[1][0] = T1[a[1][0]][1];
+       temp[1][1] = T1[a[2][1]][1];
+       temp[1][2] = T1[a[3][2]][1]; 
+       temp[1][3] = T1[a[0][3]][1];
+       temp[2][0] = T1[a[2][0]][1];
+       temp[2][1] = T1[a[3][1]][1];
+       temp[2][2] = T1[a[0][2]][1]; 
+       temp[2][3] = T1[a[1][3]][1];
+       temp[3][0] = T1[a[3][0]][1];
+       temp[3][1] = T1[a[0][1]][1];
+       temp[3][2] = T1[a[1][2]][1]; 
+       temp[3][3] = T1[a[2][3]][1];
+       *((word32*)a[0]) = *((word32*)temp[0]) ^ *((word32*)rk[ROUNDS][0]);
+       *((word32*)a[1]) = *((word32*)temp[1]) ^ *((word32*)rk[ROUNDS][1]);
+       *((word32*)a[2]) = *((word32*)temp[2]) ^ *((word32*)rk[ROUNDS][2]);
+       *((word32*)a[3]) = *((word32*)temp[3]) ^ *((word32*)rk[ROUNDS][3]);
+       }
+
+    return 0;
+    }
+#endif /* INTERMEDIATE_VALUE_KAT */
+
+/**
+ * Decrypt a single block.
+ */
+int rijndaelDecrypt(const word8 a[16],word8 b[16],
+                   word8 rk[RIJNDAEL_MAXROUNDS+1][4][4],int ROUNDS)
+    {
+    int r;
+    word8 temp[4][4];
+       
+    *((word32*)temp[0]) = *((word32*)(a   )) ^ *((word32*)rk[ROUNDS][0]);
+    *((word32*)temp[1]) = *((word32*)(a+ 4)) ^ *((word32*)rk[ROUNDS][1]);
+    *((word32*)temp[2]) = *((word32*)(a+ 8)) ^ *((word32*)rk[ROUNDS][2]);
+    *((word32*)temp[3]) = *((word32*)(a+12)) ^ *((word32*)rk[ROUNDS][3]);
+
+    *((word32*)(b   )) = *((word32*)T5[temp[0][0]])
+      ^ *((word32*)T6[temp[3][1]])
+      ^ *((word32*)T7[temp[2][2]]) 
+      ^ *((word32*)T8[temp[1][3]]);
+    *((word32*)(b+ 4)) = *((word32*)T5[temp[1][0]])
+      ^ *((word32*)T6[temp[0][1]])
+      ^ *((word32*)T7[temp[3][2]]) 
+      ^ *((word32*)T8[temp[2][3]]);
+    *((word32*)(b+ 8)) = *((word32*)T5[temp[2][0]])
+      ^ *((word32*)T6[temp[1][1]])
+      ^ *((word32*)T7[temp[0][2]]) 
+      ^ *((word32*)T8[temp[3][3]]);
+    *((word32*)(b+12)) = *((word32*)T5[temp[3][0]])
+      ^ *((word32*)T6[temp[2][1]])
+      ^ *((word32*)T7[temp[1][2]]) 
+      ^ *((word32*)T8[temp[0][3]]);
+    for (r = ROUNDS-1; r > 1; r--)
+       {
+       *((word32*)temp[0]) = *((word32*)(b   )) ^ *((word32*)rk[r][0]);
+       *((word32*)temp[1]) = *((word32*)(b+ 4)) ^ *((word32*)rk[r][1]);
+       *((word32*)temp[2]) = *((word32*)(b+ 8)) ^ *((word32*)rk[r][2]);
+       *((word32*)temp[3]) = *((word32*)(b+12)) ^ *((word32*)rk[r][3]);
+       *((word32*)(b   )) = *((word32*)T5[temp[0][0]])
+         ^ *((word32*)T6[temp[3][1]])
+         ^ *((word32*)T7[temp[2][2]]) 
+         ^ *((word32*)T8[temp[1][3]]);
+       *((word32*)(b+ 4)) = *((word32*)T5[temp[1][0]])
+         ^ *((word32*)T6[temp[0][1]])
+         ^ *((word32*)T7[temp[3][2]]) 
+         ^ *((word32*)T8[temp[2][3]]);
+       *((word32*)(b+ 8)) = *((word32*)T5[temp[2][0]])
+         ^ *((word32*)T6[temp[1][1]])
+         ^ *((word32*)T7[temp[0][2]]) 
+         ^ *((word32*)T8[temp[3][3]]);
+       *((word32*)(b+12)) = *((word32*)T5[temp[3][0]])
+         ^ *((word32*)T6[temp[2][1]])
+         ^ *((word32*)T7[temp[1][2]]) 
+         ^ *((word32*)T8[temp[0][3]]);
+       }
+    /* last round is special */   
+    *((word32*)temp[0]) = *((word32*)(b   )) ^ *((word32*)rk[1][0]);
+    *((word32*)temp[1]) = *((word32*)(b+ 4)) ^ *((word32*)rk[1][1]);
+    *((word32*)temp[2]) = *((word32*)(b+ 8)) ^ *((word32*)rk[1][2]);
+    *((word32*)temp[3]) = *((word32*)(b+12)) ^ *((word32*)rk[1][3]);
+    b[ 0] = S5[temp[0][0]];
+    b[ 1] = S5[temp[3][1]];
+    b[ 2] = S5[temp[2][2]];
+    b[ 3] = S5[temp[1][3]];
+    b[ 4] = S5[temp[1][0]];
+    b[ 5] = S5[temp[0][1]];
+    b[ 6] = S5[temp[3][2]];
+    b[ 7] = S5[temp[2][3]];
+    b[ 8] = S5[temp[2][0]];
+    b[ 9] = S5[temp[1][1]];
+    b[10] = S5[temp[0][2]];
+    b[11] = S5[temp[3][3]];
+    b[12] = S5[temp[3][0]];
+    b[13] = S5[temp[2][1]];
+    b[14] = S5[temp[1][2]];
+    b[15] = S5[temp[0][3]];
+    *((word32*)(b   )) ^= *((word32*)rk[0][0]);
+    *((word32*)(b+ 4)) ^= *((word32*)rk[0][1]);
+    *((word32*)(b+ 8)) ^= *((word32*)rk[0][2]);
+    *((word32*)(b+12)) ^= *((word32*)rk[0][3]);
+
+    return 0;
+    }
+
+#ifdef INTERMEDIATE_VALUE_KAT
+/**
+ * Decrypt only a certain number of rounds.
+ * Only used in the Intermediate Value Known Answer Test.
+ * Operations rearranged such that the intermediate values
+ * of decryption correspond with the intermediate values
+ * of encryption.
+ */
+int rijndaelDecryptRound(word8 a[4][4], word8 rk[RIJNDAEL_MAXROUNDS+1][4][4],
+                        int ROUNDS, int rounds)
+    {
+    int r, i;
+    word8 temp[4], shift;
+
+    /* make number of rounds sane */
+    if (rounds > ROUNDS)
+       {
+       rounds = ROUNDS;
+       }
+    /* first round is special: */
+    *(word32 *)a[0] ^= *(word32 *)rk[ROUNDS][0];
+    *(word32 *)a[1] ^= *(word32 *)rk[ROUNDS][1];
+    *(word32 *)a[2] ^= *(word32 *)rk[ROUNDS][2];
+    *(word32 *)a[3] ^= *(word32 *)rk[ROUNDS][3];
+    for (i = 0; i < 4; i++)
+       {
+       a[i][0] = Si[a[i][0]];
+       a[i][1] = Si[a[i][1]];
+       a[i][2] = Si[a[i][2]];
+       a[i][3] = Si[a[i][3]];
+       }
+    for (i = 1; i < 4; i++)
+       {
+       shift = (4 - i) & 3;
+       temp[0] = a[(0 + shift) & 3][i];
+       temp[1] = a[(1 + shift) & 3][i];
+       temp[2] = a[(2 + shift) & 3][i];
+       temp[3] = a[(3 + shift) & 3][i];
+       a[0][i] = temp[0];
+       a[1][i] = temp[1];
+       a[2][i] = temp[2];
+       a[3][i] = temp[3];
+       }
+    /* ROUNDS-1 ordinary rounds */
+    for (r = ROUNDS-1; r > rounds; r--)
+       {
+       *(word32 *)a[0] ^= *(word32 *)rk[r][0];
+       *(word32 *)a[1] ^= *(word32 *)rk[r][1];
+       *(word32 *)a[2] ^= *(word32 *)rk[r][2];
+       *(word32 *)a[3] ^= *(word32 *)rk[r][3];
+
+       *((word32*)a[0]) =
+         *((word32*)U1[a[0][0]])
+         ^ *((word32*)U2[a[0][1]])
+         ^ *((word32*)U3[a[0][2]])
+         ^ *((word32*)U4[a[0][3]]);
+       
+       *((word32*)a[1]) =
+         *((word32*)U1[a[1][0]])
+         ^ *((word32*)U2[a[1][1]])
+         ^ *((word32*)U3[a[1][2]])
+         ^ *((word32*)U4[a[1][3]]);
+
+       *((word32*)a[2]) =
+         *((word32*)U1[a[2][0]])
+         ^ *((word32*)U2[a[2][1]])
+         ^ *((word32*)U3[a[2][2]])
+         ^ *((word32*)U4[a[2][3]]);
+
+       *((word32*)a[3]) =
+         *((word32*)U1[a[3][0]])
+         ^ *((word32*)U2[a[3][1]])
+         ^ *((word32*)U3[a[3][2]])
+         ^ *((word32*)U4[a[3][3]]);
+       for (i = 0; i < 4; i++)
+           {
+           a[i][0] = Si[a[i][0]];
+           a[i][1] = Si[a[i][1]];
+           a[i][2] = Si[a[i][2]];
+           a[i][3] = Si[a[i][3]];
+           }
+       for (i = 1; i < 4; i++)
+           {
+           shift = (4 - i) & 3;
+           temp[0] = a[(0 + shift) & 3][i];
+           temp[1] = a[(1 + shift) & 3][i];
+           temp[2] = a[(2 + shift) & 3][i];
+           temp[3] = a[(3 + shift) & 3][i];
+           a[0][i] = temp[0];
+           a[1][i] = temp[1];
+           a[2][i] = temp[2];
+           a[3][i] = temp[3];
+           }
+       }
+    if (rounds == 0)
+       {
+       /* End with the extra key addition */   
+       *(word32 *)a[0] ^= *(word32 *)rk[0][0];
+       *(word32 *)a[1] ^= *(word32 *)rk[0][1];
+       *(word32 *)a[2] ^= *(word32 *)rk[0][2];
+       *(word32 *)a[3] ^= *(word32 *)rk[0][3];
+       } 
+    return 0;
+    }
+
+#endif /* INTERMEDIATE_VALUE_KAT */

diff --git a/crypto/rijndael/rijndael-alg-fst.h b/crypto/rijndael/rijndael-alg-fst.h
new file mode 100755 (executable)
index 0000000..9a86e25
--- /dev/null
+++ b/crypto/rijndael/rijndael-alg-fst.h
@@ -0,0 +1,46 @@
+/*
+ * rijndael-alg-fst.h   v2.4   April '2000
+ *
+ * Optimised ANSI C code
+ *
+ * #define INTERMEDIATE_VALUE_KAT to generate the Intermediate Value Known Answer Test.
+ */
+
+#ifndef __RIJNDAEL_ALG_FST_H
+#define __RIJNDAEL_ALG_FST_H
+
+#define RIJNDAEL_MAXKC         (256/32)
+#define RIJNDAEL_MAXROUNDS     14
+
+#ifndef USUAL_TYPES
+#define USUAL_TYPES
+typedef unsigned char  byte;
+typedef unsigned char  word8;  
+typedef unsigned short word16; 
+typedef unsigned int   word32;
+#endif /* USUAL_TYPES */
+
+int rijndaelKeySched(const word8 k[RIJNDAEL_MAXKC][4],
+                    word8 rk[RIJNDAEL_MAXROUNDS+1][4][4],
+                    int ROUNDS);
+
+int rijndaelKeyEncToDec(word8 W[RIJNDAEL_MAXROUNDS+1][4][4], int ROUNDS);
+
+int rijndaelEncrypt(const word8 a[16],word8 b[16],
+                   word8 rk[RIJNDAEL_MAXROUNDS+1][4][4],
+                   int ROUNDS);
+
+#ifdef INTERMEDIATE_VALUE_KAT
+int rijndaelEncryptRound(word8 a[4][4],word8 rk[RIJNDAEL_MAXROUNDS+1][4][4],
+                        int ROUNDS, int rounds);
+#endif /* INTERMEDIATE_VALUE_KAT */
+
+int rijndaelDecrypt(const word8 a[16], word8 b[16],
+                   word8 rk[RIJNDAEL_MAXROUNDS+1][4][4], int ROUNDS);
+
+#ifdef INTERMEDIATE_VALUE_KAT
+int rijndaelDecryptRound(word8 a[4][4], word8 rk[RIJNDAEL_MAXROUNDS+1][4][4],
+                        int ROUNDS, int rounds);
+#endif /* INTERMEDIATE_VALUE_KAT */
+
+#endif /* __RIJNDAEL_ALG_FST_H */

diff --git a/crypto/rijndael/rijndael.h b/crypto/rijndael/rijndael.h
new file mode 100644 (file)
index 0000000..34741a8
--- /dev/null
+++ b/crypto/rijndael/rijndael.h
@@ -0,0 +1,11 @@
+#include "rijndael-alg-fst.h"
+
+#define RIJNDAEL_MAX_IV                16
+
+typedef struct
+    {
+    word8 keySched[RIJNDAEL_MAXROUNDS+1][4][4];
+    int rounds;
+    word8 iv[RIJNDAEL_MAX_IV];
+    int enc;
+    } RIJNDAEL_KEY;

diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl
index 1be9a1cd2397fdea0ba8dea994a46cbb56ee0f81..8fd68a688c6d86bb52afce7d183b2e7a8b4a039c 100644 (file)
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -166,7 +166,9 @@ rsa_saos.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 rsa_saos.o: ../../include/openssl/opensslconf.h
 rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 rsa_saos.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-rsa_saos.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+rsa_saos.o: ../../include/openssl/rc5.h
+rsa_saos.o: ../../include/openssl/rijndael-alg-fst.h
+rsa_saos.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 rsa_saos.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_saos.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 rsa_saos.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -185,7 +187,9 @@ rsa_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 rsa_sign.o: ../../include/openssl/opensslconf.h
 rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 rsa_sign.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-rsa_sign.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+rsa_sign.o: ../../include/openssl/rc5.h
+rsa_sign.o: ../../include/openssl/rijndael-alg-fst.h
+rsa_sign.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 rsa_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 rsa_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl
index 55356c680b20d298fe0e72823883397fb0a8ecd9..ff479ac77d23a346bf73b38c89dc113c04576658 100644 (file)
--- a/crypto/x509/Makefile.ssl
+++ b/crypto/x509/Makefile.ssl
@@ -103,11 +103,12 @@ by_dir.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 by_dir.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 by_dir.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 by_dir.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-by_dir.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-by_dir.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-by_dir.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-by_dir.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-by_dir.o: ../cryptlib.h
+by_dir.o: ../../include/openssl/rijndael-alg-fst.h
+by_dir.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+by_dir.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+by_dir.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+by_dir.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+by_dir.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 by_file.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 by_file.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 by_file.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -123,11 +124,12 @@ by_file.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 by_file.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 by_file.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 by_file.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-by_file.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-by_file.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-by_file.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-by_file.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-by_file.o: ../cryptlib.h
+by_file.o: ../../include/openssl/rijndael-alg-fst.h
+by_file.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+by_file.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+by_file.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+by_file.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+by_file.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 x509_att.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 x509_att.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 x509_att.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -143,7 +145,9 @@ x509_att.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_att.o: ../../include/openssl/opensslconf.h
 x509_att.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_att.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_att.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_att.o: ../../include/openssl/rc5.h
+x509_att.o: ../../include/openssl/rijndael-alg-fst.h
+x509_att.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_att.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -164,7 +168,9 @@ x509_cmp.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_cmp.o: ../../include/openssl/opensslconf.h
 x509_cmp.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_cmp.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_cmp.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_cmp.o: ../../include/openssl/rc5.h
+x509_cmp.o: ../../include/openssl/rijndael-alg-fst.h
+x509_cmp.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_cmp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_cmp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_cmp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -184,11 +190,12 @@ x509_d2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_d2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 x509_d2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 x509_d2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x509_d2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x509_d2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x509_d2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-x509_d2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-x509_d2.o: ../cryptlib.h
+x509_d2.o: ../../include/openssl/rijndael-alg-fst.h
+x509_d2.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+x509_d2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x509_d2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x509_d2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+x509_d2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 x509_def.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 x509_def.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 x509_def.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -203,7 +210,9 @@ x509_def.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_def.o: ../../include/openssl/opensslconf.h
 x509_def.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_def.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_def.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_def.o: ../../include/openssl/rc5.h
+x509_def.o: ../../include/openssl/rijndael-alg-fst.h
+x509_def.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_def.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_def.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_def.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -221,7 +230,9 @@ x509_err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x509_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_err.o: ../../include/openssl/rc5.h
+x509_err.o: ../../include/openssl/rijndael-alg-fst.h
+x509_err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -241,7 +252,9 @@ x509_ext.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_ext.o: ../../include/openssl/opensslconf.h
 x509_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_ext.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_ext.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_ext.o: ../../include/openssl/rc5.h
+x509_ext.o: ../../include/openssl/rijndael-alg-fst.h
+x509_ext.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_ext.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_ext.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_ext.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -261,11 +274,12 @@ x509_lu.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_lu.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 x509_lu.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 x509_lu.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x509_lu.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x509_lu.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x509_lu.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-x509_lu.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-x509_lu.o: ../cryptlib.h
+x509_lu.o: ../../include/openssl/rijndael-alg-fst.h
+x509_lu.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+x509_lu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x509_lu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x509_lu.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+x509_lu.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 x509_obj.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 x509_obj.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 x509_obj.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -280,7 +294,9 @@ x509_obj.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_obj.o: ../../include/openssl/opensslconf.h
 x509_obj.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_obj.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_obj.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_obj.o: ../../include/openssl/rc5.h
+x509_obj.o: ../../include/openssl/rijndael-alg-fst.h
+x509_obj.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_obj.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_obj.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_obj.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -299,7 +315,9 @@ x509_r2x.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_r2x.o: ../../include/openssl/opensslconf.h
 x509_r2x.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_r2x.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_r2x.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_r2x.o: ../../include/openssl/rc5.h
+x509_r2x.o: ../../include/openssl/rijndael-alg-fst.h
+x509_r2x.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_r2x.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_r2x.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_r2x.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -319,7 +337,9 @@ x509_req.o: ../../include/openssl/opensslconf.h
 x509_req.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
 x509_req.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
 x509_req.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_req.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_req.o: ../../include/openssl/rc5.h
+x509_req.o: ../../include/openssl/rijndael-alg-fst.h
+x509_req.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_req.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -338,7 +358,9 @@ x509_set.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_set.o: ../../include/openssl/opensslconf.h
 x509_set.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_set.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_set.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_set.o: ../../include/openssl/rc5.h
+x509_set.o: ../../include/openssl/rijndael-alg-fst.h
+x509_set.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_set.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_set.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_set.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -358,7 +380,9 @@ x509_trs.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_trs.o: ../../include/openssl/opensslconf.h
 x509_trs.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_trs.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_trs.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_trs.o: ../../include/openssl/rc5.h
+x509_trs.o: ../../include/openssl/rijndael-alg-fst.h
+x509_trs.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_trs.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_trs.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_trs.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -378,7 +402,9 @@ x509_txt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_txt.o: ../../include/openssl/opensslconf.h
 x509_txt.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_txt.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_txt.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_txt.o: ../../include/openssl/rc5.h
+x509_txt.o: ../../include/openssl/rijndael-alg-fst.h
+x509_txt.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_txt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_txt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_txt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -398,11 +424,13 @@ x509_v3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_v3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 x509_v3.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 x509_v3.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x509_v3.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x509_v3.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x509_v3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-x509_v3.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-x509_v3.o: ../../include/openssl/x509v3.h ../cryptlib.h
+x509_v3.o: ../../include/openssl/rijndael-alg-fst.h
+x509_v3.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+x509_v3.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x509_v3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x509_v3.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+x509_v3.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+x509_v3.o: ../cryptlib.h
 x509_vfy.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 x509_vfy.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 x509_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -418,7 +446,9 @@ x509_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509_vfy.o: ../../include/openssl/opensslconf.h
 x509_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509_vfy.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_vfy.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509_vfy.o: ../../include/openssl/rc5.h
+x509_vfy.o: ../../include/openssl/rijndael-alg-fst.h
+x509_vfy.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509_vfy.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -438,7 +468,9 @@ x509name.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509name.o: ../../include/openssl/opensslconf.h
 x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509name.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509name.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509name.o: ../../include/openssl/rc5.h
+x509name.o: ../../include/openssl/rijndael-alg-fst.h
+x509name.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509name.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509name.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -457,7 +489,9 @@ x509rset.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509rset.o: ../../include/openssl/opensslconf.h
 x509rset.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509rset.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509rset.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509rset.o: ../../include/openssl/rc5.h
+x509rset.o: ../../include/openssl/rijndael-alg-fst.h
+x509rset.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509rset.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509rset.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509rset.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -476,7 +510,9 @@ x509spki.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 x509spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 x509spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509spki.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509spki.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509spki.o: ../../include/openssl/rc5.h
+x509spki.o: ../../include/openssl/rijndael-alg-fst.h
+x509spki.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509spki.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -495,7 +531,9 @@ x509type.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x509type.o: ../../include/openssl/opensslconf.h
 x509type.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 x509type.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509type.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x509type.o: ../../include/openssl/rc5.h
+x509type.o: ../../include/openssl/rijndael-alg-fst.h
+x509type.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 x509type.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 x509type.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 x509type.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -514,8 +552,9 @@ x_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 x_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 x_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 x_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-x_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-x_all.o: ../cryptlib.h
+x_all.o: ../../include/openssl/rijndael-alg-fst.h
+x_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+x_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+x_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h

diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl
index 8ed366504940aa14e6e9b8091241c6f386ebfb41..16b6605c8cd311a2adf64e4d6e7d862566f622a3 100644 (file)
--- a/crypto/x509v3/Makefile.ssl
+++ b/crypto/x509v3/Makefile.ssl
@@ -98,7 +98,8 @@ v3_akey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3_akey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_akey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_akey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_akey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_akey.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+v3_akey.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_akey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_akey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_akey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -119,11 +120,13 @@ v3_alt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_alt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_alt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_alt.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_alt.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_alt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_alt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_alt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_alt.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_alt.o: ../../include/openssl/rijndael-alg-fst.h
+v3_alt.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_alt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_alt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_alt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_alt.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_alt.o: ../cryptlib.h
 v3_bcons.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 v3_bcons.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 v3_bcons.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -139,7 +142,9 @@ v3_bcons.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3_bcons.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_bcons.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_bcons.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_bcons.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_bcons.o: ../../include/openssl/rc5.h
+v3_bcons.o: ../../include/openssl/rijndael-alg-fst.h
+v3_bcons.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_bcons.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_bcons.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_bcons.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -160,7 +165,9 @@ v3_bitst.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_bitst.o: ../../include/openssl/opensslconf.h
 v3_bitst.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_bitst.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_bitst.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_bitst.o: ../../include/openssl/rc5.h
+v3_bitst.o: ../../include/openssl/rijndael-alg-fst.h
+v3_bitst.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_bitst.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_bitst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_bitst.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -181,11 +188,13 @@ v3_conf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_conf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_conf.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_conf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_conf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_conf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_conf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_conf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_conf.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_conf.o: ../../include/openssl/rijndael-alg-fst.h
+v3_conf.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_conf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_conf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_conf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_conf.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_conf.o: ../cryptlib.h
 v3_cpols.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 v3_cpols.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 v3_cpols.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -201,7 +210,9 @@ v3_cpols.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3_cpols.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_cpols.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_cpols.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_cpols.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_cpols.o: ../../include/openssl/rc5.h
+v3_cpols.o: ../../include/openssl/rijndael-alg-fst.h
+v3_cpols.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_cpols.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_cpols.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_cpols.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -222,7 +233,8 @@ v3_crld.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3_crld.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_crld.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_crld.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_crld.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_crld.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+v3_crld.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_crld.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_crld.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_crld.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -243,11 +255,13 @@ v3_enum.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_enum.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_enum.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_enum.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_enum.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_enum.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_enum.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_enum.o: ../../include/openssl/rijndael-alg-fst.h
+v3_enum.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_enum.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_enum.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_enum.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_enum.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_enum.o: ../cryptlib.h
 v3_extku.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_extku.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_extku.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -263,7 +277,9 @@ v3_extku.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_extku.o: ../../include/openssl/opensslconf.h
 v3_extku.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_extku.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_extku.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_extku.o: ../../include/openssl/rc5.h
+v3_extku.o: ../../include/openssl/rijndael-alg-fst.h
+v3_extku.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_extku.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_extku.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_extku.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -284,7 +300,8 @@ v3_genn.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3_genn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_genn.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_genn.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_genn.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_genn.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+v3_genn.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_genn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_genn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_genn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -305,11 +322,13 @@ v3_ia5.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_ia5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_ia5.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_ia5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_ia5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_ia5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_ia5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_ia5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_ia5.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_ia5.o: ../../include/openssl/rijndael-alg-fst.h
+v3_ia5.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_ia5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_ia5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_ia5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_ia5.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_ia5.o: ../cryptlib.h
 v3_info.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 v3_info.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 v3_info.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -325,7 +344,8 @@ v3_info.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_info.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_info.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_info.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_info.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+v3_info.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_info.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_info.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -346,11 +366,13 @@ v3_int.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_int.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_int.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_int.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_int.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_int.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_int.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_int.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_int.o: ../../include/openssl/rijndael-alg-fst.h
+v3_int.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_int.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_int.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_int.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_int.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_int.o: ../cryptlib.h
 v3_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -366,11 +388,13 @@ v3_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ext_dat.h
+v3_lib.o: ../../include/openssl/rijndael-alg-fst.h
+v3_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_lib.o: ../cryptlib.h ext_dat.h
 v3_pku.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 v3_pku.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 v3_pku.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -386,7 +410,8 @@ v3_pku.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3_pku.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_pku.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_pku.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_pku.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_pku.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+v3_pku.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_pku.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_pku.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_pku.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -407,11 +432,13 @@ v3_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_prn.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_prn.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_prn.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_prn.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_prn.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_prn.o: ../../include/openssl/rijndael-alg-fst.h
+v3_prn.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_prn.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_prn.o: ../cryptlib.h
 v3_purp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_purp.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_purp.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -427,11 +454,13 @@ v3_purp.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_purp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_purp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_purp.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_purp.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_purp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_purp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_purp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_purp.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_purp.o: ../../include/openssl/rijndael-alg-fst.h
+v3_purp.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_purp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_purp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_purp.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_purp.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_purp.o: ../cryptlib.h
 v3_skey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_skey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -447,11 +476,13 @@ v3_skey.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_skey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_skey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_skey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_skey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_skey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_skey.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_skey.o: ../../include/openssl/rijndael-alg-fst.h
+v3_skey.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_skey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_skey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_skey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_skey.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_skey.o: ../cryptlib.h
 v3_sxnet.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 v3_sxnet.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 v3_sxnet.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -467,7 +498,9 @@ v3_sxnet.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3_sxnet.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_sxnet.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_sxnet.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3_sxnet.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3_sxnet.o: ../../include/openssl/rc5.h
+v3_sxnet.o: ../../include/openssl/rijndael-alg-fst.h
+v3_sxnet.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3_sxnet.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3_sxnet.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3_sxnet.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
@@ -488,11 +521,13 @@ v3_utl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 v3_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
 v3_utl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3_utl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3_utl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3_utl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-v3_utl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-v3_utl.o: ../../include/openssl/x509v3.h ../cryptlib.h
+v3_utl.o: ../../include/openssl/rijndael-alg-fst.h
+v3_utl.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+v3_utl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3_utl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+v3_utl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3_utl.o: ../cryptlib.h
 v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -507,7 +542,8 @@ v3err.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 v3err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-v3err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3err.o: ../../include/openssl/rc5.h ../../include/openssl/rijndael-alg-fst.h
+v3err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 v3err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 v3err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 v3err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl
index 61b9cee090b63490c5d46ae3a6362c9db95c39a2..37f1ef0a0827af98799ff512da09e2532eae4db7 100644 (file)
--- a/ssl/Makefile.ssl
+++ b/ssl/Makefile.ssl
@@ -110,6 +110,7 @@ bio_ssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 bio_ssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 bio_ssl.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 bio_ssl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+bio_ssl.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 bio_ssl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 bio_ssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 bio_ssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -133,6 +134,7 @@ s23_clnt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s23_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_clnt.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 s23_clnt.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s23_clnt.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 s23_clnt.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 s23_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s23_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -155,7 +157,8 @@ s23_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s23_lib.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s23_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_lib.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s23_lib.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s23_lib.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s23_lib.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s23_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s23_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s23_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -177,7 +180,8 @@ s23_meth.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s23_meth.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s23_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_meth.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s23_meth.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s23_meth.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s23_meth.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s23_meth.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s23_meth.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s23_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -199,7 +203,8 @@ s23_pkt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s23_pkt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s23_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_pkt.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s23_pkt.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s23_pkt.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s23_pkt.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s23_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s23_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s23_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -222,6 +227,7 @@ s23_srvr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s23_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_srvr.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 s23_srvr.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s23_srvr.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 s23_srvr.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 s23_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s23_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -245,6 +251,7 @@ s2_clnt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s2_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_clnt.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 s2_clnt.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s2_clnt.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 s2_clnt.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 s2_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s2_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -267,7 +274,8 @@ s2_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s2_enc.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s2_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_enc.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s2_enc.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s2_enc.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s2_enc.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s2_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s2_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s2_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -289,7 +297,8 @@ s2_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s2_lib.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s2_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_lib.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s2_lib.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s2_lib.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s2_lib.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s2_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s2_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s2_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -311,7 +320,8 @@ s2_meth.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s2_meth.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s2_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_meth.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s2_meth.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s2_meth.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s2_meth.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s2_meth.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s2_meth.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s2_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -333,7 +343,8 @@ s2_pkt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s2_pkt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s2_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_pkt.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s2_pkt.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s2_pkt.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s2_pkt.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s2_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s2_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s2_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -356,6 +367,7 @@ s2_srvr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s2_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_srvr.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 s2_srvr.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s2_srvr.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 s2_srvr.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 s2_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s2_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -379,6 +391,7 @@ s3_both.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s3_both.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_both.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 s3_both.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s3_both.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 s3_both.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 s3_both.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s3_both.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -402,6 +415,7 @@ s3_clnt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s3_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_clnt.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 s3_clnt.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s3_clnt.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 s3_clnt.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 s3_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s3_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -424,7 +438,8 @@ s3_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s3_enc.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s3_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_enc.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s3_enc.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s3_enc.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s3_enc.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s3_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s3_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s3_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -446,7 +461,8 @@ s3_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s3_lib.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s3_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_lib.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s3_lib.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s3_lib.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s3_lib.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s3_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s3_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s3_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -468,7 +484,8 @@ s3_meth.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s3_meth.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s3_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_meth.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s3_meth.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s3_meth.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s3_meth.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s3_meth.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s3_meth.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s3_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -490,7 +507,8 @@ s3_pkt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 s3_pkt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s3_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_pkt.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s3_pkt.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s3_pkt.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+s3_pkt.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 s3_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 s3_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 s3_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -513,6 +531,7 @@ s3_srvr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 s3_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_srvr.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 s3_srvr.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s3_srvr.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 s3_srvr.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 s3_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 s3_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -535,7 +554,8 @@ ssl_algs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 ssl_algs.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ssl_algs.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_algs.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssl_algs.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ssl_algs.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+ssl_algs.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 ssl_algs.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ssl_algs.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 ssl_algs.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -558,6 +578,7 @@ ssl_asn1.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 ssl_asn1.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_asn1.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_asn1.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssl_asn1.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 ssl_asn1.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 ssl_asn1.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 ssl_asn1.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -582,6 +603,7 @@ ssl_cert.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 ssl_cert.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_cert.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_cert.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssl_cert.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 ssl_cert.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 ssl_cert.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 ssl_cert.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -605,7 +627,8 @@ ssl_ciph.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 ssl_ciph.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ssl_ciph.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_ciph.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssl_ciph.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ssl_ciph.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+ssl_ciph.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 ssl_ciph.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ssl_ciph.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 ssl_ciph.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -627,6 +650,7 @@ ssl_err.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 ssl_err.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_err.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_err.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssl_err.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 ssl_err.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 ssl_err.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 ssl_err.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -649,6 +673,7 @@ ssl_err2.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 ssl_err2.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_err2.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 ssl_err2.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssl_err2.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 ssl_err2.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 ssl_err2.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 ssl_err2.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -672,7 +697,8 @@ ssl_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 ssl_lib.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ssl_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_lib.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssl_lib.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ssl_lib.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+ssl_lib.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 ssl_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ssl_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 ssl_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -695,7 +721,8 @@ ssl_rsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 ssl_rsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ssl_rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_rsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssl_rsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ssl_rsa.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+ssl_rsa.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 ssl_rsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ssl_rsa.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 ssl_rsa.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -718,6 +745,7 @@ ssl_sess.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ssl_sess.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_sess.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 ssl_sess.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssl_sess.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 ssl_sess.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 ssl_sess.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 ssl_sess.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -740,7 +768,8 @@ ssl_stat.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 ssl_stat.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ssl_stat.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_stat.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssl_stat.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ssl_stat.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+ssl_stat.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 ssl_stat.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ssl_stat.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 ssl_stat.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -762,7 +791,8 @@ ssl_txt.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 ssl_txt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ssl_txt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_txt.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssl_txt.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ssl_txt.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+ssl_txt.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 ssl_txt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ssl_txt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 ssl_txt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -785,6 +815,7 @@ t1_clnt.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 t1_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_clnt.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 t1_clnt.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+t1_clnt.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 t1_clnt.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 t1_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 t1_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -808,6 +839,7 @@ t1_enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 t1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 t1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
 t1_enc.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+t1_enc.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 t1_enc.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 t1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 t1_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
@@ -830,7 +862,8 @@ t1_lib.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 t1_lib.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 t1_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_lib.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-t1_lib.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+t1_lib.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+t1_lib.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 t1_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 t1_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 t1_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -852,7 +885,8 @@ t1_meth.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 t1_meth.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 t1_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_meth.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-t1_meth.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+t1_meth.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+t1_meth.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 t1_meth.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 t1_meth.o: ../include/openssl/sha.h ../include/openssl/ssl.h
 t1_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
@@ -875,6 +909,7 @@ t1_srvr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 t1_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_srvr.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 t1_srvr.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+t1_srvr.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 t1_srvr.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 t1_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 t1_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 480e4bc807cfe46a70f47ac21a4d1ed7db291e5e..39c6cfb6f51a3f1d5a4113bb13317030ff78ecd5 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -106,7 +106,7 @@ tests:      exe apps \
        test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast \
        test_rand test_bn test_enc test_x509 test_rsa test_crl test_sid \
        test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
-       test_ss test_ca test_ssl
+       test_ss test_ca test_ssl test_rd
 
 apps:
        @(cd ../apps; $(MAKE)  CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' all)
@@ -229,6 +229,10 @@ test_ca:
          sh ./testca; \
        fi
 
+test_rd: #$(RDTEST)
+       @echo "test Rijndael"
+       #./$(RDTEST)
+
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
@@ -317,6 +321,12 @@ $(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
 $(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
        $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)
 
+#$(RDTEST).o: $(RDTEST).c
+#      $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(RDTEST).c
+
+#$(RDTEST): $(RDTEST).o $(DLIBCRYPTO)
+#      $(CC) -o $(RDTEST) $(CFLAGS) $(RDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 bftest.o: ../include/openssl/blowfish.h
@@ -334,7 +344,8 @@ bntest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 bntest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 bntest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 bntest.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-bntest.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+bntest.o: ../include/openssl/rc5.h ../include/openssl/rijndael-alg-fst.h
+bntest.o: ../include/openssl/rijndael.h ../include/openssl/ripemd.h
 bntest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 bntest.o: ../include/openssl/sha.h ../include/openssl/stack.h
 bntest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
@@ -372,6 +383,7 @@ hmactest.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
 hmactest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 hmactest.o: ../include/openssl/opensslv.h ../include/openssl/rc2.h
 hmactest.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+hmactest.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 hmactest.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 hmactest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 hmactest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -411,6 +423,7 @@ ssltest.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssltest.o: ../include/openssl/rand.h ../include/openssl/rc2.h
 ssltest.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssltest.o: ../include/openssl/rijndael-alg-fst.h ../include/openssl/rijndael.h
 ssltest.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
 ssltest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 ssltest.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h

diff --git a/util/libeay.num b/util/libeay.num
index 2cc731dadff069c75ffe817bbcccd81215e23100..281dd2b61825830e79315b57872a7207d7d50a2a 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1872,3 +1872,4 @@ DSO_METHOD_vms                          2462      EXIST::FUNCTION:
 BIO_f_linebuffer                        2463   EXIST:VMS:FUNCTION:
 X509_print_ex                           2464   EXIST::FUNCTION:
 X509_print_ex_fp                        2465   EXIST::FUNCTION:FP_API
+EVP_rijndael_ecb                        2466   EXIST::FUNCTION: