Skip to content

Commit a805d57

Browse files
authored
Merge pull request #4588 from TRodziewicz/remove_MD2_MD4_RC4_Blowfish_and_XTEA
Remove MD2, MD4, RC4, Blowfish and XTEA
2 parents 9a32d45 + 4a28ade commit a805d57

File tree

102 files changed

+79
-7003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+79
-7003
lines changed

ChangeLog.d/issue4084.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Removals
2+
* Remove all support for MD2, MD4, RC4, Blowfish and XTEA. This removes the
3+
corresponding modules and all their APIs and related configuration
4+
options. Fixes #4084.

configs/config-symmetric-only.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@
4747

4848
/* Mbed Crypto modules */
4949
#define MBEDTLS_AES_C
50-
#define MBEDTLS_ARC4_C
5150
#define MBEDTLS_ASN1_PARSE_C
5251
#define MBEDTLS_ASN1_WRITE_C
5352
#define MBEDTLS_BASE64_C
54-
#define MBEDTLS_BLOWFISH_C
5553
#define MBEDTLS_CAMELLIA_C
5654
#define MBEDTLS_ARIA_C
5755
#define MBEDTLS_CCM_C
@@ -68,8 +66,6 @@
6866
#define MBEDTLS_HMAC_DRBG_C
6967
#define MBEDTLS_NIST_KW_C
7068
#define MBEDTLS_MD_C
71-
#define MBEDTLS_MD2_C
72-
#define MBEDTLS_MD4_C
7369
#define MBEDTLS_MD5_C
7470
#define MBEDTLS_OID_C
7571
#define MBEDTLS_PEM_PARSE_C
@@ -94,7 +90,6 @@
9490
//#define MBEDTLS_THREADING_C
9591
#define MBEDTLS_TIMING_C
9692
#define MBEDTLS_VERSION_C
97-
#define MBEDTLS_XTEA_C
9893

9994
#include "mbedtls/config_psa.h"
10095

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Remove MD2, MD4, RC4, Blowfish and XTEA algorithms
2+
--
3+
4+
This change affects users of the MD2, MD4, RC4, Blowfish and XTEA algorithms.
5+
6+
They are already niche or obsolete and most of them are weak or broken. For
7+
those reasons possible users should consider switching to modern and safe
8+
alternatives to be found in literature.

docs/3.0-migration-guide.d/rename_the__ret_functions.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ original names of those functions. The renamed functions are:
1313
|------------------------------|--------------------------|
1414
| mbedtls_ctr_drbg_update_ret | mbedtls_ctr_drbg_update |
1515
| mbedtls_hmac_drbg_update_ret | mbedtls_hmac_drbg_update |
16-
| mbedtls_md2_starts_ret | mbedtls_md2_starts |
17-
| mbedtls_md2_update_ret | mbedtls_md2_update |
18-
| mbedtls_md2_finish_ret | mbedtls_md2_finish |
19-
| mbedtls_md2_ret | mbedtls_md2 |
20-
| mbedtls_md4_starts_ret | mbedtls_md4_starts |
21-
| mbedtls_md4_update_ret | mbedtls_md4_update |
22-
| mbedtls_md4_finish_ret | mbedtls_md4_finish |
23-
| mbedtls_md4_ret | mbedtls_md4 |
2416
| mbedtls_md5_starts_ret | mbedtls_md5_starts |
2517
| mbedtls_md5_update_ret | mbedtls_md5_update |
2618
| mbedtls_md5_finish_ret | mbedtls_md5_finish |

docs/3.0-migration-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ in order to match the new signature.
2222
Deprecated functions were removed from hashing modules
2323
------------------------------------------------------
2424

25-
Modules: MD2, MD4, MD5, SHA1, SHA256, SHA512, MD.
25+
Modules: MD5, SHA1, SHA256, SHA512, MD.
2626

2727
- The functions `mbedtls_xxx_starts()`, `mbedtls_xxx_update()`,
2828
`mbedtls_xxx_finish()` and `mbedtls_xxx()` were removed. Please use the

doxygen/input/doc_encdec.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,11 @@
4545
* - Symmetric:
4646
* - AES (see \c mbedtls_aes_crypt_ecb(), \c mbedtls_aes_crypt_cbc(), \c mbedtls_aes_crypt_cfb128() and
4747
* \c mbedtls_aes_crypt_ctr()).
48-
* - ARCFOUR (see \c mbedtls_arc4_crypt()).
49-
* - Blowfish / BF (see \c mbedtls_blowfish_crypt_ecb(), \c mbedtls_blowfish_crypt_cbc(),
50-
* \c mbedtls_blowfish_crypt_cfb64() and \c mbedtls_blowfish_crypt_ctr())
5148
* - Camellia (see \c mbedtls_camellia_crypt_ecb(), \c mbedtls_camellia_crypt_cbc(),
5249
* \c mbedtls_camellia_crypt_cfb128() and \c mbedtls_camellia_crypt_ctr()).
5350
* - DES/3DES (see \c mbedtls_des_crypt_ecb(), \c mbedtls_des_crypt_cbc(), \c mbedtls_des3_crypt_ecb()
5451
* and \c mbedtls_des3_crypt_cbc()).
5552
* - GCM (AES-GCM and CAMELLIA-GCM) (see \c mbedtls_gcm_init())
56-
* - XTEA (see \c mbedtls_xtea_crypt_ecb()).
5753
* - Asymmetric:
5854
* - Diffie-Hellman-Merkle (see \c mbedtls_dhm_read_public(), \c mbedtls_dhm_make_public()
5955
* and \c mbedtls_dhm_calc_secret()).

doxygen/input/doc_hashing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* \c mbedtls_md_setup())
3535
*
3636
* The following hashing-algorithms are provided:
37-
* - MD2, MD4, MD5 128-bit one-way hash functions by Ron Rivest.
37+
* - MD5 128-bit one-way hash function by Ron Rivest.
3838
* - SHA-1, SHA-256, SHA-384/512 160-bit or more one-way hash functions by
3939
* NIST and NSA.
4040
*

include/mbedtls/arc4.h

Lines changed: 0 additions & 142 deletions
This file was deleted.

0 commit comments

Comments
 (0)