Reduced code size of PayloadEncrypt

mvds00 · mvds00 · commit ddd3588cb358 · 2019-02-10T03:03:15.000+01:00
diff --git a/src/mac/LoRaMacCrypto.c b/src/mac/LoRaMacCrypto.c
@@ -243,7 +243,7 @@ static KeyAddr_t KeyAddrList[NUM_OF_SEC_CTX] =
  * \param[IN/OUT]  buffer       - Data buffer
  * \retval                      - Status of the operation
  */
-static LoRaMacCryptoStatus_t PayloadEncrypt( uint8_t* buffer, int16_t size, KeyIdentifier_t keyID, uint32_t address, uint8_t dir, uint32_t frameCounter )
+static LoRaMacCryptoStatus_t PayloadEncrypt( uint8_t* buffer, int32_t size, KeyIdentifier_t keyID, uint32_t address, uint8_t dir, uint32_t frameCounter )
 {
     if( buffer == 0 )
     {
@@ -278,7 +278,7 @@ static LoRaMacCryptoStatus_t PayloadEncrypt( uint8_t* buffer, int16_t size, KeyI
             return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
         }
 
-        for( uint8_t i = 0; i < ( ( size > 16 ) ? 16 : size ); i++ )
+        for( uint8_t i = 0; i < (size>=16?16:size); i++ )
         {
             buffer[bufferIndex + i] = buffer[bufferIndex + i] ^ sBlock[i];
         }

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ static KeyAddr_t KeyAddrList[NUM_OF_SEC_CTX] =`
`243`	`243`	`* \param[IN/OUT] buffer - Data buffer`
`244`	`244`	`* \retval - Status of the operation`
`245`	`245`	`*/`
`246`		`-static LoRaMacCryptoStatus_t PayloadEncrypt( uint8_t* buffer, int16_t size, KeyIdentifier_t keyID, uint32_t address, uint8_t dir, uint32_t frameCounter )`
	`246`	`+static LoRaMacCryptoStatus_t PayloadEncrypt( uint8_t* buffer, int32_t size, KeyIdentifier_t keyID, uint32_t address, uint8_t dir, uint32_t frameCounter )`
`247`	`247`	`{`
`248`	`248`	`if( buffer == 0 )`
`249`	`249`	`{`
`@@ -278,7 +278,7 @@ static LoRaMacCryptoStatus_t PayloadEncrypt( uint8_t* buffer, int16_t size, KeyI`
`278`	`278`	`return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;`
`279`	`279`	`}`
`280`	`280`
`281`		`- for( uint8_t i = 0; i < ( ( size > 16 ) ? 16 : size ); i++ )`
	`281`	`+ for( uint8_t i = 0; i < (size>=16?16:size); i++ )`
`282`	`282`	`{`
`283`	`283`	`buffer[bufferIndex + i] = buffer[bufferIndex + i] ^ sBlock[i];`
`284`	`284`	`}`