mirror of
https://github.com/cuberite/polarssl.git
synced 2025-09-10 07:36:28 -04:00
Merge pull request #6783 from davidhorstmann-arm/move-mbedtls-deprecated-prefix
2.28 only: Move `MBEDTLS_DEPRECATED` annotation to prefix
This commit is contained in:
commit
8605571767
@ -917,13 +917,13 @@ int mbedtls_cipher_crypt( mbedtls_cipher_context_t *ctx,
|
|||||||
* parameter-verification failure.
|
* parameter-verification failure.
|
||||||
* \return A cipher-specific error code on failure.
|
* \return A cipher-specific error code on failure.
|
||||||
*/
|
*/
|
||||||
int mbedtls_cipher_auth_encrypt( mbedtls_cipher_context_t *ctx,
|
int MBEDTLS_DEPRECATED mbedtls_cipher_auth_encrypt(
|
||||||
|
mbedtls_cipher_context_t *ctx,
|
||||||
const unsigned char *iv, size_t iv_len,
|
const unsigned char *iv, size_t iv_len,
|
||||||
const unsigned char *ad, size_t ad_len,
|
const unsigned char *ad, size_t ad_len,
|
||||||
const unsigned char *input, size_t ilen,
|
const unsigned char *input, size_t ilen,
|
||||||
unsigned char *output, size_t *olen,
|
unsigned char *output, size_t *olen,
|
||||||
unsigned char *tag, size_t tag_len )
|
unsigned char *tag, size_t tag_len );
|
||||||
MBEDTLS_DEPRECATED;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief The generic authenticated decryption (AEAD) function.
|
* \brief The generic authenticated decryption (AEAD) function.
|
||||||
@ -976,13 +976,13 @@ int mbedtls_cipher_auth_encrypt( mbedtls_cipher_context_t *ctx,
|
|||||||
* \return #MBEDTLS_ERR_CIPHER_AUTH_FAILED if data is not authentic.
|
* \return #MBEDTLS_ERR_CIPHER_AUTH_FAILED if data is not authentic.
|
||||||
* \return A cipher-specific error code on failure.
|
* \return A cipher-specific error code on failure.
|
||||||
*/
|
*/
|
||||||
int mbedtls_cipher_auth_decrypt( mbedtls_cipher_context_t *ctx,
|
int MBEDTLS_DEPRECATED mbedtls_cipher_auth_decrypt(
|
||||||
|
mbedtls_cipher_context_t *ctx,
|
||||||
const unsigned char *iv, size_t iv_len,
|
const unsigned char *iv, size_t iv_len,
|
||||||
const unsigned char *ad, size_t ad_len,
|
const unsigned char *ad, size_t ad_len,
|
||||||
const unsigned char *input, size_t ilen,
|
const unsigned char *input, size_t ilen,
|
||||||
unsigned char *output, size_t *olen,
|
unsigned char *output, size_t *olen,
|
||||||
const unsigned char *tag, size_t tag_len )
|
const unsigned char *tag, size_t tag_len );
|
||||||
MBEDTLS_DEPRECATED;
|
|
||||||
#undef MBEDTLS_DEPRECATED
|
#undef MBEDTLS_DEPRECATED
|
||||||
#endif /* MBEDTLS_DEPRECATED_REMOVED */
|
#endif /* MBEDTLS_DEPRECATED_REMOVED */
|
||||||
#endif /* MBEDTLS_CIPHER_MODE_AEAD */
|
#endif /* MBEDTLS_CIPHER_MODE_AEAD */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user