yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 17:55:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3861 from bensze01/ecb_iv_fix-2.16

Browse Source 
Backport 2.16: Do not set IV size for ECB mode ciphers
This commit is contained in:
Gilles Peskine 2020-11-06 18:00:41 +01:00 committed by GitHub
commit 22c4385e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/ecb_iv_fix.txt Normal file
View File

@ -0,0 +1,3 @@
Bugfix
* Correct the default IV size for mbedtls_cipher_info_t structures using
MBEDTLS_MODE_ECB to 0, since ECB mode ciphers don't use IVs.

20
library/cipher_wrap.c
View File

@ -779,7 +779,7 @@ static const mbedtls_cipher_info_t camellia_128_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
128, 128,
"CAMELLIA-128-ECB", "CAMELLIA-128-ECB",
16, 0,
0, 0,
16, 16,
&camellia_info &camellia_info
@ -790,7 +790,7 @@ static const mbedtls_cipher_info_t camellia_192_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
192, 192,
"CAMELLIA-192-ECB", "CAMELLIA-192-ECB",
16, 0,
0, 0,
16, 16,
&camellia_info &camellia_info
@ -801,7 +801,7 @@ static const mbedtls_cipher_info_t camellia_256_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
256, 256,
"CAMELLIA-256-ECB", "CAMELLIA-256-ECB",
16, 0,
0, 0,
16, 16,
&camellia_info &camellia_info
@ -1155,7 +1155,7 @@ static const mbedtls_cipher_info_t aria_128_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
128, 128,
"ARIA-128-ECB", "ARIA-128-ECB",
16, 0,
0, 0,
16, 16,
&aria_info &aria_info
@ -1166,7 +1166,7 @@ static const mbedtls_cipher_info_t aria_192_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
192, 192,
"ARIA-192-ECB", "ARIA-192-ECB",
16, 0,
0, 0,
16, 16,
&aria_info &aria_info
@ -1177,7 +1177,7 @@ static const mbedtls_cipher_info_t aria_256_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
256, 256,
"ARIA-256-ECB", "ARIA-256-ECB",
16, 0,
0, 0,
16, 16,
&aria_info &aria_info
@ -1579,7 +1579,7 @@ static const mbedtls_cipher_info_t des_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
MBEDTLS_KEY_LENGTH_DES, MBEDTLS_KEY_LENGTH_DES,
"DES-ECB", "DES-ECB",
8, 0,
0, 0,
8, 8,
&des_info &des_info
@ -1630,7 +1630,7 @@ static const mbedtls_cipher_info_t des_ede_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
MBEDTLS_KEY_LENGTH_DES_EDE, MBEDTLS_KEY_LENGTH_DES_EDE,
"DES-EDE-ECB", "DES-EDE-ECB",
8, 0,
0, 0,
8, 8,
&des_ede_info &des_ede_info
@ -1681,7 +1681,7 @@ static const mbedtls_cipher_info_t des_ede3_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
MBEDTLS_KEY_LENGTH_DES_EDE3, MBEDTLS_KEY_LENGTH_DES_EDE3,
"DES-EDE3-ECB", "DES-EDE3-ECB",
8, 0,
0, 0,
8, 8,
&des_ede3_info &des_ede3_info
@ -1796,7 +1796,7 @@ static const mbedtls_cipher_info_t blowfish_ecb_info = {
MBEDTLS_MODE_ECB, MBEDTLS_MODE_ECB,
128, 128,
"BLOWFISH-ECB", "BLOWFISH-ECB",
8, 0,
MBEDTLS_CIPHER_VARIABLE_KEY_LEN, MBEDTLS_CIPHER_VARIABLE_KEY_LEN,
8, 8,
&blowfish_info &blowfish_info