Changeset 110
- Timestamp:
- 06/15/09 13:17:14 (14 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r109 r110 83 83 #----------------------- subdirectories ------------------------------ 84 84 85 include (CheckIncludeFile) 86 check_include_file ("openssl/aes.h" HAVE_AES) 87 if (HAVE_AES) 88 set (HAVE_AES 1) 89 add_definitions ("-DHAVE_AES") 90 else (HAVE_AES) 91 set (HAVE_AES 0) 92 endif (HAVE_AES) 93 94 #----------------------- subdirectories ------------------------------ 95 85 96 add_subdirectory (csctapi) 86 97 add_subdirectory (cscrypt) … … 117 128 set (exe_name "oscam") 118 129 add_executable (${exe_name} ${exe_srcs} ${exe_hdrs}) 119 target_link_libraries (${exe_name} crypto pthread ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt) 130 if (HAVE_AES) 131 target_link_libraries (${exe_name} crypto) 132 endif (HAVE_AES) 133 target_link_libraries (${exe_name} pthread ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt) 120 134 add_dependencies (${exe_name} ${csoscam} ${csreaders} ${csmodules}) 121 135 … … 149 163 message (STATUS " cpu: ${CS_OS_CPU}") 150 164 message (STATUS " hw: ${CS_OS_HW}") 165 if (HAVE_AES) 166 message (STATUS " use system aes functions") 167 else (HAVE_AES) 168 message (STATUS " use built-in aes functions") 169 endif (HAVE_AES) 151 170 message (STATUS "") -
trunk/cscrypt/CMakeLists.txt
r102 r110 4 4 file (GLOB cscrypt_hdrs "*.h") 5 5 6 if (NOT HAVE_AES) 7 file (GLOB aes_srcs "aes/*.c") 8 file (GLOB aes_hdrs "aes/*.h") 9 endif (NOT HAVE_AES) 10 6 11 set (lib_name "cscrypt") 7 12 8 add_library (${lib_name} STATIC ${cscrypt_srcs} ${ cscrypt_hdrs})13 add_library (${lib_name} STATIC ${cscrypt_srcs} ${aes_srcs} ${cscrypt_hdrs} ${aes_hdrs}) 9 14 -
trunk/cscrypt/cscrypt.h
r10 r110 1 #ifdef HAVE_AES 1 2 #include <openssl/aes.h> 3 #else 4 #include "aes/aes.h" 5 #endif 6 2 7 #include "des.h" 3 8 #include "bn.h"
Note:
See TracChangeset
for help on using the changeset viewer.