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

better padding

Browse Source
This commit is contained in:
wangyu 2017-08-04 13:08:17 +08:00
parent bc04a6898d
commit 32fd9f77a5
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
encrypt.cpp
View File

@ -143,12 +143,35 @@ int cipher_xor_decrypt(const char * data, char *output,int &len, char *key) {
return 0; return 0;
} }
int padding(char *data ,int &data_len,int padding_num)
{
int old_len=data_len;
data_len+=1;
if(data_len%padding_num!=0)
{
data_len= (data_len/padding_num)*padding_num+padding_num;
}
data[data_len-1]= (data_len-old_len);
return 0;
}
int de_padding(const char *data ,int &data_len,int padding_num)
{
if((uint8_t)data[data_len-1] >padding_num) return -1;
data_len-=(uint8_t)data[data_len-1];
if(data_len<0)
{
return -1;
}
return 0;
}
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)
{ {
char buf[buf_len]; char buf[buf_len];
memcpy(buf,data,len);//TODO inefficient code memcpy(buf,data,len);//TODO inefficient code
/*
int ori_len=len; int ori_len=len;
len+=2;//length len+=2;//length
if(len%16!=0) if(len%16!=0)
@ -158,7 +181,8 @@ int cipher_aes128cbc_encrypt(const char *data,char *output,int &len,char * key)
//if(len>max_data_len) return -1; //if(len>max_data_len) return -1;
buf[len-2]= (unsigned char)( (uint16_t(ori_len))>>8); buf[len-2]= (unsigned char)( (uint16_t(ori_len))>>8);
buf[len-1]=(unsigned char)( ((uint16_t(ori_len))<<8)>>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;
@ -188,10 +212,11 @@ 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)
{ {
if(len%16 !=0) {mylog(log_debug,"len%16!=0\n");return -1;} if(len%16 !=0) {mylog(log_debug,"len%16!=0\n");return -1;}
if(len<2) {mylog(log_debug,"len <2\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);
len=((unsigned char)output[len-2])*256u+((unsigned char)output[len-1]); if(de_padding(output,len,16)<0) return -1;
return 0; return 0;
} }