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

Merge pull request #1155 from dgarske/fixes_pic32mz

Browse Source 
PIC32MZ minor build warning fixes
This commit is contained in:
Chris Conlon
2017-09-26 16:26:32 -06:00
committed by GitHub
parent e8dd7d0c4a 4d8e1c9e5a
commit 4f15cde2eb
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/src/aes.c
View File

@ -587,22 +587,21 @@
#include <wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h> #include <wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h>
#if defined(HAVE_AESGCM) || defined(WOLFSSL_AES_DIRECT) #if defined(HAVE_AESGCM) || defined(WOLFSSL_AES_DIRECT)
static int wc_AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock) static int wc_AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock)
{ {
return wc_Pic32AesCrypt(aes->key_ce, aes->keylen, NULL, 0, return wc_Pic32AesCrypt(aes->key_ce, aes->keylen, NULL, 0,
outBlock, inBlock, AES_BLOCK_SIZE, outBlock, inBlock, AES_BLOCK_SIZE,
PIC32_ENCRYPTION, PIC32_ALGO_AES, PIC32_CRYPTOALGO_RECB); PIC32_ENCRYPTION, PIC32_ALGO_AES, PIC32_CRYPTOALGO_RECB);
} }
#endif
#ifdef HAVE_AES_DECRYPT
#if defined(HAVE_AES_DECRYPT) && defined(WOLFSSL_AES_DIRECT)
static int wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock) static int wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock)
{ {
return wc_Pic32AesCrypt(aes->key_ce, aes->keylen, NULL, 0, return wc_Pic32AesCrypt(aes->key_ce, aes->keylen, NULL, 0,
outBlock, inBlock, AES_BLOCK_SIZE, outBlock, inBlock, AES_BLOCK_SIZE,
PIC32_DECRYPTION, PIC32_ALGO_AES, PIC32_CRYPTOALGO_RECB); PIC32_DECRYPTION, PIC32_ALGO_AES, PIC32_CRYPTOALGO_RECB);
} }
#endif /* HAVE_AES_DECRYPT */
#endif #endif
#elif defined(WOLFSSL_NRF51_AES) #elif defined(WOLFSSL_NRF51_AES)

5
wolfcrypt/src/port/pic32/pic32mz-crypt.c
View File

@ -216,8 +216,8 @@ static int Pic32Crypto(const byte* in, int inLen, word32* out, int outLen,
/* check for errors */ /* check for errors */
if (CESTATbits.ERROP || timeout <= 0) { if (CESTATbits.ERROP || timeout <= 0) {
#if 0 #if 0
printf("PIC32 Crypto: ERROP %x, ERRPHASE %x, TIMEOUT %d\n", printf("PIC32 Crypto: ERROP %x, ERRPHASE %x, TIMEOUT %s\n",
CESTATbits.ERROP, CESTATbits.ERRPHASE, timeout); CESTATbits.ERROP, CESTATbits.ERRPHASE, timeout <= 0 ? "yes" : "no");
#endif #endif
ret = ASYNC_OP_E; ret = ASYNC_OP_E;
} }
@ -407,7 +407,6 @@ static void update_engine(pic32mz_desc *desc, const byte *input, word32 len,
static void start_engine(pic32mz_desc *desc) static void start_engine(pic32mz_desc *desc)
{ {
/* Wrap up the last buffer descriptor and enable it */ /* Wrap up the last buffer descriptor and enable it */
int i;
int bufferLen; int bufferLen;
pic32mz_desc *uc_desc = KVA0_TO_KVA1(desc); pic32mz_desc *uc_desc = KVA0_TO_KVA1(desc);