From 684c92ca0fcd1120fd539943581c98613ba65ad3 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 30 May 2022 03:08:54 +0800 Subject: [PATCH] bring root keys to AES 0.8 compatibility --- services/root-keys/src/implementation.rs | 3 ++- services/root-keys/src/implementation/keywrap.rs | 2 +- services/root-keys/src/implementation/oracle.rs | 3 ++- services/root-keys/src/main.rs | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/services/root-keys/src/implementation.rs b/services/root-keys/src/implementation.rs index 00cb7b2ad..0dbf6c781 100644 --- a/services/root-keys/src/implementation.rs +++ b/services/root-keys/src/implementation.rs @@ -25,7 +25,8 @@ use graphics_server::BulkRead; use core::mem::size_of; use core::cell::RefCell; -use aes::{Aes256, NewBlockCipher, BlockDecrypt, BlockEncrypt}; +use aes::Aes256; +use aes::cipher::{KeyInit, BlockDecrypt, BlockEncrypt}; use cipher::generic_array::GenericArray; use crate::{SignatureResult, GatewareRegion, MetadataInFlash}; diff --git a/services/root-keys/src/implementation/keywrap.rs b/services/root-keys/src/implementation/keywrap.rs index 5ab95c32f..c622d35b6 100644 --- a/services/root-keys/src/implementation/keywrap.rs +++ b/services/root-keys/src/implementation/keywrap.rs @@ -19,7 +19,7 @@ use aes::cipher::generic_array::GenericArray; use aes::Aes256; -use aes::{BlockDecrypt, BlockEncrypt, NewBlockCipher}; +use aes::cipher::{BlockDecrypt, BlockEncrypt, KeyInit}; use byteorder::{BigEndian, ByteOrder}; use crate::api::KeywrapError; diff --git a/services/root-keys/src/implementation/oracle.rs b/services/root-keys/src/implementation/oracle.rs index 6eb57d657..c58443072 100644 --- a/services/root-keys/src/implementation/oracle.rs +++ b/services/root-keys/src/implementation/oracle.rs @@ -3,7 +3,8 @@ use crate::bitflip; use core::convert::TryInto; -use aes::{Aes256, NewBlockCipher, BlockDecrypt, BlockEncrypt}; +use aes::Aes256; +use aes::cipher::{KeyInit, BlockDecrypt, BlockEncrypt}; use cipher::generic_array::GenericArray; #[derive(Debug, Copy, Clone)] diff --git a/services/root-keys/src/main.rs b/services/root-keys/src/main.rs index 0d59eed00..ffb71be31 100644 --- a/services/root-keys/src/main.rs +++ b/services/root-keys/src/main.rs @@ -94,7 +94,7 @@ mod implementation { use num_traits::*; use crate::{SignatureResult, GatewareRegion, MetadataInFlash}; use aes::Aes256; - use aes::cipher::{BlockDecrypt, BlockEncrypt, NewBlockCipher, generic_array::GenericArray}; + use aes::cipher::{BlockDecrypt, BlockEncrypt, KeyInit, generic_array::GenericArray}; use std::convert::TryInto; #[derive(Debug, Copy, Clone)]