tinycrypt: Update TinyCrypt to version 0.2.5
TinyCrypt 0.2.5 was released a few hours ago:
https://github.com/01org/tinycrypt/releases/tag/v0.2.5
This patch updates some TinyCrypt files, solving the following issues:
- Decryptions using ccm mode can incorrectly fail
- Minor style issues in code documentation
Change-Id: I606cde179888aad7a52fd277d73973f2347d8882
Signed-off-by: Flavio Santes <flavio.santes@intel.com>
diff --git a/ext/lib/crypto/tinycrypt/README b/ext/lib/crypto/tinycrypt/README
index 9bab359..bcf64ef 100644
--- a/ext/lib/crypto/tinycrypt/README
+++ b/ext/lib/crypto/tinycrypt/README
@@ -3,7 +3,7 @@
https://github.com/01org/tinycrypt
-At revision 297706a14d4024d0e98bbbcae45ce0dcfbcc5c4c
+At revision c7b1dca2b27070dfb5f92e56dab7a91a7afee18c, version 0.2.5
Any changes to the local version should include Zephyr's TinyCrypt
maintainer in the review. That can be found via the git history.
diff --git a/ext/lib/crypto/tinycrypt/include/tinycrypt/ecc_dh.h b/ext/lib/crypto/tinycrypt/include/tinycrypt/ecc_dh.h
index e296ba9..b31477b 100644
--- a/ext/lib/crypto/tinycrypt/include/tinycrypt/ecc_dh.h
+++ b/ext/lib/crypto/tinycrypt/include/tinycrypt/ecc_dh.h
@@ -83,7 +83,7 @@
* @return returns TC_CRYPTO_SUCCESS (1) if the key pair was generated successfully
* returns TC_CRYPTO_FAIL (0) if:
* the private key is 0
-
+ *
* @param p_publicKey OUT -- the point representing the public key.
* @param p_privateKey OUT -- the private key.
* @param p_random IN -- The random number to use to generate the key pair.
diff --git a/ext/lib/crypto/tinycrypt/include/tinycrypt/sha256.h b/ext/lib/crypto/tinycrypt/include/tinycrypt/sha256.h
index e7c3ba0..89166f7 100644
--- a/ext/lib/crypto/tinycrypt/include/tinycrypt/sha256.h
+++ b/ext/lib/crypto/tinycrypt/include/tinycrypt/sha256.h
@@ -120,7 +120,7 @@
* If your application intends to have sensitive data in this
* buffer, remind to erase it after the data has been processed
* @param digest unsigned eight bit integer
- * @param s state struct
+ * @param s Sha256 state struct
*/
int32_t tc_sha256_final(uint8_t *digest, TCSha256State_t s);
diff --git a/ext/lib/crypto/tinycrypt/source/ccm_mode.c b/ext/lib/crypto/tinycrypt/source/ccm_mode.c
index 3e3b90c..9dfa838 100644
--- a/ext/lib/crypto/tinycrypt/source/ccm_mode.c
+++ b/ext/lib/crypto/tinycrypt/source/ccm_mode.c
@@ -196,10 +196,8 @@
uint32_t alen, const uint8_t *payload,
uint32_t plen, TCCcmMode_t c)
{
-
/* input sanity check: */
- if ((plen <= alen) ||
- (out == (uint8_t *) 0) ||
+ if ((out == (uint8_t *) 0) ||
(c == (TCCcmMode_t) 0) ||
((plen > 0) && (payload == (uint8_t *) 0)) ||
((alen > 0) && (associated_data == (uint8_t *) 0)) ||
