Merge remote-tracking branch 'goog/upstream-master' into nos-merge-upstream
* goog/upstream-master:
keymaster: add TUP related definitions
keymaster: update prototype for SymmetricKey
Change-Id: I4e9c3f513aadbb13330ff39dea4715ae7ebaefe5
diff --git a/nugget/proto/nugget/app/keymaster/keymaster_defs.proto b/nugget/proto/nugget/app/keymaster/keymaster_defs.proto
index 346920a..4a7c155 100644
--- a/nugget/proto/nugget/app/keymaster/keymaster_defs.proto
+++ b/nugget/proto/nugget/app/keymaster/keymaster_defs.proto
@@ -67,6 +67,7 @@
USER_AUTH_TYPE = 0x101f8; // (TagType:ENUM | 504)
AUTH_TIMEOUT = 0x301f9; // (TagType:UINT | 505)
ALLOW_WHILE_ON_BODY = 0x701fa; // (TagType:BOOL | 506)
+ TRUSTED_USER_PRESENCE_REQUIRED = 0x701fb; // (TagType:BOOL | 507)
/* RESERVED: ALL_APPLICATIONS = 0x70258; // (TagType:BOOL | 600) */
APPLICATION_ID = 0x90259; // (TagType:BYTES | 601)
/* RESERVED: EXPORTABLE = 0x7025a; // (TagType:BOOL | 602) */
@@ -236,7 +237,9 @@
VERSION_MISMATCH = 66;
ROLLBACK_RESISTANCE_UNAVAILABLE = 67;
HARDWARE_TYPE_UNAVAILABLE = 68;
- UNKNOWN_ERROR = 69;
+ PROOF_OF_PRESENCE_REQUIRED = 69;
+ CONCURRENT_PROOF_OF_PRESENCE_REQUESTED = 70;
+ UNKNOWN_ERROR = 71;
};
enum HardwareAuthenticatorType {
diff --git a/nugget/proto/nugget/app/keymaster/keymaster_types.proto b/nugget/proto/nugget/app/keymaster/keymaster_types.proto
index c0b8b81..8224e61 100644
--- a/nugget/proto/nugget/app/keymaster/keymaster_types.proto
+++ b/nugget/proto/nugget/app/keymaster/keymaster_types.proto
@@ -84,6 +84,5 @@
}
message SymmetricKey {
- uint32 algorithm = 1;
- bytes material = 2;
+ bytes material = 1;
}