Merge pull request #6800 from kivaisan/fix_loracrypto_asserts

Cruz Monrreal · web-flow · commit 11901f115b0b · 2018-05-07T19:34:56.000-05:00
Lora: Fix LoRaMacCrypto asserts
diff --git a/features/lorawan/lorastack/mac/LoRaMacCrypto.cpp b/features/lorawan/lorastack/mac/LoRaMacCrypto.cpp
@@ -265,7 +265,7 @@ int LoRaMacCrypto::compute_skeys_for_join_frame(const uint8_t *key, uint32_t key
 
 LoRaMacCrypto::LoRaMacCrypto()
 {
-    MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
+    MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
 }
 
 // If mbedTLS is not configured properly, these dummies will ensure that
@@ -275,7 +275,7 @@ LoRaMacCrypto::LoRaMacCrypto()
 int LoRaMacCrypto::compute_mic(const uint8_t *, uint16_t , const uint8_t *, uint32_t, uint32_t,
                                uint8_t dir, uint32_t, uint32_t *)
 {
-    MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
+    MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
 
     // Never actually reaches here
     return LORAWAN_STATUS_CRYPTO_FAIL;
@@ -284,7 +284,7 @@ int LoRaMacCrypto::compute_mic(const uint8_t *, uint16_t , const uint8_t *, uint
 int LoRaMacCrypto::encrypt_payload(const uint8_t *, uint16_t , const uint8_t *, uint32_t, uint32_t,
                                    uint8_t , uint32_t , uint8_t *)
 {
-    MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
+    MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
 
     // Never actually reaches here
     return LORAWAN_STATUS_CRYPTO_FAIL;
@@ -293,23 +293,23 @@ int LoRaMacCrypto::encrypt_payload(const uint8_t *, uint16_t , const uint8_t *,
 int LoRaMacCrypto::decrypt_payload(const uint8_t *, uint16_t , const uint8_t *, uint32_t, uint32_t,
                                    uint8_t , uint32_t , uint8_t *)
 {
-    MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
+    MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
 
     // Never actually reaches here
     return LORAWAN_STATUS_CRYPTO_FAIL;
 }
 
 int LoRaMacCrypto::compute_join_frame_mic(const uint8_t *, uint16_t , const uint8_t *, uint32_t, uint32_t *)
 {
-    MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
+    MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
 
     // Never actually reaches here
     return LORAWAN_STATUS_CRYPTO_FAIL;
 }
 
 int LoRaMacCrypto::decrypt_join_frame(const uint8_t *, uint16_t , const uint8_t *, uint32_t, uint8_t *)
 {
-    MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
+    MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
 
     // Never actually reaches here
     return LORAWAN_STATUS_CRYPTO_FAIL;
@@ -318,7 +318,7 @@ int LoRaMacCrypto::decrypt_join_frame(const uint8_t *, uint16_t , const uint8_t
 int LoRaMacCrypto::compute_skeys_for_join_frame(const uint8_t *, uint32_t, const uint8_t *, uint16_t ,
                                                 uint8_t *, uint8_t *)
 {
-    MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
+    MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");
 
     // Never actually reaches here
     return LORAWAN_STATUS_CRYPTO_FAIL;

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ int LoRaMacCrypto::compute_skeys_for_join_frame(const uint8_t *key, uint32_t key`
`265`	`265`
`266`	`266`	`LoRaMacCrypto::LoRaMacCrypto()`
`267`	`267`	`{`
`268`		`- MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
	`268`	`+ MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`// If mbedTLS is not configured properly, these dummies will ensure that`
`@@ -275,7 +275,7 @@ LoRaMacCrypto::LoRaMacCrypto()`
`275`	`275`	`int LoRaMacCrypto::compute_mic(const uint8_t , uint16_t , const uint8_t , uint32_t, uint32_t,`
`276`	`276`	`uint8_t dir, uint32_t, uint32_t *)`
`277`	`277`	`{`
`278`		`- MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
	`278`	`+ MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
`279`	`279`
`280`	`280`	`// Never actually reaches here`
`281`	`281`	`return LORAWAN_STATUS_CRYPTO_FAIL;`
`@@ -284,7 +284,7 @@ int LoRaMacCrypto::compute_mic(const uint8_t , uint16_t , const uint8_t , uint`
`284`	`284`	`int LoRaMacCrypto::encrypt_payload(const uint8_t , uint16_t , const uint8_t , uint32_t, uint32_t,`
`285`	`285`	`uint8_t , uint32_t , uint8_t *)`
`286`	`286`	`{`
`287`		`- MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
	`287`	`+ MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
`288`	`288`
`289`	`289`	`// Never actually reaches here`
`290`	`290`	`return LORAWAN_STATUS_CRYPTO_FAIL;`
`@@ -293,23 +293,23 @@ int LoRaMacCrypto::encrypt_payload(const uint8_t , uint16_t , const uint8_t ,`
`293`	`293`	`int LoRaMacCrypto::decrypt_payload(const uint8_t , uint16_t , const uint8_t , uint32_t, uint32_t,`
`294`	`294`	`uint8_t , uint32_t , uint8_t *)`
`295`	`295`	`{`
`296`		`- MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
	`296`	`+ MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
`297`	`297`
`298`	`298`	`// Never actually reaches here`
`299`	`299`	`return LORAWAN_STATUS_CRYPTO_FAIL;`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`int LoRaMacCrypto::compute_join_frame_mic(const uint8_t , uint16_t , const uint8_t , uint32_t, uint32_t *)`
`303`	`303`	`{`
`304`		`- MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
	`304`	`+ MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
`305`	`305`
`306`	`306`	`// Never actually reaches here`
`307`	`307`	`return LORAWAN_STATUS_CRYPTO_FAIL;`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`int LoRaMacCrypto::decrypt_join_frame(const uint8_t , uint16_t , const uint8_t , uint32_t, uint8_t *)`
`311`	`311`	`{`
`312`		`- MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
	`312`	`+ MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
`313`	`313`
`314`	`314`	`// Never actually reaches here`
`315`	`315`	`return LORAWAN_STATUS_CRYPTO_FAIL;`
`@@ -318,7 +318,7 @@ int LoRaMacCrypto::decrypt_join_frame(const uint8_t *, uint16_t , const uint8_t`
`318`	`318`	`int LoRaMacCrypto::compute_skeys_for_join_frame(const uint8_t , uint32_t, const uint8_t , uint16_t ,`
`319`	`319`	`uint8_t , uint8_t )`
`320`	`320`	`{`
`321`		`- MBED_ASSERT("[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
	`321`	`+ MBED_ASSERT(0 && "[LoRaCrypto] Must enable AES, CMAC & CIPHER from mbedTLS");`
`322`	`322`
`323`	`323`	`// Never actually reaches here`
`324`	`324`	`return LORAWAN_STATUS_CRYPTO_FAIL;`