Browse Source

Cleanup user/pass handling.

Georgi Chorbadzhiyski 12 years ago
parent
commit
075e7b601e
3 changed files with 7 additions and 8 deletions
  1. 2
    2
      data.c
  2. 2
    2
      data.h
  3. 3
    4
      tsdecrypt.c

+ 2
- 2
data.c View File

@@ -65,8 +65,8 @@ void data_init(struct ts *ts) {
65 65
 	ts->camd.server_fd    = -1;
66 66
 	ts->camd.server_port  = 2233;
67 67
 	ts->camd.key          = &ts->key;
68
-	strcpy(ts->camd.user, "user");
69
-	strcpy(ts->camd.pass, "pass");
68
+	ts->camd.user         = "user";
69
+	ts->camd.pass         = "pass";
70 70
 	strcpy(ts->camd.newcamd.hex_des_key, "0102030405060708091011121314");
71 71
 
72 72
 	camd_proto_cs378x(&ts->camd.ops);

+ 2
- 2
data.h View File

@@ -137,8 +137,8 @@ struct camd {
137 137
 	int				server_fd;
138 138
 	struct in_addr	server_addr;
139 139
 	unsigned int	server_port;
140
-	char			user[64];
141
-	char			pass[64];
140
+	char			*user;
141
+	char			*pass;
142 142
 
143 143
 	unsigned int	ecm_recv_errors; // Error counter, reset on successful send/recv
144 144
 	unsigned int	emm_recv_errors; // Error counter, reset on successful send/recv

+ 3
- 4
tsdecrypt.c View File

@@ -400,12 +400,11 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
400 400
 					server_err = 0;
401 401
 				break;
402 402
 			case 'U':
403
-				strncpy(ts->camd.user, optarg, sizeof(ts->camd.user) - 1);
404
-				ts->camd.user[sizeof(ts->camd.user) - 1] = 0;
403
+				if (strlen(optarg) < 64)
404
+					ts->camd.user = optarg;
405 405
 				break;
406 406
 			case 'P':
407
-				strncpy(ts->camd.pass, optarg, sizeof(ts->camd.pass) - 1);
408
-				ts->camd.pass[sizeof(ts->camd.pass) - 1] = 0;
407
+				ts->camd.pass = optarg;
409 408
 				break;
410 409
 			case 'B':
411 410
 				if (strlen(optarg) != DESKEY_LENGTH) {

Loading…
Cancel
Save