lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-09-01 05:01:58 +03:00
Code Activity

Merge pull request #4710 from mstarzyk-mobica/ccm_taglen

Browse Source 
Add missing tag_len in ccm api.
PR-4710-merge TLS Testing  run successfully and the failure in PR-4710-head TLS Testing are CI problems thus merging.
This commit is contained in:
Ronald Cron
2021-06-23 14:20:26 +02:00
committed by GitHub
parent c9d86a05ce 82c48c992c
commit 44a0ae920c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/mbedtls/ccm.h
View File

@@ -345,6 +345,9 @@ int mbedtls_ccm_starts( mbedtls_ccm_context *ctx,
* \param plaintext_len The length in bytes of the plaintext to encrypt or * \param plaintext_len The length in bytes of the plaintext to encrypt or
* result of the decryption (thus not encompassing the * result of the decryption (thus not encompassing the
* additional data that are not encrypted). * additional data that are not encrypted).
* \param tag_len The length of the tag to generate in Bytes:
* 4, 6, 8, 10, 12, 14 or 16.
* For CCM*, zero is also valid.
* *
* \return \c 0 on success. * \return \c 0 on success.
* \return #MBEDTLS_ERR_CCM_BAD_INPUT on failure: * \return #MBEDTLS_ERR_CCM_BAD_INPUT on failure:
@@ -353,7 +356,8 @@ int mbedtls_ccm_starts( mbedtls_ccm_context *ctx,
*/ */
int mbedtls_ccm_set_lengths( mbedtls_ccm_context *ctx, int mbedtls_ccm_set_lengths( mbedtls_ccm_context *ctx,
size_t total_ad_len, size_t total_ad_len,
size_t plaintext_len ); size_t plaintext_len,
size_t tag_len );
/** /**
* \brief This function feeds an input buffer as associated data * \brief This function feeds an input buffer as associated data
@@ -473,9 +477,8 @@ int mbedtls_ccm_update( mbedtls_ccm_context *ctx,
* \param tag The buffer for holding the tag. If \p tag_len is greater * \param tag The buffer for holding the tag. If \p tag_len is greater
* than zero, this must be a writable buffer of at least \p * than zero, this must be a writable buffer of at least \p
* tag_len Bytes. * tag_len Bytes.
* \param tag_len The length of the tag to generate in Bytes: * \param tag_len The length of the tag. Must match the tag length passed to
* 4, 6, 8, 10, 12, 14 or 16. * mbedtls_ccm_set_lengths() function.
* For CCM*, zero is also valid.
* *
* \return \c 0 on success. * \return \c 0 on success.
* \return #MBEDTLS_ERR_CCM_BAD_INPUT on failure: * \return #MBEDTLS_ERR_CCM_BAD_INPUT on failure: