Changeset 281
- Timestamp:
- 08/26/09 13:55:17 (15 years ago)
- Location:
- branches/merlin
- Files:
-
- 1 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/merlin/CMakeLists.txt
r276 r281 72 72 73 73 # we want to have detection of all the errors 74 add_definitions ("-Wall -Werror -Wno-strict-aliasing ")74 add_definitions ("-Wall -Werror -Wno-strict-aliasing -Wmissing-declarations") 75 75 76 76 if (OSCamOperatingSystem MATCHES "Linux") -
branches/merlin/cscrypt/crc32.c
r151 r281 1 #include "crc32.h" 1 2 2 3 /* crc32.c -- compute the CRC-32 of a data stream … … 70 71 #define DO8(buf) DO4(buf); DO4(buf); 71 72 72 unsigned long crc32(crc, buf, len) 73 unsigned long crc; 74 const unsigned char *buf; 75 unsigned int len; 73 unsigned long crc32(unsigned long crc, const unsigned char *buf, unsigned int len) 76 74 { 77 75 if (!buf) -
branches/merlin/cscrypt/cscrypt.h
r151 r281 5 5 #endif 6 6 7 #include "crc32.h" 7 8 #include "des.h" 8 9 #include "bn.h" -
branches/merlin/cscrypt/mem.c
r151 r281 73 73 74 74 /* may be changed as long as `allow_customize' is set */ 75 static void *(*malloc_locked_func) (size_t) = malloc;76 static void (*free_locked_func) (void *) = free;75 //static void *(*malloc_locked_func) (size_t) = malloc; 76 //static void (*free_locked_func) (void *) = free; 77 77 static void *(*malloc_func) (size_t) = malloc; 78 static void *(*realloc_func) (void *, size_t) = realloc;78 //static void *(*realloc_func) (void *, size_t) = realloc; 79 79 static void (*free_func) (void *) = free; 80 80 … … 97 97 * at run-time */ 98 98 static void (*malloc_debug_func) (void *, int, const char *, int, int) = NULL; 99 static void (*realloc_debug_func) (void *, void *, int, const char *, int, int) 100 = NULL; 99 //static void (*realloc_debug_func) (void *, void *, int, const char *, int, int) = NULL; 101 100 static void (*free_debug_func) (void *, int) = NULL; 102 static void (*set_debug_options_func) (long) = NULL;103 static long (*get_debug_options_func) (void) = NULL;104 #endif 105 106 101 //static void (*set_debug_options_func) (long) = NULL; 102 //static long (*get_debug_options_func) (void) = NULL; 103 #endif 104 105 /* 107 106 int CRYPTO_set_mem_functions(void *(*m) (size_t), void *(*r) (void *, size_t), void (*f) (void *)) 108 107 { … … 205 204 free_debug_func(NULL, 1); 206 205 } 206 */ 207 207 208 208 void *CRYPTO_malloc(int num, const char *file, int line) … … 225 225 } 226 226 227 /* 227 228 void *CRYPTO_realloc(void *str, int num, const char *file, int line) 228 229 { … … 240 241 return ret; 241 242 } 243 */ 242 244 243 245 void CRYPTO_free(void *str) … … 253 255 } 254 256 257 /* 255 258 void *CRYPTO_remalloc(void *a, int num, const char *file, int line) 256 259 { … … 274 277 return 0; 275 278 } 279 */ -
branches/merlin/include/chk.h
r276 r281 2 2 # define __CHK_H__ 3 3 4 int chk_srvid(ECM_REQUEST *, int); 5 int chk_sfilter(ECM_REQUEST *, PTAB *); 6 int chk_ufilters(ECM_REQUEST *); 7 int chk_rfilter(ECM_REQUEST *, struct s_reader *); 8 int chk_rsfilter(ECM_REQUEST *, int); 9 int chk_avail_reader(ECM_REQUEST *, struct s_reader *); 4 10 int matching_reader(ECM_REQUEST *, struct s_reader *); 5 11 -
branches/merlin/include/oscam.h
r276 r281 24 24 int send_dcw(ECM_REQUEST *); 25 25 int process_input(uchar *, int, int); 26 int chk_srvid(ECM_REQUEST *, int);27 int chk_sfilter(ECM_REQUEST *, PTAB *);28 int chk_ufilters(ECM_REQUEST *);29 int chk_rfilter(ECM_REQUEST *, struct s_reader *);30 int chk_rsfilter(ECM_REQUEST *, int);31 int chk_avail_reader(ECM_REQUEST *, struct s_reader *);32 26 void set_signal_handler(int, int, void (*)(int)); 33 27 void cs_log_config(); -
branches/merlin/src/CAM/conax.c
r276 r281 128 128 } 129 129 130 int conax_send_pin()130 static int conax_send_pin() 131 131 { 132 132 unsigned char insPIN[] = { 0xDD, 0xC8, 0x00, 0x00, 0x07, 0x1D, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00 }; //letzte vier ist der Pin-Code -
branches/merlin/src/CAM/cryptoworks.c
r278 r281 14 14 static int ucpk_valid = 0; 15 15 16 void RotateBytes1(unsigned char *out, unsigned char *in, int n)16 static void RotateBytes1(unsigned char *out, unsigned char *in, int n) 17 17 { 18 18 // loop is executed atleast once, so it's not a good idea to … … 24 24 } 25 25 26 void RotateBytes2(unsigned char *in, int n)26 static void RotateBytes2(unsigned char *in, int n) 27 27 { 28 28 // loop is executed atleast once, so it's not a good idea to … … 38 38 } 39 39 40 int Input(BIGNUM * d, unsigned char *in, int n, int LE)40 static int Input(BIGNUM * d, unsigned char *in, int n, int LE) 41 41 { 42 42 if (LE) { … … 49 49 } 50 50 51 int Output(unsigned char *out, int n, BIGNUM * r, int LE)51 static int Output(unsigned char *out, int n, BIGNUM * r, int LE) 52 52 { 53 53 int s = BN_num_bytes(r); … … 72 72 } 73 73 74 int RSA(unsigned char *out, unsigned char *in, int n, BIGNUM * exp, BIGNUM * mod, int LE)74 static int RSA(unsigned char *out, unsigned char *in, int n, BIGNUM * exp, BIGNUM * mod, int LE) 75 75 { 76 76 int rc = 0; … … 93 93 } 94 94 95 int CheckSctLen(const uchar * data, int off)95 static int CheckSctLen(const uchar * data, int off) 96 96 { 97 97 int l = SCT_LEN(data); … … 143 143 } 144 144 145 int cryptoworks_send_pin() 145 /* 146 static int cryptoworks_send_pin() 146 147 { 147 148 unsigned char insPIN[] = { 0xA4, 0x20, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00 }; //Verify PIN … … 162 163 return (0); 163 164 } 164 165 int cryptoworks_disbale_pin() 165 */ 166 167 static int cryptoworks_disbale_pin() 166 168 { 167 169 unsigned char insPIN[] = { 0xA4, 0x26, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00 }; //disable PIN -
branches/merlin/src/CAM/seca.c
r278 r281 10 10 char *card; 11 11 12 int set_provider_info(int i)12 static int set_provider_info(int i) 13 13 { 14 14 static uchar ins12[] = { 0xc1, 0x12, 0x00, 0x00, 0x19 }; // get provider info -
branches/merlin/src/CAM/videoguard.c
r276 r281 376 376 377 377 struct CmdTab *cmd_table = NULL; 378 void memorize_cmd_table(const unsigned char *mem, int size)378 static void memorize_cmd_table(const unsigned char *mem, int size) 379 379 { 380 380 cmd_table = (struct CmdTab *) malloc(sizeof (unsigned char) * size); … … 382 382 } 383 383 384 int cmd_table_get_info(const unsigned char *cmd, unsigned char *rlen, unsigned char *rmode)384 static int cmd_table_get_info(const unsigned char *cmd, unsigned char *rlen, unsigned char *rmode) 385 385 { 386 386 struct CmdTabEntry *pcte = cmd_table->e; -
branches/merlin/src/ac.c
r276 r281 37 37 } 38 38 39 int idx_from_ac_idx(int ac_idx)39 static int idx_from_ac_idx(int ac_idx) 40 40 { 41 41 int i; -
branches/merlin/src/card.c
r276 r281 166 166 } 167 167 168 169 170 int casc_process_ecm(ECM_REQUEST * er) 168 static int casc_process_ecm(ECM_REQUEST * er) 171 169 { 172 170 int rc, n, i, sflag; -
branches/merlin/src/nano.c
r276 r281 7 7 #define CS_NANO_CLASS 0xE2 8 8 9 int find_nano(uchar * ecm, int l, uchar nano, int s)9 static int find_nano(uchar * ecm, int l, uchar nano, int s) 10 10 { 11 11 uchar *snano; -
branches/merlin/src/oscam.c
r276 r281 1271 1271 } 1272 1272 1273 int write_ecm_DCW(int fd, ECM_REQUEST * er) 1273 /* 1274 static int write_ecm_DCW(int fd, ECM_REQUEST * er) 1274 1275 { 1275 1276 return (write_to_pipe(fd, PIP_ID_DCW, (uchar *) er, sizeof (ECM_REQUEST))); 1276 1277 } 1277 1278 void logCWtoFile(ECM_REQUEST * er) 1278 */ 1279 1280 static void logCWtoFile(ECM_REQUEST * er) 1279 1281 { 1280 1282 /* This function writes the current CW from ECM struct to a cwl file. -
branches/merlin/src/sharing/camd35.c
r276 r281 304 304 } 305 305 306 int camd35_client_init()306 static int camd35_client_init() 307 307 { 308 308 static struct sockaddr_in loc_sa; … … 365 365 } 366 366 367 int camd35_client_init_log()367 static int camd35_client_init_log() 368 368 { 369 369 static struct sockaddr_in loc_sa; -
branches/merlin/src/sharing/newcamd.c
r280 r281 4 4 #include "oscam.h" 5 5 #include "card.h" 6 #include "chk.h" 6 7 #include "simples.h" 7 8 #include "log.h" … … 205 206 } 206 207 207 int connect_nonb(int sockfd, const struct sockaddr *saptr, socklen_t salen, int nsec)208 static int connect_nonb(int sockfd, const struct sockaddr *saptr, socklen_t salen, int nsec) 208 209 { 209 210 int flags, n, error; … … 292 293 } 293 294 294 void newcamd_reply_ka()295 static void newcamd_reply_ka() 295 296 { 296 297 if (!client[cs_idx].udp_fd) { … … 1069 1070 */ 1070 1071 1071 int newcamd_client_init()1072 static int newcamd_client_init() 1072 1073 { 1073 1074 static struct sockaddr_in loc_sa; -
branches/merlin/src/sharing/serial.c
r276 r281 939 939 } 940 940 941 void init_sharing_serial(int idx)941 static void init_sharing_serial(int idx) 942 942 { 943 943 char *p;
Note:
See TracChangeset
for help on using the changeset viewer.