Changeset 714 for branches/smartreader
- Timestamp:
- 12/06/09 01:52:44 (14 years ago)
- Location:
- branches/smartreader
- Files:
-
- 3 added
- 2 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/smartreader/CMakeLists.txt
r693 r714 131 131 endif (HAVE_AES) 132 132 133 check_include_file ("openssl/sha.h" HAVE_SHA) 134 if (HAVE_SHA) 135 add_definitions ("-DHAVE_SHA") 136 endif (HAVE_SHA) 137 133 138 #----------------------- subdirectories ------------------------------ 134 139 … … 285 290 message (STATUS " use built-in aes functions") 286 291 endif (HAVE_AES) 292 if (HAVE_SHA) 293 message (STATUS " use system sha functions") 294 else (HAVE_SHA) 295 message (STATUS " use built-in sha functions") 296 endif (HAVE_SHA) 287 297 message (STATUS "") -
branches/smartreader/cscrypt/CMakeLists.txt
r122 r714 9 9 endif (NOT HAVE_AES) 10 10 11 if (NOT HAVE_SHA) 12 file (GLOB sha_srcs "sha/*.c") 13 file (GLOB sha_hdrs "sha/*.h") 14 endif (NOT HAVE_SHA) 15 11 16 add_definitions ("-O3 -Winline -Werror -finline-functions -fomit-frame-pointer -s") 12 17 13 18 set (lib_name "cscrypt") 14 19 15 add_library (${lib_name} STATIC ${cscrypt_srcs} ${aes_srcs} ${ cscrypt_hdrs} ${aes_hdrs})20 add_library (${lib_name} STATIC ${cscrypt_srcs} ${aes_srcs} ${sha_srcs} ${cscrypt_hdrs} ${aes_hdrs} ${sha_hdrs}) 16 21 -
branches/smartreader/cscrypt/cscrypt.h
r660 r714 5 5 #endif 6 6 7 #ifdef HAVE_SHA 8 # include <openssl/sha.h> 9 #else 10 # include "sha/sha1.h" 11 #endif 12 7 13 #include "des.h" 8 14 #include "bn.h" 9 #include "sha1.h"10 15 11 16 #ifndef HEADER_CSCRYPT_H -
branches/smartreader/globals.h
r684 r714 35 35 #else 36 36 # define GCC_PACK 37 #endif 38 39 #ifdef WIN32 40 # define MSG_WAITALL 0 37 41 #endif 38 42 -
branches/smartreader/module-cccam.c
r707 r714 493 493 bzero(buf, CC_MAXMSGSIZE); 494 494 495 memcpy(buf, reader[ridx].r_usr, s trlen(reader[ridx].r_usr));495 memcpy(buf, reader[ridx].r_usr, sizeof(reader[ridx].r_usr)); 496 496 memcpy(buf + 20, cc->node_id, 8 ); 497 memcpy(buf + 29, reader[ridx].cc_version, s trlen(reader[ridx].cc_version)); // cccam version (ascii)498 memcpy(buf + 61, reader[ridx].cc_build, s trlen(reader[ridx].cc_build)); // build number (ascii)499 497 memcpy(buf + 29, reader[ridx].cc_version, sizeof(reader[ridx].cc_version)); // cccam version (ascii) 498 memcpy(buf + 61, reader[ridx].cc_build, sizeof(reader[ridx].cc_build)); // build number (ascii) 499 cs_log ("User: %s, version: %s, build: %s", reader[ridx].r_usr, reader[ridx].cc_version, reader[ridx].cc_build); 500 500 return cc_cmd_send(buf, 20 + 8 + 6 + 26 + 4 + 28 + 1, MSG_CLI_DATA); 501 501 } … … 745 745 int handle; 746 746 uint8 data[20]; 747 uint8 hash[SHA 1_DIGEST_SIZE];747 uint8 hash[SHA_DIGEST_LENGTH]; 748 748 uint8 buf[CC_MAXMSGSIZE]; 749 749 struct cc_data *cc; … … 765 765 766 766 // get init seed 767 if(re ad(handle, data, 16) != 16) {767 if(recv(handle, data, 16, MSG_WAITALL) != 16) { 768 768 cs_log("cccam: server does not return 16 bytes"); 769 769 network_tcp_connection_close(handle); … … 774 774 cc_xor(data); // XOR init bytes with 'CCcam' 775 775 776 SHA 1_CTX ctx;776 SHA_CTX ctx; 777 777 SHA1_Init(&ctx); 778 778 SHA1_Update(&ctx, data, 16); 779 SHA1_Final( &ctx, hash);779 SHA1_Final(hash, &ctx); 780 780 781 781 cs_ddump(hash, sizeof(hash), "cccam: sha1 hash:"); … … 802 802 cc_cmd_send(buf, 6, MSG_NO_HEADER); // send 'CCcam' xor w/ pwd 803 803 804 if (re ad(handle, data, 20) != 20) {804 if (recv(handle, data, 20, MSG_WAITALL) != 20) { 805 805 cs_log("cccam: login failed, pwd ack not received"); 806 806 return -2;
Note:
See TracChangeset
for help on using the changeset viewer.