Skip to content

Commit 03177d2

Browse files
theonlytruealextheonlytruealex
committed
changed enum from chips/earlgrey/src back, updated documentation
1 parent e9b7221 commit 03177d2

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎chips/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ HIL Support
5454
| sensors::TemperatureDriver | | | | | | | | | | | ✓ | ✓ | ✓ | | | | | | | | | | | | |
5555
| spi::SpiMaster | ✓ | | | | | | | | ✓ | | ✓ | ✓ | ✓ | | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
5656
| spi::SpiSlave | | | | | | | | | | | | | | | | ✓ | | | | | | | | | |
57-
| symmetric_encryption::AES128 | | | | | ✓ | | | | | | ✓ | ✓ | ✓ | | | ✓ | | | | | | | | | |
58-
| symmetric_encryption::AES128CBC | | | | | ✓ | | | | | | ✓ | ✓ | ✓ | | | ✓ | | | | | | | | | |
59-
| symmetric_encryption::AES128CCM | | | | | | | | | | | ✓ | ✓ | ✓ | | | | | | | | | | | | |
60-
| symmetric_encryption::AES128Ctr | | | | | ✓ | | | | | | ✓ | ✓ | ✓ | | | ✓ | | | | | | | | | |
61-
| symmetric_encryption::AES128ECB | | | | | ✓ | | | | | | ✓ | ✓ | ✓ | | | ✓ | | | | | | | | |
57+
| symmetric_encryption::AES | | | | | ✓ | | | | | | ✓ | ✓ | ✓ | | | ✓ | | | | | | | | | |
58+
| symmetric_encryption::AESCBC | | | | | ✓ | | | | | | ✓ | ✓ | ✓ | | | ✓ | | | | | | | | | |
59+
| symmetric_encryption::AESCCM | | | | | | | | | | | ✓ | ✓ | ✓ | | | | | | | | | | | | |
60+
| symmetric_encryption::AESCtr | | | | | ✓ | | | | | | ✓ | ✓ | ✓ | | | ✓ | | | | | | | | | |
61+
| symmetric_encryption::AESECB | | | | | ✓ | | | | | | ✓ | ✓ | ✓ | | | ✓ | | | | | | | | |
6262
| time::Alarm | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | ✓ |
6363
| time::Counter | ✓ | | | | ✓ | ✓ | | | | ✓ | ✓ | ✓ | ✓ | | | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | ✓ |
6464
| time::Frequency | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | | | | ✓ | | | | | | | | | | | ✓ |

‎chips/earlgrey/src/aes.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ register_bitfields![u32,
109109
enum Mode {
110110
IDLE,
111111
AES128CTR,
112-
AESCBC,
113-
AESECB,
112+
AES128CBC,
113+
AES128ECB,
114114
}
115115

116116
// https://docs.opentitan.org/hw/top_earlgrey/doc/
@@ -462,7 +462,7 @@ impl kernel::hil::symmetric_encryption::AESCtr for Aes<'_> {
462462
impl kernel::hil::symmetric_encryption::AESECB for Aes<'_> {
463463
fn set_mode_aesecb(&self, encrypting: bool) -> Result<(), ErrorCode> {
464464
self.wait_on_idle_ready()?;
465-
self.mode.set(Mode::AESECB);
465+
self.mode.set(Mode::AES128ECB);
466466

467467
let mut ctrl = if encrypting {
468468
CTRL::OPERATION::Encrypting
@@ -485,7 +485,7 @@ impl kernel::hil::symmetric_encryption::AESECB for Aes<'_> {
485485
impl kernel::hil::symmetric_encryption::AESCBC for Aes<'_> {
486486
fn set_mode_aescbc(&self, encrypting: bool) -> Result<(), ErrorCode> {
487487
self.wait_on_idle_ready()?;
488-
self.mode.set(Mode::AESCBC);
488+
self.mode.set(Mode::AES128CBC);
489489

490490
let mut ctrl = if encrypting {
491491
CTRL::OPERATION::Encrypting

‎kernel/src/hil/symmetric_encryption.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
use crate::ErrorCode;
1111

12-
/// Implement this trait and use `set_client()` in order to receive callbacks from an `AES128`
12+
/// Implement this trait and use `set_client()` in order to receive callbacks from an `AES`
1313
/// instance.
1414
pub trait Client<'a> {
1515
fn crypt_done(&'a self, source: Option<&'static mut [u8]>, dest: &'static mut [u8]);

0 commit comments

Comments
 (0)