First commit after alpha 3. Moved AES code into /src/aes/

git-svn-id: https://openitg.svn.sourceforge.net/svnroot/openitg@134 83fadc84-e282-4d84-a09a-c4228d6ae7e5

diff --git a/src/Makefile.am b/src/Makefile.am
index 9d02507..6565c30 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -357,8 +357,10 @@ ibutton/owsesu.c ibutton/owtrnu.c ibutton/owfile.h ibutton/crcutil.c \
 ibutton/ds2480ut.c ibutton/ds2480.h ibutton/linuxlnk.c ibutton/sha18.c \
 ibutton/shaib.c ibutton/shaib.h ibutton/getkey.cpp ibutton/getkey.h
 
+aes = \
+aes/aescrypt.c aes/aeskey.c aes/aestab.c aes/aesopt.h aes/aes.h
+
 crypto = \
-crypto/aescrypt.c crypto/aeskey.c crypto/aestab.c crypto/aesopt.h crypto/aes.h \
 crypto/CryptBn.cpp crypto/CryptBn.h crypto/CryptMD5.cpp crypto/CryptMD5.h crypto/CryptNoise.cpp \
 crypto/CryptPrime.cpp crypto/CryptPrime.h crypto/CryptRSA.cpp crypto/CryptRSA.h \
 crypto/CryptRand.cpp crypto/CryptRand.h crypto/CryptSH512.cpp crypto/CryptSH512.h \
@@ -389,6 +391,7 @@ main_SOURCES = $(Screens) \
                $(Actors) \
                $(GlobalSingletons) \
                $(ibutton) \
+               $(aes) \
                $(crypto) \
                $(cryptopp)
 

diff --git a/src/StepMania-net2003.vcproj b/src/StepMania-net2003.vcproj
index bfce1c3..434abde 100755 (executable)
--- a/src/StepMania-net2003.vcproj
+++ b/src/StepMania-net2003.vcproj
@@ -2669,19 +2669,19 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
                        Name="Crypto"\r
                        Filter="">\r
                        <File\r
-                               RelativePath="crypto\aes.h">\r
+                               RelativePath="aes\aes.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="crypto\aescrypt.c">\r
+                               RelativePath="aes\aescrypt.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="crypto\aeskey.c">\r
+                               RelativePath="aes\aeskey.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="crypto\aesopt.h">\r
+                               RelativePath="aes\aesopt.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="crypto\aestab.c">\r
+                               RelativePath="aes\aestab.c">\r
                        </File>\r
                        <File\r
                                RelativePath="crypto\CryptBn.cpp">\r

diff --git a/src/crypto/aes.h b/src/aes/aes.h
similarity index 100%
rename from src/crypto/aes.h
rename to src/aes/aes.h

diff --git a/src/crypto/aescpp.h b/src/aes/aescpp.h
similarity index 100%
rename from src/crypto/aescpp.h
rename to src/aes/aescpp.h

diff --git a/src/crypto/aescrypt.asm b/src/aes/aescrypt.asm
similarity index 100%
rename from src/crypto/aescrypt.asm
rename to src/aes/aescrypt.asm

diff --git a/src/crypto/aescrypt.c b/src/aes/aescrypt.c
similarity index 100%
rename from src/crypto/aescrypt.c
rename to src/aes/aescrypt.c

diff --git a/src/crypto/aescrypt.mmx.asm b/src/aes/aescrypt.mmx.asm
similarity index 100%
rename from src/crypto/aescrypt.mmx.asm
rename to src/aes/aescrypt.mmx.asm

diff --git a/src/crypto/aeskey.c b/src/aes/aeskey.c
similarity index 100%
rename from src/crypto/aeskey.c
rename to src/aes/aeskey.c

diff --git a/src/crypto/aesopt.h b/src/aes/aesopt.h
similarity index 100%
rename from src/crypto/aesopt.h
rename to src/aes/aesopt.h

diff --git a/src/crypto/aestab.c b/src/aes/aestab.c
similarity index 100%
rename from src/crypto/aestab.c
rename to src/aes/aestab.c

diff --git a/src/crypto/aestab.h b/src/aes/aestab.h
similarity index 100%
rename from src/crypto/aestab.h
rename to src/aes/aestab.h

diff --git a/src/crypto/brg_types.h b/src/aes/brg_types.h
similarity index 100%
rename from src/crypto/brg_types.h
rename to src/aes/brg_types.h