Disable crypto in serial for now

This commit is contained in:
Stefan `Sec` Zehl 2011-12-23 00:37:46 +01:00
parent 3904870f32
commit 23696109cc
1 changed files with 17 additions and 19 deletions

View File

@ -145,9 +145,7 @@ static int process(char * input){
return -1; return -1;
puts_plus("\r\n"); puts_plus("\r\n");
puts_plus("D ["); // puts_plus("D ["); puts_plus(input); puts("]\r\n");
puts_plus(input);
puts("]\r\n");
if(input[0]=='i'){ if(input[0]=='i'){
nrf_init(); nrf_init();
@ -161,8 +159,8 @@ static int process(char * input){
config.maclen[0]=0x20; config.maclen[0]=0x20;
config.nrmacs=1; config.nrmacs=1;
nrf_config_set(&config); nrf_config_set(&config);
memcpy(thekey,meshkey,sizeof(thekey)); // memcpy(thekey,meshkey,sizeof(thekey));
funkencrypt=1; funkencrypt=0;
}else if(input[1]=='M'){ }else if(input[1]=='M'){
config.channel=83; config.channel=83;
memcpy(config.txmac,MESH_MAC,5); memcpy(config.txmac,MESH_MAC,5);
@ -170,11 +168,11 @@ static int process(char * input){
config.maclen[0]=0x20; config.maclen[0]=0x20;
config.nrmacs=1; config.nrmacs=1;
nrf_config_set(&config); nrf_config_set(&config);
static const uint32_t const pubmesh[4] = { // static const uint32_t const pubmesh[4] = {
0x00000042, 0x000005ec, 0x00000023, 0x00000005 // 0x00000042, 0x000005ec, 0x00000023, 0x00000005
}; // };
memcpy(thekey,pubmesh,sizeof(thekey)); // memcpy(thekey,pubmesh,sizeof(thekey));
funkencrypt=1; funkencrypt=0;
}else if(input[1]=='r'){ }else if(input[1]=='r'){
config.channel=REMOTE_CHANNEL; config.channel=REMOTE_CHANNEL;
memcpy(config.txmac,REMOTE_MAC,5); memcpy(config.txmac,REMOTE_MAC,5);
@ -182,8 +180,8 @@ static int process(char * input){
config.maclen[0]=0x10; config.maclen[0]=0x10;
config.nrmacs=1; config.nrmacs=1;
nrf_config_set(&config); nrf_config_set(&config);
memcpy(thekey,remotekey,sizeof(thekey)); // memcpy(thekey,remotekey,sizeof(thekey));
funkencrypt=1; funkencrypt=0;
}else if(input[1]=='b'){ }else if(input[1]=='b'){
config.channel=BEACON_CHANNEL; config.channel=BEACON_CHANNEL;
memcpy(config.txmac,BEACON_MAC,5); memcpy(config.txmac,BEACON_MAC,5);
@ -191,8 +189,8 @@ static int process(char * input){
config.maclen[0]=0x10; config.maclen[0]=0x10;
config.nrmacs=1; config.nrmacs=1;
nrf_config_set(&config); nrf_config_set(&config);
memcpy(thekey,openbeaconkey,sizeof(thekey)); // memcpy(thekey,openbeaconkey,sizeof(thekey));
funkencrypt=1; funkencrypt=0;
}else if(input[1]=='B'){ }else if(input[1]=='B'){
config.channel=BEACON_CHANNEL; config.channel=BEACON_CHANNEL;
memcpy(config.txmac,BEACON_MAC,5); memcpy(config.txmac,BEACON_MAC,5);
@ -200,11 +198,11 @@ static int process(char * input){
config.maclen[0]=0x10; config.maclen[0]=0x10;
config.nrmacs=1; config.nrmacs=1;
nrf_config_set(&config); nrf_config_set(&config);
static const uint32_t pubbeaconkey[4] = { // static const uint32_t pubbeaconkey[4] = {
0xB4595344, 0xD3E119B6, 0xA814D0EC, 0xEFF5A24E // 0xB4595344, 0xD3E119B6, 0xA814D0EC, 0xEFF5A24E
}; // };
memcpy(thekey,pubbeaconkey,sizeof(thekey)); // memcpy(thekey,pubbeaconkey,sizeof(thekey));
funkencrypt=1; funkencrypt=0;
}; };
}else if(input[0]=='t'){ }else if(input[0]=='t'){
type=input[1]; type=input[1];