add get_overhead

breakwa11 · breakwa11 · commit 22aa4aabf51b · 2017-05-14T01:14:29.000+08:00
diff --git a/src/obfs/auth.c b/src/obfs/auth.c
@@ -83,6 +83,10 @@ obfs * auth_aes128_sha1_new_obfs() {
     return self;
 }
 
+int auth_aes128_sha1_get_overhead(obfs *self) {
+    return 9;
+}
+
 void auth_simple_dispose(obfs *self) {
     auth_simple_local_data *local = (auth_simple_local_data*)self->l_data;
     if (local->recv_buffer != NULL) {
@@ -789,7 +793,7 @@ int auth_aes128_sha1_pack_auth_data(auth_simple_global_data *global, server_info
     }
 
     {
-        rand_bytes(outdata, 1);
+        rand_bytes((uint8_t*)outdata, 1);
         char hash[20];
         local->hmac(hash, (char *)outdata, 1, key, key_len);
         memcpy(outdata + 1, hash, 6);
diff --git a/src/obfs/auth.h b/src/obfs/auth.h
@@ -15,9 +15,8 @@ obfs * auth_aes128_md5_new_obfs();
 obfs * auth_aes128_sha1_new_obfs();
 void auth_simple_dispose(obfs *self);
 
-int auth_simple_client_pre_encrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
-int auth_simple_client_post_decrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
-
+//int auth_simple_client_pre_encrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
+//int auth_simple_client_post_decrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
 
 int auth_sha1_client_pre_encrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
 int auth_sha1_client_post_decrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
@@ -33,4 +32,6 @@ int auth_aes128_sha1_client_post_decrypt(obfs *self, char **pplaindata, int data
 
 int auth_aes128_sha1_client_udp_pre_encrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
 int auth_aes128_sha1_client_udp_post_decrypt(obfs *self, char **pplaindata, int datalength, size_t* capacity);
+
+int auth_aes128_sha1_get_overhead(obfs *self);
 #endif // _OBFS_AUTH_H
diff --git a/src/obfs/obfs.c b/src/obfs/obfs.c
@@ -80,7 +80,7 @@ obfs_class * new_obfs_class(char *plugin_name)
         obfs_class * plugin = (obfs_class*)malloc(sizeof(obfs));
         plugin->init_data = tls12_ticket_auth_init_data;
         plugin->new_obfs = tls12_ticket_auth_new_obfs;
-        plugin->get_overhead = get_overhead;
+        plugin->get_overhead = tls12_ticket_auth_get_overhead;
         plugin->get_server_info = get_server_info;
         plugin->set_server_info = set_server_info;
         plugin->dispose = tls12_ticket_auth_dispose;
@@ -166,7 +166,7 @@ obfs_class * new_obfs_class(char *plugin_name)
         obfs_class * plugin = (obfs_class*)malloc(sizeof(obfs));
         plugin->init_data = auth_simple_init_data;
         plugin->new_obfs = strcmp(plugin_name, "auth_aes128_md5") == 0 ? auth_aes128_md5_new_obfs : auth_aes128_sha1_new_obfs;
-        plugin->get_overhead = get_overhead;
+        plugin->get_overhead = auth_aes128_sha1_get_overhead;
         plugin->get_server_info = get_server_info;
         plugin->set_server_info = set_server_info;
         plugin->dispose = auth_simple_dispose;
diff --git a/src/obfs/tls1.2_ticket.c b/src/obfs/tls1.2_ticket.c
@@ -40,6 +40,10 @@ obfs * tls12_ticket_auth_new_obfs() {
     return self;
 }
 
+int tls12_ticket_auth_get_overhead(obfs *self) {
+    return 5;
+}
+
 void tls12_ticket_auth_dispose(obfs *self) {
     tls12_ticket_auth_local_data *local = (tls12_ticket_auth_local_data*)self->l_data;
     if (local->send_buffer != NULL) {
diff --git a/src/obfs/tls1.2_ticket.h b/src/obfs/tls1.2_ticket.h
@@ -16,4 +16,5 @@ void tls12_ticket_auth_dispose(obfs *self);
 int tls12_ticket_auth_client_encode(obfs *self, char **pencryptdata, int datalength, size_t* capacity);
 int tls12_ticket_auth_client_decode(obfs *self, char **pencryptdata, int datalength, size_t* capacity, int *needsendback);
 
+int tls12_ticket_auth_get_overhead(obfs *self);
 #endif // _OBFS_TLS1_2_TICKET_H

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,10 @@ obfs * auth_aes128_sha1_new_obfs() {`
`83`	`83`	`return self;`
`84`	`84`	`}`
`85`	`85`
	`86`	`+int auth_aes128_sha1_get_overhead(obfs *self) {`
	`87`	`+ return 9;`
	`88`	`+}`
	`89`	`+`
`86`	`90`	`void auth_simple_dispose(obfs *self) {`
`87`	`91`	`auth_simple_local_data local = (auth_simple_local_data)self->l_data;`
`88`	`92`	`if (local->recv_buffer != NULL) {`
`@@ -789,7 +793,7 @@ int auth_aes128_sha1_pack_auth_data(auth_simple_global_data *global, server_info`
`789`	`793`	`}`
`790`	`794`
`791`	`795`	`{`
`792`		`- rand_bytes(outdata, 1);`
	`796`	`+ rand_bytes((uint8_t*)outdata, 1);`
`793`	`797`	`char hash[20];`
`794`	`798`	`local->hmac(hash, (char *)outdata, 1, key, key_len);`
`795`	`799`	`memcpy(outdata + 1, hash, 6);`