feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

formating / add c files to distro / remove unneeded macros

Browse Source
This commit is contained in:
Jacob Barthelmeh
2017-12-14 12:08:28 -07:00
parent 5fa9455bf9
commit 3a6d5b8f90
3 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wolfcrypt/src/include.am
View File

@ -55,7 +55,11 @@ EXTRA_DIST += wolfcrypt/src/port/ti/ti-aes.c \
wolfcrypt/src/port/atmel/atmel.c \ wolfcrypt/src/port/atmel/atmel.c \
wolfcrypt/src/port/atmel/README.md \ wolfcrypt/src/port/atmel/README.md \
wolfcrypt/src/port/xilinx/xil-sha3.c \ wolfcrypt/src/port/xilinx/xil-sha3.c \
wolfcrypt/src/port/xilinx/xil-aesgcm.c wolfcrypt/src/port/xilinx/xil-aesgcm.c \
wolfcrypt/src/port/caam/caam_aes.c \
wolfcrypt/src/port/caam/caam_driver.c \
wolfcrypt/src/port/caam/caam_init.c \
wolfcrypt/src/port/caam/caam_sha.c
if BUILD_CAVIUM if BUILD_CAVIUM
src_libwolfssl_la_SOURCES += wolfcrypt/src/port/cavium/cavium_nitrox.c src_libwolfssl_la_SOURCES += wolfcrypt/src/port/cavium/cavium_nitrox.c

1
wolfcrypt/src/port/caam/caam_init.c
View File

@ -125,7 +125,6 @@ int wc_caamInit()
} }
#endif #endif
#ifndef NO_AES #ifndef NO_AES
if ((reg & 0x0000000F) > 0) { if ((reg & 0x0000000F) > 0) {
WOLFSSL_MSG("Found CAAM AES module"); WOLFSSL_MSG("Found CAAM AES module");

7
wolfssl/wolfcrypt/port/caam/wolfcaam.h
View File

@ -48,13 +48,6 @@ WOLFSSL_API int wc_caamOpenBlob(byte* data, word32 dataSz, byte* out,
WOLFSSL_API int wc_caamCreateBlob(byte* data, word32 dataSz, byte* out, WOLFSSL_API int wc_caamCreateBlob(byte* data, word32 dataSz, byte* out,
word32* outSz); word32* outSz);
/* Status Registers */
#define WC_CAAM_STATUS WC_CAAM_BASE + 0x0FD4
#define WC_CAAM_VERSION_MS WC_CAAM_BASE + 0x0FE8
#define WC_CAAM_VERSION_LS WC_CAAM_BASE + 0x0FEC
#define WC_CAMM_SUPPORT_MS WC_CAAM_BASE + 0x0FF0
#define WC_CAMM_SUPPORT_LS WC_CAAM_BASE + 0x0FF4
/* additional size that is added by CAAM when creating a blob */ /* additional size that is added by CAAM when creating a blob */
#define WC_CAAM_BLOB_SZ 48 #define WC_CAAM_BLOB_SZ 48