1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00

Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Mark a few additional deprecations
  Use proper doxygen markup to mark deprecations
  Add -fdata-sections in memory.sh too
This commit is contained in:
Manuel Pégourié-Gonnard
2015-03-20 17:30:31 +00:00
9 changed files with 94 additions and 13 deletions

View File

@ -376,7 +376,7 @@ int cipher_init_ctx( cipher_context_t *ctx, const cipher_info_t *cipher_info );
* \brief Free the cipher-specific context of ctx. Freeing ctx
* itself remains the responsibility of the caller.
*
* \note Deprecated: Redirects to cipher_free()
* \deprecated Use cipher_free() instead
*
* \param ctx Free the cipher-specific context
*

View File

@ -1745,7 +1745,9 @@
/**
* \def POLARSSL_MEMORY_C
* Deprecated since 1.3.5. Please use POLARSSL_PLATFORM_MEMORY instead.
*
* \deprecated Use POLARSSL_PLATFORM_MEMORY instead.
*
* Depends on: POLARSSL_PLATFORM_C
*/
//#define POLARSSL_MEMORY_C
@ -1815,6 +1817,24 @@
#define POLARSSL_PADLOCK_C
/**
<<<<<<< HEAD:include/mbedtls/config.h
=======
* \def POLARSSL_PBKDF2_C
*
* Enable PKCS#5 PBKDF2 key derivation function.
*
* \deprecated Use POLARSSL_PKCS5_C instead
*
* Module: library/pbkdf2.c
*
* Requires: POLARSSL_PKCS5_C
*
* This module adds support for the PKCS#5 PBKDF2 key derivation function.
*/
#define POLARSSL_PBKDF2_C
/**
>>>>>>> mbedtls-1.3:include/polarssl/config.h
* \def POLARSSL_PEM_PARSE_C
*
* Enable PEM decoding / parsing.

View File

@ -204,7 +204,7 @@ int md_init_ctx( md_context_t *ctx, const md_info_t *md_info );
* \brief Free the message-specific context of ctx. Freeing ctx itself
* remains the responsibility of the caller.
*
* \note Deprecated: Redirects to md_free()
* \deprecated Use md_free() instead
*
* \param ctx Free the message-specific context
*

View File

@ -30,7 +30,7 @@
#include POLARSSL_CONFIG_FILE
#endif
/* Temporary compability hack for to keep the deprecated MEMORY_C working */
/* Temporary compability hack for to keep MEMORY_C working */
#if defined(POLARSSL_MEMORY_C) && !defined(POLARSSL_PLATFORM_MEMORY)
#define POLARSSL_PLATFORM_MEMORY
#endif

View File

@ -1544,8 +1544,7 @@ int ssl_set_own_cert( ssl_context *ssl, x509_crt *own_cert,
* up your certificate chain. The top certificate (self-signed)
* can be omitted.
*
* \warning This backwards-compatibility function is deprecated!
* Please use \c ssl_set_own_cert() instead.
* \deprecated Please use \c ssl_set_own_cert() instead.
*
* \param ssl SSL context
* \param own_cert own public certificate chain
@ -1569,8 +1568,7 @@ int ssl_set_own_cert_rsa( ssl_context *ssl, x509_crt *own_cert,
* up your certificate chain. The top certificate (self-signed)
* can be omitted.
*
* \warning This backwards-compatibility function is deprecated!
* Please use \c pk_init_ctx_rsa_alt()
* \deprecated Please use \c pk_init_ctx_rsa_alt()
* and \c ssl_set_own_cert() instead.
*
* \param ssl SSL context

View File

@ -227,8 +227,10 @@ int x509_serial_gets( char *buf, size_t size, const x509_buf *serial );
/**
* \brief Give an known OID, return its descriptive string.
* (Deprecated. Use oid_get_extended_key_usage() instead.)
* Warning: only works for extended_key_usage OIDs!
*
* \deprecated Use oid_get_extended_key_usage() instead.
*
* \warning Only works for extended_key_usage OIDs!
*
* \param oid buffer containing the oid
*
@ -239,7 +241,8 @@ const char *x509_oid_get_description( x509_buf *oid );
/**
* \brief Give an OID, return a string version of its OID number.
* (Deprecated. Use oid_get_numeric_string() instead)
*
* \deprecated Use oid_get_numeric_string() instead.
*
* \param buf Buffer to write to
* \param size Maximum size of buffer