- Timestamp:
- 02/13/19 18:17:53 (5 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cardlist.c
r11496 r11498 2 2 #include "globals.h" 3 3 #include "cardlist.h" 4 4 /* 5 5 static const uint8_t data50[81] = { "\x00" }; 6 6 static const uint8_t mod50[81] = { "\x00" }; … … 9 9 static const uint8_t mod1[113] = { "\x00" }; 10 10 static const uint8_t nuid[5] = { "\x00" }; 11 11 */ 12 12 struct atrlist current; 13 13 struct known_cards … … 54 54 unity_02 = { "Unity Media 02",0,12,"3F FF 95 00 FF 91 81 71 FE 47 00 44 4E 41 53 50 31 34 32 20 52 65 76 47 30 36 12",80,0,"\x00","\x00"}; 55 55 56 struct atrlist57 {58 int found;59 int ishd03;60 int badcard;61 int ishd04;62 char providername[32];63 char atr[80];64 } current = { 0, 0, 0, 0, "\0", "\0" };65 66 56 void findatr(struct s_reader *reader) 67 57 { … … 75 65 if ( !strncmp(hdplus01.rsakey, "0", 1) == 0 ) 76 66 { 77 memcpy(reader->boxkey, hdplus01.boxkey, 9);67 /* memcpy(reader->boxkey, hdplus01.boxkey, 9); 78 68 memcpy(reader->rsa_mod, hdplus01.rsakey, 65); 79 reader->rsa_mod_length = 64;69 */ reader->rsa_mod_length = 64; 80 70 } 81 71 memcpy(current.providername, hdplus01.providername, strlen(hdplus01.providername)); … … 89 79 if ( !strncmp(hdplus02.rsakey, "0", 1) == 0 ) 90 80 { 91 memcpy(reader->boxkey, hdplus02.boxkey, 9);81 /* memcpy(reader->boxkey, hdplus02.boxkey, 9); 92 82 memcpy(reader->rsa_mod, hdplus02.rsakey, 65); 93 reader->rsa_mod_length = 64;83 */ reader->rsa_mod_length = 64; 94 84 } 95 85 memcpy(current.providername, hdplus02.providername, strlen(hdplus02.providername)); … … 106 96 reader->saveemm = hdplus03.saveemm; 107 97 reader->blockemm = hdplus03.blockemm; 108 109 memcpy(reader->data50, data50, 80); 110 memcpy(reader->mod50, mod50, 80); 111 memcpy(reader->key60, key60, 96); 112 memcpy(reader->exp60, exp60, 96); 113 memcpy(reader->nuid, nuid, 4); 114 memcpy(reader->mod1, mod1, 112); 115 116 reader->data50_length = 80; 117 reader->mod50_length = 80; 118 reader->key60_length = 96; 119 reader->exp60_length = 96; 120 reader->nuid_length = 4; 121 reader->mod1_length = 112; 122 98 /* 99 memcpy(reader->data50, data50, 80); 100 memcpy(reader->mod50, mod50, 80); 101 memcpy(reader->key60, key60, 96); 102 memcpy(reader->exp60, exp60, 96); 103 memcpy(reader->nuid, nuid, 4); 104 memcpy(reader->mod1, mod1, 112); 105 106 reader->data50_length = 80; 107 reader->mod50_length = 80; 108 reader->key60_length = 96; 109 reader->exp60_length = 96; 110 reader->nuid_length = 4; 111 reader->mod1_length = 112; 112 */ 123 113 current.found = 1; 124 114 return; … … 132 122 reader->saveemm = hdplus03a.saveemm; 133 123 reader->blockemm = hdplus03a.blockemm; 134 135 memcpy(reader->data50, data50, 80); 136 memcpy(reader->mod50, mod50, 80); 137 memcpy(reader->key60, key60, 96); 138 memcpy(reader->exp60, exp60, 96); 139 memcpy(reader->nuid, nuid, 4); 140 memcpy(reader->mod1, mod1, 112); 141 142 reader->data50_length = 80; 143 reader->mod50_length = 80; 144 reader->key60_length = 96; 145 reader->exp60_length = 96; 146 reader->nuid_length = 4; 147 reader->mod1_length = 112; 148 124 /* 125 memcpy(reader->data50, data50, 80); 126 memcpy(reader->mod50, mod50, 80); 127 memcpy(reader->key60, key60, 96); 128 memcpy(reader->exp60, exp60, 96); 129 memcpy(reader->nuid, nuid, 4); 130 memcpy(reader->mod1, mod1, 112); 131 132 reader->data50_length = 80; 133 reader->mod50_length = 80; 134 reader->key60_length = 96; 135 reader->exp60_length = 96; 136 reader->nuid_length = 4; 137 reader->mod1_length = 112; 138 */ 149 139 current.found = 1; 150 140 return; … … 157 147 reader->saveemm = hdplus03b.saveemm; 158 148 reader->blockemm = hdplus03b.blockemm; 159 160 memcpy(reader->data50, data50, 80); 161 memcpy(reader->mod50, mod50, 80); 162 memcpy(reader->key60, key60, 96); 163 memcpy(reader->exp60, exp60, 96); 164 memcpy(reader->nuid, nuid, 4); 165 memcpy(reader->mod1, mod1, 112); 166 167 reader->data50_length = 80; 168 reader->mod50_length = 80; 169 reader->key60_length = 96; 170 reader->exp60_length = 96; 171 reader->nuid_length = 4; 172 reader->mod1_length = 112; 173 149 /* 150 memcpy(reader->data50, data50, 80); 151 memcpy(reader->mod50, mod50, 80); 152 memcpy(reader->key60, key60, 96); 153 memcpy(reader->exp60, exp60, 96); 154 memcpy(reader->nuid, nuid, 4); 155 memcpy(reader->mod1, mod1, 112); 156 157 reader->data50_length = 80; 158 reader->mod50_length = 80; 159 reader->key60_length = 96; 160 reader->exp60_length = 96; 161 reader->nuid_length = 4; 162 reader->mod1_length = 112; 163 */ 174 164 current.found = 1; 175 165 return; … … 182 172 reader->saveemm = hdplus04.saveemm; 183 173 reader->blockemm = hdplus04.blockemm; 184 185 memcpy(reader->data50, data50, 80); 186 memcpy(reader->mod50, mod50, 80); 187 memcpy(reader->key60, key60, 96); 188 memcpy(reader->exp60, exp60, 96); 189 memcpy(reader->nuid, nuid, 4); 190 memcpy(reader->mod1, mod1, 112); 191 192 reader->data50_length = 80; 193 reader->mod50_length = 80; 194 reader->key60_length = 96; 195 reader->exp60_length = 96; 196 reader->nuid_length = 4; 197 reader->mod1_length = 112; 198 174 /* 175 memcpy(reader->data50, data50, 80); 176 memcpy(reader->mod50, mod50, 80); 177 memcpy(reader->key60, key60, 96); 178 memcpy(reader->exp60, exp60, 96); 179 memcpy(reader->nuid, nuid, 4); 180 memcpy(reader->mod1, mod1, 112); 181 182 reader->data50_length = 80; 183 reader->mod50_length = 80; 184 reader->key60_length = 96; 185 reader->exp60_length = 96; 186 reader->nuid_length = 4; 187 reader->mod1_length = 112; 188 */ 199 189 current.found = 1; 200 190 return; … … 207 197 reader->saveemm = hdplus04a.saveemm; 208 198 reader->blockemm = hdplus04a.blockemm; 209 210 memcpy(reader->data50, data50, 80); 211 memcpy(reader->mod50, mod50, 80); 212 memcpy(reader->key60, key60, 96); 213 memcpy(reader->exp60, exp60, 96); 214 memcpy(reader->nuid, nuid, 4); 215 memcpy(reader->mod1, mod1, 112); 216 217 reader->data50_length = 80; 218 reader->mod50_length = 80; 219 reader->key60_length = 96; 220 reader->exp60_length = 96; 221 reader->nuid_length = 4; 222 reader->mod1_length = 112; 223 199 /* 200 memcpy(reader->data50, data50, 80); 201 memcpy(reader->mod50, mod50, 80); 202 memcpy(reader->key60, key60, 96); 203 memcpy(reader->exp60, exp60, 96); 204 memcpy(reader->nuid, nuid, 4); 205 memcpy(reader->mod1, mod1, 112); 206 207 reader->data50_length = 80; 208 reader->mod50_length = 80; 209 reader->key60_length = 96; 210 reader->exp60_length = 96; 211 reader->nuid_length = 4; 212 reader->mod1_length = 112; 213 */ 224 214 current.found = 1; 225 215 return; … … 230 220 if ( !strncmp(unity_01.rsakey, "0", 1) == 0 ) 231 221 { 232 memcpy(reader->boxkey, unity_01.boxkey, 9);222 /* memcpy(reader->boxkey, unity_01.boxkey, 9); 233 223 memcpy(reader->rsa_mod, unity_01.rsakey, 65); 234 reader->rsa_mod_length = 64;224 */ reader->rsa_mod_length = 64; 235 225 } 236 226 memcpy(current.providername, unity_01.providername, strlen(unity_01.providername)); … … 244 234 if ( !strncmp(unity_02.rsakey, "0", 1) == 0 ) 245 235 { 246 memcpy(reader->boxkey, unity_02.boxkey, 9);236 /* memcpy(reader->boxkey, unity_02.boxkey, 9); 247 237 memcpy(reader->rsa_mod, unity_02.rsakey, 65); 248 reader->rsa_mod_length = 64;238 */ reader->rsa_mod_length = 64; 249 239 } 250 240 memcpy(current.providername, unity_02.providername, strlen(unity_02.providername)); … … 258 248 if ( !strncmp(kdg_02.rsakey, "0", 1) == 0 ) 259 249 { 260 memcpy(reader->boxkey, kdg_02.boxkey, 9);250 /* memcpy(reader->boxkey, kdg_02.boxkey, 9); 261 251 memcpy(reader->rsa_mod, kdg_02.rsakey, 65); 262 reader->rsa_mod_length = 64;252 */ reader->rsa_mod_length = 64; 263 253 } 264 254 memcpy(current.providername, kdg_02.providername, strlen(kdg_02.providername)); … … 272 262 if ( !strncmp(rlmega.rsakey, "0", 1) == 0 ) 273 263 { 274 memcpy(reader->boxkey, rlmega.boxkey, 5);264 /* memcpy(reader->boxkey, rlmega.boxkey, 5); 275 265 memcpy(reader->des_key, rlmega.rsakey, 17); 276 reader->des_key_length = 16;266 */ reader->des_key_length = 16; 277 267 } 278 268 memcpy(current.providername, rlmega.providername, strlen(rlmega.providername)); … … 313 303 if ( !strncmp(tivusatd.rsakey, "0", 1) == 0 ) 314 304 { 315 memcpy(reader->rsa_mod, tivusatd.rsakey, 121);305 // memcpy(reader->rsa_mod, tivusatd.rsakey, 121); 316 306 reader->rsa_mod_length = 120; 317 307 } … … 326 316 if ( !strncmp(tivusate.rsakey, "0", 1) == 0 ) 327 317 { 328 memcpy(reader->rsa_mod, tivusate.rsakey, 121);318 // memcpy(reader->rsa_mod, tivusate.rsakey, 121); 329 319 reader->rsa_mod_length = 120; 330 320 } … … 397 387 } 398 388 } 399 400 #endif -
trunk/csctapi/CMakeLists.txt
r11463 r11498 21 21 if (OSCamOperatingSystem MATCHES "Mac OS X") 22 22 file (GLOB csctapi_mac "ifd_azbox*" "ifd_cool*" "ifd_stapi*" ${mac_usbpcsc}) 23 file (GLOB csctapi_srcs "*.c" )23 file (GLOB csctapi_srcs "*.c" "../cardlist.c") 24 24 list(REMOVE_ITEM csctapi_srcs ${csctapi_mac}) 25 25 file (GLOB csctapi_hdrs "*.h") 26 26 list(REMOVE_ITEM csctapi_hdrs ${csctapi_mac}) 27 27 else (OSCamOperatingSystem MATCHES "Mac OS X") 28 file (GLOB csctapi_srcs "*.c" )28 file (GLOB csctapi_srcs "*.c" "../cardlist.c") 29 29 file (GLOB csctapi_hdrs "*.h") 30 30 endif (OSCamOperatingSystem MATCHES "Mac OS X")
Note:
See TracChangeset
for help on using the changeset viewer.