summaryrefslogtreecommitdiffstats
path: root/include/keymaster
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-01-22 20:18:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-01-22 20:18:17 +0000
commitd16d923716a4e54ca4c9003ff4b356705f1e10b7 (patch)
tree46b2c0256d48ee74cb7279a9bc33be077d519a08 /include/keymaster
parent4db0dd2bbb9ac15c03da8f5961ad267d35dc3f8f (diff)
parent3c665a20c7a63fc601b5d21d8bf7a1b5567ffa6f (diff)
downloadandroid_system_keymaster-d16d923716a4e54ca4c9003ff4b356705f1e10b7.tar.gz
android_system_keymaster-d16d923716a4e54ca4c9003ff4b356705f1e10b7.tar.bz2
android_system_keymaster-d16d923716a4e54ca4c9003ff4b356705f1e10b7.zip
Merge "Add additional parameters to importWrappedKey"
Diffstat (limited to 'include/keymaster')
-rw-r--r--include/keymaster/android_keymaster_messages.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/keymaster/android_keymaster_messages.h b/include/keymaster/android_keymaster_messages.h
index 9c49145..ec7bb58 100644
--- a/include/keymaster/android_keymaster_messages.h
+++ b/include/keymaster/android_keymaster_messages.h
@@ -790,6 +790,8 @@ struct ImportWrappedKeyRequest : public KeymasterMessage {
KeymasterKeyBlob wrapping_key;
KeymasterKeyBlob masking_key;
AuthorizationSet additional_params;
+ uint64_t password_sid;
+ uint64_t biometric_sid;
};
struct ImportWrappedKeyResponse : public KeymasterResponse {