lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-11-05 08:10:38 +03:00
Code Activity

Merge remote-tracking branch 'upstream-public/pr/1336' into development

Browse Source
This commit is contained in:
Jaeden Amero
2018-01-30 17:28:31 +00:00
parent 8dd16ab7c0 2a03794d62
commit 15f90e0266
10 changed files with 484 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/mbedtls/cipher.h
View File

@@ -68,7 +68,13 @@
extern "C" {
#endif
/** Supported cipher IDs. */
/**
* \brief An enumeration of supported ciphers.
*
* \warning ARC4 and DES are considered weak ciphers and their use
* constitutes a security risk. We recommend considering stronger
* ciphers instead.
*/
typedef enum {
MBEDTLS_CIPHER_ID_NONE = 0,
MBEDTLS_CIPHER_ID_NULL,
@@ -80,7 +86,13 @@ typedef enum {
MBEDTLS_CIPHER_ID_ARC4,
} mbedtls_cipher_id_t;
/** Supported cipher types. */
/**
* \brief An enumeration of supported (cipher, mode) pairs.
*
* \warning ARC4 and DES are considered weak ciphers and their use
* constitutes a security risk. We recommend considering stronger
* ciphers instead.
*/
typedef enum {
MBEDTLS_CIPHER_NONE = 0,
MBEDTLS_CIPHER_NULL,