mirror of
https://github.com/apache/nuttx.git
synced 2026-03-24 15:45:48 +08:00
Move rivers/wireless/cc3000/security.c to crypto/aes.c; move include/nuttx/wireless/cc3000/security.h to include/nuttx/crypto/aes.h
This commit is contained in:
Gregory Nutt
2
configs
2
configs
Submodule configs updated: 744d52f25f...174b30da6b
@@ -39,4 +39,11 @@ config CRYPTO_CRYPTODEV
|
||||
bool "cryptodev support"
|
||||
default n
|
||||
|
||||
endif
|
||||
config CRYPTO_SW_AES
|
||||
bool "Software AES library"
|
||||
default n
|
||||
---help---
|
||||
Enable the software AES library as described in
|
||||
include/nuttx/crypto/aes.h
|
||||
|
||||
endif # CRYPTO
|
||||
|
||||
@@ -35,33 +35,41 @@
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
|
||||
CRYPTO_ASRCS =
|
||||
CRYPTO_CSRCS =
|
||||
|
||||
ifeq ($(CONFIG_CRYPTO),y)
|
||||
|
||||
# Basic
|
||||
|
||||
CRYPTO_ASRCS =
|
||||
CRYPTO_CSRCS = crypto.c testmngr.c
|
||||
CRYPTO_CSRCS += crypto.c testmngr.c
|
||||
|
||||
# cryptodev support
|
||||
|
||||
ifeq ($(CONFIG_CRYPTO_CRYPTODEV),y)
|
||||
CRYPTO_CSRCS += cryptodev.c
|
||||
CRYPTO_CSRCS += cryptodev.c
|
||||
endif
|
||||
|
||||
# Sofware AES library
|
||||
|
||||
ifeq ($(CONFIG_CRYPTO_SW_AES),y)
|
||||
CRYPTO_CSRCS += aes.c
|
||||
endif
|
||||
|
||||
endif # CONFIG_CRYPTO
|
||||
|
||||
ASRCS = $(CRYPTO_ASRCS)
|
||||
AOBJS = $(ASRCS:.S=$(OBJEXT))
|
||||
ASRCS = $(CRYPTO_ASRCS)
|
||||
AOBJS = $(ASRCS:.S=$(OBJEXT))
|
||||
|
||||
CSRCS = $(CRYPTO_CSRCS)
|
||||
COBJS = $(CSRCS:.c=$(OBJEXT))
|
||||
CSRCS = $(CRYPTO_CSRCS)
|
||||
COBJS = $(CSRCS:.c=$(OBJEXT))
|
||||
|
||||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
|
||||
BIN = libcrypto$(LIBEXT)
|
||||
BIN = libcrypto$(LIBEXT)
|
||||
|
||||
all: $(BIN)
|
||||
all: $(BIN)
|
||||
|
||||
$(AOBJS): %$(OBJEXT): %.S
|
||||
$(call ASSEMBLE, $<, $@)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,6 +8,8 @@ config WL_CC3000
|
||||
default n
|
||||
select SPI
|
||||
select ARCH_HAVE_NET
|
||||
select CRYPTO
|
||||
select CRYPTO_SW_AES
|
||||
---help---
|
||||
Enable support for the TI CC3000 Wifi Module
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ ifeq ($(CONFIG_WL_CC3000),y)
|
||||
# Include cc3000 drivers
|
||||
|
||||
CSRCS += cc3000.c cc3000_common.c cc3000drv.c evnt_handler.c hci.c netapp.c
|
||||
CSRCS += nvmem.c security.c socket.c socket_imp.c wlan.c
|
||||
CSRCS += nvmem.c socket.c socket_imp.c wlan.c
|
||||
|
||||
# Include wireless devices build support
|
||||
|
||||
|
||||
@@ -43,11 +43,12 @@
|
||||
#include <string.h>
|
||||
#include <debug.h>
|
||||
|
||||
#include <nuttx/crypto/aes.h>
|
||||
|
||||
#include <nuttx/wireless/cc3000/cc3000_common.h>
|
||||
#include <nuttx/wireless/cc3000/wlan.h>
|
||||
#include <nuttx/wireless/cc3000/hci.h>
|
||||
#include <nuttx/wireless/cc3000/nvmem.h>
|
||||
#include <nuttx/wireless/cc3000/security.h>
|
||||
#include <nuttx/wireless/cc3000/evnt_handler.h>
|
||||
|
||||
#include "cc3000.h"
|
||||
@@ -1204,6 +1205,58 @@ long wlan_smart_config_set_prefix(FAR char *cNewPrefix)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_read_key
|
||||
*
|
||||
* Description:
|
||||
* Reads AES128 key from EEPROM. Reads the AES128 key from fileID #12 in
|
||||
* EEPROM returns an error if the key does not exist.
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
*
|
||||
* Returned Value
|
||||
* On success 0, error otherwise.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef CC3000_UNENCRYPTED_SMART_CONFIG
|
||||
signed long aes_read_key(uint8_t *key)
|
||||
{
|
||||
signed long returnValue;
|
||||
|
||||
returnValue = nvmem_read(NVMEM_AES128_KEY_FILEID, AES128_KEY_SIZE, 0, key);
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_write_key
|
||||
*
|
||||
* Description:
|
||||
* Writes AES128 key from EEPROM Writes the AES128 key to fileID #12 in
|
||||
* EEPROM
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
*
|
||||
* Returned Value
|
||||
* On success 0, error otherwise.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#if 0 //#ifndef CC3000_UNENCRYPTED_SMART_CONFIG
|
||||
signed long aes_write_key(uint8_t *key)
|
||||
{
|
||||
signed long returnValue;
|
||||
|
||||
returnValue = nvmem_write(NVMEM_AES128_KEY_FILEID, AES128_KEY_SIZE, 0, key);
|
||||
|
||||
return returnValue;
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: wlan_smart_config_process
|
||||
*
|
||||
|
||||
108
include/nuttx/crypto/aes.h
Normal file
108
include/nuttx/crypto/aes.h
Normal file
@@ -0,0 +1,108 @@
|
||||
/****************************************************************************
|
||||
* include/nuttx/crypto/aes.h
|
||||
*
|
||||
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
|
||||
* Extracted from the CC3000 Host Driver Implementation.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* Neither the name of Texas Instruments Incorporated nor the names of
|
||||
* its contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __INCLUDE_NUTTX_CRYPTO_AES_H
|
||||
#define __INCLUDE_NUTTX_CRYPTO_AES_H
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
#include <stdint.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
#define AES128_KEY_SIZE 16
|
||||
|
||||
/****************************************************************************
|
||||
* Public Data
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Public Function Prototypes
|
||||
/****************************************************************************
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_encrypt
|
||||
*
|
||||
* Description:
|
||||
* AES128 encryption: Given AES128 key and 16 bytes plain text, cipher
|
||||
* text of 16 bytes is computed. The AES implementation is in mode ECB
|
||||
* (Electronic Code Book).
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
* state 16 bytes of plain text and cipher text
|
||||
*
|
||||
* Returned Value
|
||||
* None
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
void aes_encrypt(FAR uint8_t *state, FAR uint8_t *key);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_decrypt
|
||||
*
|
||||
* Description:
|
||||
* AES128 decryption: Given AES128 key and 16 bytes cipher text, plain
|
||||
* text of 16 bytes is computed The AES implementation is in mode ECB
|
||||
* (Electronic Code Book).
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
* state 16 bytes of plain text and cipher text
|
||||
*
|
||||
* Returned Value
|
||||
* None
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
void aes_decrypt(FAR uint8_t *state, FAR uint8_t *key);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* __INCLUDE_NUTTX_CRYPTO_AES_H */
|
||||
@@ -1,142 +0,0 @@
|
||||
/****************************************************************************
|
||||
* security.h - CC3000 Host Driver Implementation.
|
||||
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* Neither the name of Texas Instruments Incorporated nor the names of
|
||||
* its contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_SECURITY_H
|
||||
#define _INCLUDE_NUTTX_WIRELESS_CC3000_SECURITY_H
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include "nvmem.h"
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
#define AES128_KEY_SIZE 16
|
||||
|
||||
#ifndef CC3000_UNENCRYPTED_SMART_CONFIG
|
||||
|
||||
/****************************************************************************
|
||||
* Public Data
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Public Function Prototypes
|
||||
/****************************************************************************
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_encrypt
|
||||
*
|
||||
* Description:
|
||||
* AES128 encryption: Given AES128 key and 16 bytes plain text, cipher
|
||||
* text of 16 bytes is computed. The AES implementation is in mode ECB
|
||||
* (Electronic Code Book).
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
* state 16 bytes of plain text and cipher text
|
||||
*
|
||||
* Returned Value
|
||||
* None
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
void aes_encrypt(uint8_t *state, uint8_t *key);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_decrypt
|
||||
*
|
||||
* Description:
|
||||
* AES128 decryption: Given AES128 key and 16 bytes cipher text, plain
|
||||
* text of 16 bytes is computed The AES implementation is in mode ECB
|
||||
* (Electronic Code Book).
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
* state 16 bytes of plain text and cipher text
|
||||
*
|
||||
* Returned Value
|
||||
* None
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
void aes_decrypt(uint8_t *state, uint8_t *key);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_read_key
|
||||
*
|
||||
* Description:
|
||||
* Reads AES128 key from EEPROM. Reads the AES128 key from fileID #12 in
|
||||
* EEPROM returns an error if the key does not exist.
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
*
|
||||
* Returned Value
|
||||
* On success 0, error otherwise.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
signed long aes_read_key(uint8_t *key);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_write_key
|
||||
*
|
||||
* Description:
|
||||
* Writes AES128 key from EEPROM Writes the AES128 key to fileID #12 in
|
||||
* EEPROM
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
*
|
||||
* Returned Value
|
||||
* On success 0, error otherwise.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
signed long aes_write_key(uint8_t *key);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* CC3000_UNENCRYPTED_SMART_CONFIG */
|
||||
#endif /* _INCLUDE_NUTTX_WIRELESS_CC3000_SECURITY_H */
|
||||
@@ -489,6 +489,40 @@ long wlan_smart_config_stop(void);
|
||||
|
||||
long wlan_smart_config_set_prefix(char* cNewPrefix);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_read_key
|
||||
*
|
||||
* Description:
|
||||
* Reads AES128 key from EEPROM. Reads the AES128 key from fileID #12 in
|
||||
* EEPROM returns an error if the key does not exist.
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
*
|
||||
* Returned Value
|
||||
* On success 0, error otherwise.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
signed long aes_read_key(FAR uint8_t *key);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: aes_write_key
|
||||
*
|
||||
* Description:
|
||||
* Writes AES128 key from EEPROM Writes the AES128 key to fileID #12 in
|
||||
* EEPROM
|
||||
*
|
||||
* Input Parameters:
|
||||
* key AES128 key of size 16 bytes
|
||||
*
|
||||
* Returned Value
|
||||
* On success 0, error otherwise.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
signed long aes_write_key(FAR uint8_t *key);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: wlan_smart_config_process
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user