tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Keystore 2.0: Minor update to pregenerated keymint rust bindings." am: ff275a3f59

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/1424935

Change-Id: Ifd115571f0dd75399f145d6ab5c877b1fdbd3247
This commit is contained in:
Treehugger Robot 2020-09-11 16:50:08 +00:00 committed by Automerger Merge Worker
commit e7cc9f51bc
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
keystore2/src/android_hardware_keymint.rs
View file

@ -260,7 +260,7 @@ pub mod aidl {
pub const UNSUPPORTED_EC_CURVE: ErrorCode = -61;
pub const KEY_REQUIRES_UPGRADE: ErrorCode = -62;
pub const ATTESTATION_CHALLENGE_MISSING: ErrorCode = -63;
pub const KEYMASTER_NOT_CONFIGURED: ErrorCode = -64;
pub const KEYMINT_NOT_CONFIGURED: ErrorCode = -64;
pub const ATTESTATION_APPLICATION_ID_MISSING: ErrorCode = -65;
pub const CANNOT_ATTEST_IDS: ErrorCode = -66;
pub const ROLLBACK_RESISTANCE_UNAVAILABLE: ErrorCode = -67;
@ -1243,6 +1243,7 @@ pub mod aidl {
pub const GENERATED: KeyOrigin = 0;
pub const DERIVED: KeyOrigin = 1;
pub const IMPORTED: KeyOrigin = 2;
pub const RESERVED: KeyOrigin = 3;
pub const SECURELY_IMPORTED: KeyOrigin = 4;
pub(crate) mod mangled { pub use super::KeyOrigin as _7_android_8_hardware_7_keymint_9_KeyOrigin; }
}