Merge branch 'bugfix/cleanup_aes_192_references_for_unsupported_chips' into 'master'

fix(esp_rom): Remove AES - 192 references for unsupported chips

See merge request espressif/esp-idf!37506
This commit is contained in:
Mahavir Jain
2025-03-10 14:06:25 +08:00
11 changed files with 13 additions and 19 deletions

View File

@@ -23,8 +23,7 @@ enum AES_TYPE {
enum AES_BITS {
AES128,
AES192,
AES256
AES256 = 2, /* skipping enum value 1 to keep compatibility with chips that support AES-192 */
};
void ets_aes_enable(void);

View File

@@ -23,8 +23,7 @@ enum AES_TYPE {
enum AES_BITS {
AES128,
AES192,
AES256
AES256 = 2, /* skipping enum value 1 to keep compatibility with chips that support AES-192 */
};
void ets_aes_enable(void);

View File

@@ -23,8 +23,7 @@ enum AES_TYPE {
enum AES_BITS {
AES128,
AES192,
AES256
AES256 = 2, /* skipping enum value 1 to keep compatibility with chips that support AES-192 */
};
void ets_aes_enable(void);

View File

@@ -23,8 +23,7 @@ enum AES_TYPE {
enum AES_BITS {
AES128,
AES192,
AES256
AES256 = 2, /* skipping enum value 1 to keep compatibility with chips that support AES-192 */
};
void ets_aes_enable(void);

View File

@@ -23,8 +23,7 @@ enum AES_TYPE {
enum AES_BITS {
AES128,
AES192,
AES256
AES256 = 2, /* skipping enum value 1 to keep compatibility with chips that support AES-192 */
};
void ets_aes_enable(void);

View File

@@ -20,8 +20,7 @@ enum AES_TYPE {
enum AES_BITS {
AES128,
AES192,
AES256
AES256 = 2, /* skipping enum value 1 to keep compatibility with chips that support AES-192 */
};
void ets_aes_enable(void);

View File

@@ -210,11 +210,11 @@ extern "C" {
/** AES_MODE : R/W; bitpos: [2:0]; default: 0;
* Configures the key length and encryption / decryption of the AES accelerator.\\
* 0: AES-128 encryption\\
* 1: AES-192 encryption\\
* 1: Reserved\\
* 2: AES-256 encryption\\
* 3: Reserved\\
* 4: AES-128 decryption\\
* 5: AES-192 decryption\\
* 5: Reserved\\
* 6: AES-256 decryption\\
* 7: Reserved\\
*/

View File

@@ -209,7 +209,7 @@ extern "C" {
#define AES_MODE_REG (DR_REG_AES_BASE + 0x40)
/** AES_MODE : R/W; bitpos: [2:0]; default: 0;
* This bits decides which one operation mode will be used. 3'd0: AES-EN-128, 3'd1:
* AES-EN-192, 3'd2: AES-EN-256, 3'd4: AES-DE-128, 3'd5: AES-DE-192, 3'd6: AES-DE-256.
* Reserved, 3'd2: AES-EN-256, 3'd4: AES-DE-128, 3'd5: Reserved, 3'd6: AES-DE-256.
*/
#define AES_MODE 0x00000007U
#define AES_MODE_M (AES_MODE_V << AES_MODE_S)

View File

@@ -209,7 +209,7 @@ extern "C" {
#define AES_MODE_REG (DR_REG_AES_BASE + 0x40)
/** AES_MODE : R/W; bitpos: [2:0]; default: 0;
* This bits decides which one operation mode will be used. 3'd0: AES-EN-128, 3'd1:
* AES-EN-192, 3'd2: AES-EN-256, 3'd4: AES-DE-128, 3'd5: AES-DE-192, 3'd6: AES-DE-256.
* Reserved, 3'd2: AES-EN-256, 3'd4: AES-DE-128, 3'd5: Reserved, 3'd6: AES-DE-256.
*/
#define AES_MODE 0x00000007U
#define AES_MODE_M (AES_MODE_V << AES_MODE_S)

View File

@@ -210,11 +210,11 @@ extern "C" {
/** AES_MODE : R/W; bitpos: [2:0]; default: 0;
* Configures the key length and encryption / decryption of the AES accelerator.
* 0: AES-128 encryption
* 1: AES-192 encryption
* 1: Reserved
* 2: AES-256 encryption
* 3: Reserved
* 4: AES-128 decryption
* 5: AES-192 decryption
* 5: Reserved
* 6: AES-256 decryption
* 7: Reserved
*/

View File

@@ -209,7 +209,7 @@ extern "C" {
#define AES_MODE_REG (DR_REG_AES_BASE + 0x40)
/** AES_MODE : R/W; bitpos: [2:0]; default: 0;
* This bits decides which one operation mode will be used. 3'd0: AES-EN-128, 3'd1:
* AES-EN-192, 3'd2: AES-EN-256, 3'd4: AES-DE-128, 3'd5: AES-DE-192, 3'd6: AES-DE-256.
* Reserved, 3'd2: AES-EN-256, 3'd4: AES-DE-128, 3'd5: Reserved, 3'd6: AES-DE-256.
*/
#define AES_MODE 0x00000007U
#define AES_MODE_M (AES_MODE_V << AES_MODE_S)