github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-01-31 20:29:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed a core

Browse Source
This commit is contained in:
root 2018-08-31 17:10:46 +00:00
parent 6153aca5d8
commit f0e36d7d7c
3 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
connection.cpp
View File

@ -418,6 +418,7 @@ int recv_bare(raw_info_t &raw_info,char* & data,int & len)//recv function with e
//printf("recv_raw_fail in recv bare\n"); //printf("recv_raw_fail in recv bare\n");
return -1; return -1;
} }
mylog(log_trace,"data len=%d\n",len);
if ((raw_mode == mode_faketcp && (recv_info.syn == 1 || recv_info.ack != 1))) if ((raw_mode == mode_faketcp && (recv_info.syn == 1 || recv_info.ack != 1)))
{ {
mylog(log_debug,"unexpect packet type recv_info.syn=%d recv_info.ack=%d \n",recv_info.syn,recv_info.ack); mylog(log_debug,"unexpect packet type recv_info.syn=%d recv_info.ack=%d \n",recv_info.syn,recv_info.ack);

36
encrypt.cpp
View File

@ -294,46 +294,33 @@ int de_padding(const char *data ,int &data_len,int padding_num)
int cipher_aes128cbc_encrypt(const char *data,char *output,int &len,char * key) int cipher_aes128cbc_encrypt(const char *data,char *output,int &len,char * key)
{ {
static int first_time=1; static int first_time=1;
char buf[buf_len];
memcpy(buf,data,len);//TODO inefficient code
if(padding(buf,len,16)<0) return -1;
if(aes_key_optimize) if(aes_key_optimize)
{ {
if(first_time==0) key=0; if(first_time==0) key=0;
else first_time=0; else first_time=0;
} }
char buf[buf_len];
memcpy(buf,data,len);//TODO inefficient code
/*
int ori_len=len;
len+=2;//length
if(len%16!=0)
{
len= (len/16)*16+16;
}
//if(len>max_data_len) return -1;
buf[len-2]= (unsigned char)( (uint16_t(ori_len))>>8);
buf[len-1]=(unsigned char)( ((uint16_t(ori_len))<<8)>>8) ;*/
if(padding(buf,len,16)<0) return -1;
AES_CBC_encrypt_buffer((unsigned char *)output,(unsigned char *)buf,len,(unsigned char *)key,(unsigned char *)zero_iv); AES_CBC_encrypt_buffer((unsigned char *)output,(unsigned char *)buf,len,(unsigned char *)key,(unsigned char *)zero_iv);
return 0; return 0;
} }
int cipher_aes128cfb_encrypt(const char *data,char *output,int &len,char * key) int cipher_aes128cfb_encrypt(const char *data,char *output,int &len,char * key)
{ {
static int first_time=1; static int first_time=1;
char buf[buf_len];
memcpy(buf,data,len);//TODO inefficient code
if(aes_key_optimize) if(aes_key_optimize)
{ {
if(first_time==0) key=0; if(first_time==0) key=0;
else first_time=0; else first_time=0;
} }
char buf[buf_len];
memcpy(buf,data,len);//TODO inefficient code
//if(padding(buf,len,16)<0) return -1;
AES_CFB_encrypt_buffer((unsigned char *)output,(unsigned char *)buf,len,(unsigned char *)key,(unsigned char *)zero_iv); AES_CFB_encrypt_buffer((unsigned char *)output,(unsigned char *)buf,len,(unsigned char *)key,(unsigned char *)zero_iv);
return 0; return 0;
} }
@ -363,13 +350,12 @@ int cipher_none_encrypt(const char *data,char *output,int &len,char * key)
int cipher_aes128cbc_decrypt(const char *data,char *output,int &len,char * key) int cipher_aes128cbc_decrypt(const char *data,char *output,int &len,char * key)
{ {
static int first_time=1; static int first_time=1;
if(len%16 !=0) {mylog(log_debug,"len%%16!=0\n");return -1;}
if(aes_key_optimize) if(aes_key_optimize)
{ {
if(first_time==0) key=0; if(first_time==0) key=0;
else first_time=0; else first_time=0;
} }
if(len%16 !=0) {mylog(log_debug,"len%%16!=0\n");return -1;}
//if(len<0) {mylog(log_debug,"len <0\n");return -1;}
AES_CBC_decrypt_buffer((unsigned char *)output,(unsigned char *)data,len,(unsigned char *)key,(unsigned char *)zero_iv); AES_CBC_decrypt_buffer((unsigned char *)output,(unsigned char *)data,len,(unsigned char *)key,(unsigned char *)zero_iv);
if(de_padding(output,len,16)<0) return -1; if(de_padding(output,len,16)<0) return -1;
return 0; return 0;
@ -382,8 +368,6 @@ int cipher_aes128cfb_decrypt(const char *data,char *output,int &len,char * key)
if(first_time==0) key=0; if(first_time==0) key=0;
else first_time=0; else first_time=0;
} }
//if(len%16 !=0) {mylog(log_debug,"len%%16!=0\n");return -1;}
//if(len<0) {mylog(log_debug,"len <0\n");return -1;}
AES_CFB_decrypt_buffer((unsigned char *)output,(unsigned char *)data,len,(unsigned char *)key,(unsigned char *)zero_iv); AES_CFB_decrypt_buffer((unsigned char *)output,(unsigned char *)data,len,(unsigned char *)key,(unsigned char *)zero_iv);
//if(de_padding(output,len,16)<0) return -1; //if(de_padding(output,len,16)<0) return -1;
return 0; return 0;

8
network.cpp
View File

@ -1562,6 +1562,7 @@ int recv_raw_icmp(raw_info_t &raw_info, char *&payload, int &payloadlen)
mylog(log_debug,"recv_raw_ip error\n"); mylog(log_debug,"recv_raw_ip error\n");
return -1; return -1;
} }
mylog(log_trace,"ip_payloadlen=%d\n",ip_payloadlen);
if(raw_ip_version==AF_INET) if(raw_ip_version==AF_INET)
{ {
if(recv_info.protocol!=IPPROTO_ICMP) if(recv_info.protocol!=IPPROTO_ICMP)
@ -1580,6 +1581,13 @@ int recv_raw_icmp(raw_info_t &raw_info, char *&payload, int &payloadlen)
} }
} }
if(ip_payloadlen<int( sizeof(my_icmphdr) ))
{
mylog(log_debug,"too short to hold icmp header\n");
return -1;
}
my_icmphdr *icmph=(struct my_icmphdr *) (ip_payload); my_icmphdr *icmph=(struct my_icmphdr *) (ip_payload);