deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1704 from kkrentz/cc2538-aes-fixes

Browse source 
One fix to CC2538 hardware security
This commit is contained in:
Benoît Thébaudeau 2016-06-25 01:30:16 +02:00 committed by GitHub
parent 6a2d802b9a c28b6fb7ba
commit 01a533fb75
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cpu/cc2538/dev/cc2538-aes-128.c
View file

@ -40,6 +40,7 @@
#include "contiki.h" #include "contiki.h"
#include "dev/ecb.h" #include "dev/ecb.h"
#include "dev/cc2538-aes-128.h" #include "dev/cc2538-aes-128.h"
#include "dev/sys-ctrl.h"
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
@ -82,6 +83,7 @@ set_key(const uint8_t *key)
CC2538_AES_128_KEY_AREA); CC2538_AES_128_KEY_AREA);
if(ret != CRYPTO_SUCCESS) { if(ret != CRYPTO_SUCCESS) {
PRINTF("%s: aes_load_keys() error %u\n", MODULE_NAME, ret); PRINTF("%s: aes_load_keys() error %u\n", MODULE_NAME, ret);
sys_ctrl_reset();
} }
restore_crypto(crypto_enabled); restore_crypto(crypto_enabled);
@ -99,13 +101,13 @@ encrypt(uint8_t *plaintext_and_result)
plaintext_and_result, AES_128_BLOCK_SIZE, NULL); plaintext_and_result, AES_128_BLOCK_SIZE, NULL);
if(ret != CRYPTO_SUCCESS) { if(ret != CRYPTO_SUCCESS) {
PRINTF("%s: ecb_crypt_start() error %u\n", MODULE_NAME, ret); PRINTF("%s: ecb_crypt_start() error %u\n", MODULE_NAME, ret);
restore_crypto(crypto_enabled); sys_ctrl_reset();
return;
} }
while((res = ecb_crypt_check_status()) == CRYPTO_PENDING); while((res = ecb_crypt_check_status()) == CRYPTO_PENDING);
if(res != CRYPTO_SUCCESS) { if(res != CRYPTO_SUCCESS) {
PRINTF("%s: ecb_crypt_check_status() error %d\n", MODULE_NAME, res); PRINTF("%s: ecb_crypt_check_status() error %d\n", MODULE_NAME, res);
sys_ctrl_reset();
} }
restore_crypto(crypto_enabled); restore_crypto(crypto_enabled);