Changeset 4738
- Timestamp:
- 02/20/11 14:35:05 (13 years ago)
- Location:
- trunk
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r4735 r4738 272 272 endif (HAVE_PTHREAD) 273 273 274 check_include_file ("openssl/aes.h" HAVE_AES) 275 if (HAVE_AES) 276 add_definitions ("-DHAVE_AES") 277 endif (HAVE_AES) 278 279 check_include_file ("openssl/sha.h" HAVE_SHA) 280 if (HAVE_SHA) 281 add_definitions ("-DHAVE_SHA") 282 endif (HAVE_SHA) 274 check_include_file ("openssl/aes.h" HAVE_LIBCRYPTO) 275 if (HAVE_LIBCRYPTO) 276 add_definitions ("-DWITH_LIBCRYPTO") 277 endif (HAVE_LIBCRYPTO) 283 278 284 279 find_package(OpenSSL QUIET) … … 457 452 endif (WITH_SSL) 458 453 459 if (HAVE_ AES)454 if (HAVE_LIBCRYPTO) 460 455 target_link_libraries (${exe_name} crypto) 461 endif (HAVE_ AES)456 endif (HAVE_LIBCRYPTO) 462 457 463 458 if (HAVE_PCSC) … … 654 649 message (STATUS " cpu: ${CS_OS_CPU}") 655 650 message (STATUS " hw: ${CS_OS_HW}") 656 if (HAVE_AES) 657 message (STATUS " use system aes functions") 658 else (HAVE_AES) 659 message (STATUS " use built-in aes functions") 660 endif (HAVE_AES) 661 if (HAVE_SHA) 662 message (STATUS " use system sha functions") 663 else (HAVE_SHA) 664 message (STATUS " use built-in sha functions") 665 endif (HAVE_SHA) 651 if (HAVE_LIBCRYPTO) 652 message (STATUS " use libcrypto functions") 653 else (HAVE_LIBCRYPTO) 654 message (STATUS " use built-in crypt functions") 655 endif (HAVE_LIBCRYPTO) 666 656 if (HAVE_PCSC) 667 657 message (STATUS " use system pcsc functions") -
trunk/Makefile
r4735 r4738 67 67 OS_LIBS="-lcrypto -lm" \ 68 68 OS_CULI="-lncurses" \ 69 DS_OPTS="-O2 -DOS_LINUX -DCS_CONFDIR=${CS_CONFDIR} - pthread -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \69 DS_OPTS="-O2 -DOS_LINUX -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -pthread -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 70 70 DS_CFLAGS="-c" \ 71 71 DS_LDFLAGS="" \ … … 82 82 OS_LIBS="-lcrypto -lm -lrt" \ 83 83 OS_CULI="-lncurses" \ 84 DS_OPTS="-O0 -DHAVE_DVBAPI -ggdb -pthread -DOS_LINUX -DCS_CONFDIR=${CS_CONFDIR} - Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \84 DS_OPTS="-O0 -DHAVE_DVBAPI -ggdb -pthread -DOS_LINUX -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 85 85 DS_CFLAGS="-c" \ 86 86 DS_LDFLAGS="" \ … … 101 101 OS_LIBS="-lcrypto -lm -lrt" \ 102 102 OS_CULI="-lncurses" \ 103 DS_OPTS="-O2 -DOS_LINUX -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} - pthread -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \103 DS_OPTS="-O2 -DOS_LINUX -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -pthread -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \ 104 104 DS_CFLAGS="-c" \ 105 105 DS_LDFLAGS="" \ … … 122 122 OS_CULI="-lncurses" \ 123 123 OS_PTLI="-lpcsclite" \ 124 DS_OPTS="-O2 -DOS_LINUX -DCS_CONFDIR=${CS_CONFDIR} - pthread -DHAVE_PCSC=1 -I/usr/include/PCSC -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \124 DS_OPTS="-O2 -DOS_LINUX -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -pthread -DHAVE_PCSC=1 -I/usr/include/PCSC -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 125 125 DS_CFLAGS="-c" \ 126 126 DS_LDFLAGS="" \ … … 144 144 OS_CULI="-lncurses" \ 145 145 OS_PTLI="-lpcsclite" \ 146 DS_OPTS="-O2 -DOS_LINUX -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} - pthread -DHAVE_PCSC=1 -I/usr/include/PCSC -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \146 DS_OPTS="-O2 -DOS_LINUX -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -pthread -DHAVE_PCSC=1 -I/usr/include/PCSC -Winline -Wall -Wextra -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \ 147 147 DS_CFLAGS="-c" \ 148 148 DS_LDFLAGS="" \ … … 165 165 OS_CULI="-lncurses" \ 166 166 OS_PTLI="-lpthread" \ 167 DS_OPTS="-O2 -DOS_MACOSX -DNEED_DAEMON -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR} -D HAVE_PCSC=1 -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \167 DS_OPTS="-O2 -DOS_MACOSX -DNEED_DAEMON -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 168 168 DS_CFLAGS="-c" \ 169 169 DS_LDFLAGS="-framework PCSC -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk" \ … … 187 187 OS_CULI="-lncurses" \ 188 188 OS_PTLI="-lpthread" \ 189 DS_OPTS="-O2 -DOS_MACOSX -DNEED_DAEMON -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR}-DHAVE_PCSC=1 -DLIBUSB -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \189 DS_OPTS="-O2 -DOS_MACOSX -DNEED_DAEMON -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR} -DWITH_LIBCRYPTO -DHAVE_PCSC=1 -DLIBUSB -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \ 190 190 DS_CFLAGS="-c" \ 191 191 DS_LDFLAGS="-framework PCSC -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation -Wl,-prebind -no-undefined" \ … … 251 251 OS_CULI="-lncurses" \ 252 252 OS_PTLI="-lpthread" \ 253 DS_OPTS="-O2 -DOS_LINUX -DTUXBOX -DPPC -D CS_CONFDIR='\"/var/tuxbox/config\"' -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \253 DS_OPTS="-O2 -DOS_LINUX -DTUXBOX -DPPC -DWITH_LIBCRYPTO -DCS_CONFDIR='\"/var/tuxbox/config\"' -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 254 254 DS_CFLAGS="-c" \ 255 255 DS_LDFLAGS="" \ … … 288 288 OS_CULI="-lncurses" \ 289 289 OS_PTLI="-lpthread" \ 290 DS_OPTS="-O2 -DOS_LINUX -DTRIPLEDRAGON -D CS_LOGHISTORY -DCS_ANTICASC-DSTB04SCI -DCS_CONFDIR='\"/var/tuxbox/config\"' -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \290 DS_OPTS="-O2 -DOS_LINUX -DTRIPLEDRAGON -DWITH_LIBCRYPTO -DSTB04SCI -DCS_CONFDIR='\"/var/tuxbox/config\"' -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 291 291 DS_CFLAGS="-c" \ 292 292 DS_LDFLAGS="" \ … … 309 309 OS_CULI="-lncurses" \ 310 310 OS_PTLI="-lpthread" \ 311 DS_OPTS="-O2 -DOS_LINUX -DSH4 -DTUXBOX -D CS_CONFDIR='\"/var/tuxbox/config\"' -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \311 DS_OPTS="-O2 -DOS_LINUX -DSH4 -DTUXBOX -DWITH_LIBCRYPTO -DCS_CONFDIR='\"/var/tuxbox/config\"' -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 312 312 DS_CFLAGS="-c" \ 313 313 DS_LDFLAGS="" \ … … 325 325 OS_CULI="-lncurses" \ 326 326 OS_PTLI="-lpthread" \ 327 DS_OPTS="-O2 -DOS_LINUX -DSH4 -DWITH_STAPI -D TUXBOX -DSCI_DEV -DCS_CONFDIR='\"/var/tuxbox/config\"' -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \327 DS_OPTS="-O2 -DOS_LINUX -DSH4 -DWITH_STAPI -DWITH_LIBCRYPTO -DTUXBOX -DSCI_DEV -DCS_CONFDIR='\"/var/tuxbox/config\"' -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 328 328 DS_CFLAGS="-c" \ 329 329 DS_LDFLAGS="" \ … … 346 346 OS_CULI="-lncurses" \ 347 347 OS_PTLI="-lpthread" \ 348 DS_OPTS="-O2 -DOS_CYGWIN32 -D CS_CONFDIR=${CS_CONFDIR} -static -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \348 DS_OPTS="-O2 -DOS_CYGWIN32 -DWITH_LIBCRYPTO -DCS_CONFDIR=${CS_CONFDIR} -static -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 349 349 DS_CFLAGS="-c" \ 350 350 DS_LDFLAGS="" \ … … 367 367 OS_CULI="-lncurses" \ 368 368 OS_PTLI="-lpthread" \ 369 DS_OPTS="-O2 -DOS_CYGWIN32 -D CS_CONFDIR=${CS_CONFDIR} -I /tmp/include -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \369 DS_OPTS="-O2 -DOS_CYGWIN32 -DWITH_LIBCRYPTO -DCS_CONFDIR=${CS_CONFDIR} -I /tmp/include -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 370 370 DS_CFLAGS="-c" \ 371 371 DS_LDFLAGS="" \ … … 389 389 OS_CULI="-lncurses" \ 390 390 OS_PTLI="-lpthread" \ 391 DS_OPTS="-O2 -DOS_CYGWIN32 -D _WIN32 -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -I /tmp/include -I ./cygwin -I/usr/include/w32api -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \391 DS_OPTS="-O2 -DOS_CYGWIN32 -DWITH_LIBCRYPTO -D_WIN32 -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -I /tmp/include -I ./cygwin -I/usr/include/w32api -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 392 392 DS_CFLAGS="-c" \ 393 393 DS_LDFLAGS="-L/cygdrive/c/WINDOWS/system32/" \ … … 412 412 OS_CULI="-lncurses" \ 413 413 OS_PTLI="-lpthread" \ 414 DS_OPTS="-O2 -DOS_CYGWIN32 -D _WIN32 -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -I /tmp/include -I ./cygwin -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \414 DS_OPTS="-O2 -DOS_CYGWIN32 -DWITH_LIBCRYPTO -D_WIN32 -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -I /tmp/include -I ./cygwin -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 415 415 DS_CFLAGS="-c" \ 416 416 DS_LDFLAGS="" \ … … 455 455 OS_CULI="-lncurses" \ 456 456 OS_PTLI="-lpthread" \ 457 DS_OPTS="-O2 -DOS_SOLARIS -DOS_SOLARIS7 -D BSD_COMP -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \457 DS_OPTS="-O2 -DOS_SOLARIS -DOS_SOLARIS7 -DWITH_LIBCRYPTO -DBSD_COMP -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 458 458 DS_CFLAGS="-c" \ 459 459 DS_LDFLAGS="-lsocket" \ … … 541 541 OS_CULI="-lncurses" \ 542 542 OS_PTLI="-lpthread" \ 543 DS_OPTS="-O2 -DOS_LINUX -DMIPSEL -D UCLIBC -DUSE_GPIO -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \543 DS_OPTS="-O2 -DOS_LINUX -DMIPSEL -DWITH_LIBCRYPTO -DUCLIBC -DUSE_GPIO -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 544 544 DS_CFLAGS="-c" \ 545 545 DS_LDFLAGS="" \ … … 563 563 OS_CULI="-lncurses" \ 564 564 OS_PTLI="-lpthread" \ 565 DS_OPTS="-O2 -DOS_LINUX -DMIPSEL -D UCLIBC -DUSE_GPIO -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \565 DS_OPTS="-O2 -DOS_LINUX -DMIPSEL -DWITH_LIBCRYPTO -DUCLIBC -DUSE_GPIO -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 566 566 DS_CFLAGS="-c" \ 567 567 DS_LDFLAGS="" \ … … 585 585 OS_CULI="-lncurses" \ 586 586 OS_PTLI="-lpthread" \ 587 DS_OPTS="-O2 -DOS_LINUX -DMIPSEL -D UCLIBC -DUSE_GPIO -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \587 DS_OPTS="-O2 -DOS_LINUX -DMIPSEL -DWITH_LIBCRYPTO -DUCLIBC -DUSE_GPIO -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 588 588 DS_CFLAGS="-c" \ 589 589 DS_LDFLAGS="-static" \ … … 606 606 OS_CULI="-lncurses" \ 607 607 OS_PTLI="-lpthread" \ 608 DS_OPTS="-Iopenssl-include -O2 -DOS_LINUX -D MIPSEL -DUCLIBC -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \608 DS_OPTS="-Iopenssl-include -O2 -DOS_LINUX -DWITH_LIBCRYPTO -DMIPSEL -DUCLIBC -DCS_CONFDIR=${CS_CONFDIR} -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 609 609 DS_CFLAGS="-c" \ 610 610 DS_LDFLAGS="" \ … … 627 627 OS_CULI="-lncurses" \ 628 628 OS_PTLI="-lpthread" \ 629 DS_OPTS="-O2 -DOS_LINUX -DTUXBOX -D MIPSEL -DCS_CONFDIR='\"/var/tuxbox/config\"' -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \629 DS_OPTS="-O2 -DOS_LINUX -DTUXBOX -DWITH_LIBCRYPTO -DMIPSEL -DCS_CONFDIR='\"/var/tuxbox/config\"' -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 630 630 DS_CFLAGS="-c" \ 631 631 DS_LDFLAGS="" \ … … 643 643 OS_CULI="-lncurses" \ 644 644 OS_PTLI="-lpthread" \ 645 DS_OPTS="-O2 -DOS_LINUX -DTUXBOX -D MIPSEL -DCS_CONFDIR='\"/var/tuxbox/config\"' -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \645 DS_OPTS="-O2 -DOS_LINUX -DTUXBOX -DWITH_LIBCRYPTO -DMIPSEL -DCS_CONFDIR='\"/var/tuxbox/config\"' -static-libgcc -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \ 646 646 DS_CFLAGS="-c" \ 647 647 DS_LDFLAGS="" \ -
trunk/cscrypt/CMakeLists.txt
r3242 r4738 4 4 file (GLOB cscrypt_hdrs "*.h") 5 5 6 if (NOT HAVE_ AES)6 if (NOT HAVE_LIBCRYPTO) 7 7 file (GLOB aes_srcs "aes/*.c") 8 8 file (GLOB aes_hdrs "aes/*.h") 9 endif (NOT HAVE_AES)10 11 if (NOT HAVE_SHA)12 9 file (GLOB sha_srcs "sha/*.c") 13 10 file (GLOB sha_hdrs "sha/*.h") 14 endif (NOT HAVE_ SHA)11 endif (NOT HAVE_LIBCRYPTO) 15 12 16 13 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -
trunk/cscrypt/bn_add.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_add.c */ -
trunk/cscrypt/bn_asm.c
r3930 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_asm.c */ -
trunk/cscrypt/bn_ctx.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_ctx.c */ -
trunk/cscrypt/bn_div.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_div.c */ -
trunk/cscrypt/bn_exp.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_exp.c */ -
trunk/cscrypt/bn_lib.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_lib.c */ -
trunk/cscrypt/bn_mul.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_mul.c */ -
trunk/cscrypt/bn_print.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_print.c */ -
trunk/cscrypt/bn_shift.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_shift.c */ -
trunk/cscrypt/bn_sqr.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_sqr.c */ -
trunk/cscrypt/bn_word.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/bn/bn_word.c */ -
trunk/cscrypt/cscrypt.h
r3947 r4738 1 1 #include "../oscam-config.h" 2 2 3 #if defined(HAVE_AES) || defined(WITH_SSL) 4 #include <openssl/aes.h> 3 #if defined(WITH_SSL) || defined(WITH_LIBCRYPTO) 4 # include <openssl/aes.h> 5 # include <openssl/sha.h> 6 # include <openssl/bn.h> 5 7 #else 6 #include "aes/aes.h" 7 #endif 8 9 #if defined(HAVE_SHA) || defined(WITH_SSL) 10 # include <openssl/sha.h> 11 #else 8 # include "aes/aes.h" 12 9 # include "sha/sha1.h" 10 # include "bn.h" 13 11 #endif 14 12 15 13 #include "des.h" 16 17 #ifndef WITH_SSL18 # include "bn.h"19 #else20 # include <openssl/bn.h>21 #endif22 14 23 15 #ifndef HEADER_CSCRYPT_H -
trunk/cscrypt/mem.c
r3942 r4738 1 1 #include "../oscam-config.h" 2 #ifndef WITH_ SSL2 #ifndef WITH_LIBCRYPTO 3 3 //FIXME Not checked on threadsafety yet; after checking please remove this line 4 4 /* crypto/mem.c */ -
trunk/oscam-config.h
r4702 r4738 151 151 # define CS_EMBEDDED 152 152 # define NO_FTIME 153 # if !defined(COOL) && !defined( WITH_STAPI)153 # if !defined(COOL) && !defined(SCI_DEV) 154 154 # define SCI_DEV 1 155 155 # endif … … 159 159 #endif 160 160 161 #if defined(WITH_SSL) && !defined(WITH_LIBCRYPTO) 162 # define WITH_LIBCRYPTO 163 #endif 164 161 165 #ifdef UCLIBC 162 166 # define CS_EMBEDDED
Note:
See TracChangeset
for help on using the changeset viewer.