encrypt.cpp refactor to suppport more mode

This commit is contained in:
wangyu 2017-07-24 12:34:42 +08:00 committed by wangyu
parent 5568a7e7e2
commit 49f6b93cba
2 changed files with 141 additions and 2 deletions

@ -4,6 +4,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <encrypt.h>
//static uint64_t seq=1;
@ -13,6 +14,10 @@ static const int disable_all=0;
static const int disable_aes=0;
int auth_mode=auth_md5;
int cipher_mode=cipher_aes128cbc;
//int auth(uint8_t *data,)
/*
int my_encrypt(uint8_t *data,uint8_t *output,int &len,uint8_t * key)
@ -25,7 +30,134 @@ int my_decrypt(uint8_t *data,uint8_t *output,int &len,uint8_t * key)
return 0;
}
*/
int my_encrypt(const char *data0,char *output,int &len,char * key)
int auth_md5_cal(const char *data,char * output,int &len)
{
memcpy(output,data,len);//TODO inefficient code
md5((unsigned char *)output,len,(unsigned char *)(output+len));
len+=16;
return 0;
}
int auth_none_cal(const char *data,char * output,int &len)
{
memcpy(output,data,len);
return 0;
}
int auth_md5_verify(const char *data,int &len)
{
if(len<16)
{
return -1;
}
char md5_res[16];
md5((unsigned char *)data,len-16,(unsigned char *)md5_res);
if(memcmp(md5_res,data+len-16,16)!=0)
{
return -2;
}
len-=16;
return 0;
}
int auth_none_verify(const char *data,int &len)
{
return 0;
}
int cipher_aes128cbc_encrypt(const char *data,char *output,int &len,char * key)
{
char buf[65535+100];
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>65535) return -1;
buf[len-2]= (unsigned char)( (uint16_t(ori_len))>>8);
buf[len-1]=(unsigned char)( ((uint16_t(ori_len))<<8)>>8) ;
AES_CBC_encrypt_buffer((unsigned char *)output,(unsigned char *)buf,len,(unsigned char *)key,(unsigned char *)zero_iv);
return 0;
}
int cipher_none_encrypt(const char *data,char *output,int &len,char * key)
{
memcpy(output,data,len);
return 0;
}
int cipher_aes128cbc_decrypt(const char *data,char *output,int &len,char * key)
{
if(len%16 !=0) return -1;
if(len<2) return -1;
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]);
return 0;
}
int cipher_none_decrypt(const char *data,char *output,int &len,char * key)
{
memcpy(output,data,len);
return 0;
}
int auth_cal(const char *data,char * output,int &len)
{
if(auth_mode==auth_md5)return auth_md5_cal(data,output,len);
else if(auth_mode==auth_none ) return auth_none_cal(data,output,len);
return auth_md5_cal(data,output,len);//default
}
int auth_verify(const char *data,int &len)
{
if(auth_mode==auth_md5)return auth_md5_verify(data,len);
else if(auth_mode==auth_none )return auth_none_verify(data,len);
return auth_md5_verify(data,len);
}
int cipher_encrypt(const char *data,char *output,int &len,char * key)
{
if(cipher_mode==cipher_aes128cbc)return cipher_aes128cbc_encrypt(data,output,len, key);
if(cipher_mode==cipher_none)return cipher_none_encrypt(data,output,len, key);
return cipher_aes128cbc_encrypt(data,output,len, key);
}
int cipher_decrypt(const char *data,char *output,int &len,char * key)
{
if(cipher_mode==cipher_aes128cbc)return cipher_aes128cbc_decrypt(data,output,len, key);
if(cipher_mode==cipher_none)return cipher_none_decrypt(data,output,len, key);
return cipher_aes128cbc_decrypt(data,output,len,key);
}
int my_encrypt(const char *data,char *output,int &len,char * key)
{
if(len<0) return -1;
if(len>65535) return -1;
char buf[65535+100];
char buf2[65535+100];
memcpy(buf,data,len);
if(auth_cal(buf,buf2,len)!=0) {return -1;}
if(cipher_encrypt(buf2,output,len,key) !=0) {return -1;}
return 0;
}
int my_decrypt(const char *data,char *output,int &len,char * key)
{
if(len<0) return -1;
if(len>65535) return -1;
if(cipher_decrypt(data,output,len,key) !=0) {return -1;}
if(auth_verify(output,len)!=0) {return -1;}
return 0;
}
int my_encrypt_old(const char *data0,char *output,int &len,char * key)
{
char data[65535+100];
memcpy(data,data0,len);
@ -71,7 +203,7 @@ int my_encrypt(const char *data0,char *output,int &len,char * key)
return 0;
}
int my_decrypt(const char *data0,char *output,int &len,char * key)
int my_decrypt_old(const char *data0,char *output,int &len,char * key)
{
char data[65535+100];
memcpy(data,data0,len);

@ -11,4 +11,11 @@ int my_decrypt(const char *data,char *output,int &len,char * key);
int my_encrypt_pesudo_header(uint8_t *data,uint8_t *output,int &len,uint8_t * key,uint8_t *header,int hlen);
int my_decrypt_pesudo_header(uint8_t *data,uint8_t *output,int &len,uint8_t * key,uint8_t *header,int hlen);
const int auth_none=0;
const int auth_md5=1;
const int cipher_none=0;
const int cipher_aes128cbc=1;
#endif