Changeset 110

Timestamp:

06/15/09 13:17:14 (14 years ago)

Author:

smurzch2

Message:

Use our own AES functions if we don't detect them.

Location:

trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• cscrypt/CMakeLists.txt (modified) (1 diff)
• cscrypt/aes (added)
• cscrypt/aes/aes.h (added)
• cscrypt/aes/aes_core.c (added)
• cscrypt/cscrypt.h (modified) (1 diff)

trunk/CMakeLists.txt

@@ -83 +83 @@
 #----------------------- subdirectories ------------------------------
 
+include (CheckIncludeFile)
+check_include_file ("openssl/aes.h" HAVE_AES)
+if (HAVE_AES)
+    set (HAVE_AES 1)
+    add_definitions ("-DHAVE_AES")
+else (HAVE_AES)
+    set (HAVE_AES 0)
+endif (HAVE_AES)
+
+#----------------------- subdirectories ------------------------------
+
 add_subdirectory (csctapi)
 add_subdirectory (cscrypt)
@@ -117 +128 @@
 set (exe_name "oscam")
 add_executable (${exe_name} ${exe_srcs} ${exe_hdrs})
-target_link_libraries (${exe_name} crypto pthread ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt)
+if (HAVE_AES)
+    target_link_libraries (${exe_name} crypto)
+endif (HAVE_AES)
+target_link_libraries (${exe_name} pthread ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt)
 add_dependencies (${exe_name} ${csoscam} ${csreaders} ${csmodules})
 
@@ -149 +163 @@
 message (STATUS "  cpu: ${CS_OS_CPU}")
 message (STATUS "  hw: ${CS_OS_HW}")
+if (HAVE_AES)
+    message (STATUS "  use system aes functions")
+else (HAVE_AES)
+    message (STATUS "  use built-in aes functions")
+endif (HAVE_AES)
 message (STATUS "")

trunk/cscrypt/CMakeLists.txt

@@ -4 +4 @@
 file (GLOB cscrypt_hdrs "*.h")
 
+if (NOT HAVE_AES)
+    file (GLOB aes_srcs "aes/*.c")
+    file (GLOB aes_hdrs "aes/*.h")
+endif (NOT HAVE_AES)
+
 set (lib_name "cscrypt")
 
-add_library (${lib_name} STATIC ${cscrypt_srcs} ${cscrypt_hdrs})
+add_library (${lib_name} STATIC ${cscrypt_srcs} ${aes_srcs} ${cscrypt_hdrs} ${aes_hdrs})
 

trunk/cscrypt/cscrypt.h

@@ +1 @@
+#ifdef HAVE_AES
 #include <openssl/aes.h>
+#else
+#include "aes/aes.h"
+#endif
+
 #include "des.h"
 #include "bn.h"