partial progress on CBC porting.

man this GenericArray shit is so annoying.
This commit is contained in:
bunnie 2022-05-30 13:46:09 +08:00
parent 82a7ddddc7
commit 764a8ad195
2 changed files with 247 additions and 6 deletions

248
Cargo.lock generated
View file

@ -95,6 +95,12 @@ version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
[[package]]
name = "arrayref"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
[[package]]
name = "atomic-polyfill"
version = "0.1.8"
@ -170,12 +176,24 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603"
[[package]]
name = "base16ct"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
[[package]]
name = "base64"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "base64ct"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179"
[[package]]
name = "bincode"
version = "1.3.3"
@ -230,6 +248,15 @@ dependencies = [
"generic-array",
]
[[package]]
name = "block-padding"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78"
dependencies = [
"generic-array",
]
[[package]]
name = "blowfish"
version = "0.8.0"
@ -311,6 +338,19 @@ dependencies = [
"rustc_version 0.4.0",
]
[[package]]
name = "cbc"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
dependencies = [
"cipher 0.4.3",
]
[[package]]
name = "cbor"
version = "0.1.0"
[[package]]
name = "cc"
version = "1.0.73"
@ -473,6 +513,12 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "const-oid"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
[[package]]
name = "content-plugin-api"
version = "0.1.0"
@ -622,6 +668,18 @@ dependencies = [
"lazy_static",
]
[[package]]
name = "crypto-bigint"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
dependencies = [
"generic-array",
"rand_core 0.6.3",
"subtle",
"zeroize",
]
[[package]]
name = "crypto-common"
version = "0.1.3"
@ -664,6 +722,21 @@ dependencies = [
"memchr",
]
[[package]]
name = "ctap-crypto"
version = "0.1.0"
dependencies = [
"aes 0.8.1",
"arrayref",
"cbc",
"cbor",
"p256",
"rand_core 0.5.1",
"subtle",
"trng",
"xous-names",
]
[[package]]
name = "ctr"
version = "0.9.1"
@ -774,6 +847,15 @@ dependencies = [
"syn",
]
[[package]]
name = "der"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
dependencies = [
"const-oid",
]
[[package]]
name = "digest"
version = "0.9.0"
@ -816,6 +898,18 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
name = "ecdsa"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
dependencies = [
"der",
"elliptic-curve",
"rfc6979",
"signature",
]
[[package]]
name = "ed25519"
version = "1.5.2"
@ -865,6 +959,24 @@ version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "elliptic-curve"
version = "0.11.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
dependencies = [
"base16ct",
"crypto-bigint",
"der",
"ff",
"generic-array",
"group",
"rand_core 0.6.3",
"sec1",
"subtle",
"zeroize",
]
[[package]]
name = "embedded-hal"
version = "0.2.7"
@ -961,6 +1073,16 @@ dependencies = [
"instant",
]
[[package]]
name = "ff"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924"
dependencies = [
"rand_core 0.6.3",
"subtle",
]
[[package]]
name = "ffi-sys"
version = "0.1.0"
@ -1294,6 +1416,17 @@ dependencies = [
"xous-names",
]
[[package]]
name = "group"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
dependencies = [
"ff",
"rand_core 0.6.3",
"subtle",
]
[[package]]
name = "half"
version = "1.8.2"
@ -1501,6 +1634,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
dependencies = [
"block-padding",
"generic-array",
]
@ -2082,6 +2216,18 @@ dependencies = [
"web-sys",
]
[[package]]
name = "p256"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19736d80675fbe9fe33426268150b951a3fb8f5cfca2a23a17c85ef3adb24e3b"
dependencies = [
"ecdsa",
"elliptic-curve",
"sec1",
"sha2",
]
[[package]]
name = "packed_simd_2"
version = "0.3.7"
@ -2187,6 +2333,17 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkcs8"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
dependencies = [
"der",
"spki",
"zeroize",
]
[[package]]
name = "pkg-config"
version = "0.3.25"
@ -2496,6 +2653,17 @@ dependencies = [
"xous-names",
]
[[package]]
name = "rfc6979"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
dependencies = [
"crypto-bigint",
"hmac",
"zeroize",
]
[[package]]
name = "ring"
version = "0.16.20"
@ -2716,6 +2884,19 @@ dependencies = [
"version-compare",
]
[[package]]
name = "sec1"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
dependencies = [
"der",
"generic-array",
"pkcs8",
"subtle",
"zeroize",
]
[[package]]
name = "semver"
version = "0.9.0"
@ -2897,9 +3078,13 @@ dependencies = [
[[package]]
name = "signature"
version = "1.5.0"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4"
checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
dependencies = [
"digest",
"rand_core 0.6.3",
]
[[package]]
name = "slab"
@ -2983,6 +3168,16 @@ dependencies = [
"xous-names",
]
[[package]]
name = "spki"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
dependencies = [
"base64ct",
"der",
]
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
@ -3405,7 +3600,7 @@ dependencies = [
"susres",
"ticktimer-server",
"usb-device",
"usbd-human-interface-device",
"usbd-human-interface-device 0.1.1 (git+https://github.com/betrusted-io/usbd-human-interface-device.git?branch=main)",
"utralib",
"vcell",
"xous",
@ -3429,7 +3624,7 @@ dependencies = [
"susres",
"ticktimer-server",
"usb-device",
"usbd-human-interface-device",
"usbd-human-interface-device 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"utralib",
"vcell",
"xous",
@ -3454,6 +3649,23 @@ dependencies = [
"usb-device",
]
[[package]]
name = "usbd-human-interface-device"
version = "0.1.1"
source = "git+https://github.com/betrusted-io/usbd-human-interface-device.git?branch=main#744ab68464daf2f419b0149bc95ce41b01c7623d"
dependencies = [
"delegate",
"embedded-time",
"frunk",
"hash32",
"hash32-derive",
"heapless",
"log",
"num_enum",
"packed_struct",
"usb-device",
]
[[package]]
name = "utralib"
version = "0.1.0"
@ -3461,6 +3673,34 @@ dependencies = [
"svd2utra",
]
[[package]]
name = "vault"
version = "0.1.0"
dependencies = [
"arrayref",
"byteorder",
"cbor",
"content-plugin-api",
"ctap-crypto",
"gam",
"graphics-server",
"ime-plugin-api",
"ime-plugin-shell",
"locales",
"log",
"log-server",
"num-derive",
"num-traits",
"pddb",
"subtle",
"tts-frontend",
"usb-device-xous",
"usbd-human-interface-device 0.1.1 (git+https://github.com/betrusted-io/usbd-human-interface-device.git?branch=main)",
"xous",
"xous-ipc 0.9.7",
"xous-names",
]
[[package]]
name = "vcell"
version = "0.1.3"

View file

@ -27,7 +27,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use aes::cipher::{BlockDecryptMut, BlockEncryptMut, KeyIvInit};
use aes::cipher::{BlockDecryptMut, BlockEncryptMut, KeyIvInit,
generic_array::GenericArray, Key, Iv};
type Aes256CbcEnc = cbc::Encryptor<aes::Aes256>;
type Aes256CbcDec = cbc::Decryptor<aes::Aes256>;
@ -36,7 +37,7 @@ use super::util::Block16;
pub fn cbc_encrypt(key: &[u8; 32], mut iv: Block16, blocks: &mut [Block16])
{
Aes256CbcEnc::new(&key.into(), &iv.into())
Aes256CbcEnc::new(Key::from_slice(key), Iv::from_slice(&iv))
.encrypt_blocks_mut(blocks);
}