diff options
| author | Tommy Chiu <tommychiu@google.com> | 2021-05-05 11:44:44 +0800 |
|---|---|---|
| committer | Tommy Chiu <tommychiu@google.com> | 2021-05-15 02:09:04 +0000 |
| commit | b798c457bcff18bc273f7d09cbfdbe7223b583f1 (patch) | |
| tree | 4f7601f34d6767dcb1da0655198da86361600571 | |
| parent | 06fc8c5c1e2d60ca77dd537142905936c126accf (diff) | |
| download | generic-b798c457bcff18bc273f7d09cbfdbe7223b583f1.tar.gz | |
keymint: introduce TagType::BIGNUM
Rename to BIGNUM_ to avoid conflict name in openssl/base.h
```
test/system-test-harness/src/keymaster-import-key-tests.cc:465:9: error: reference to 'BIGNUM' is ambiguous
const BIGNUM *d = EC_KEY_get0_private_key(ec.get());
^
external/boringssl_git/src/include/openssl/base.h:369:26: note: candidate found by name lookup is 'BIGNUM'
typedef struct bignum_st BIGNUM;
```
Change-Id: If4088141b35259c375c1abba7b84ae4851ebeccd
Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/42804
Tested-by: Tommy Chiu <tommychiu@google.com>
Presubmit-Verified: TreeHugger Robot <android-build-prod@system.gserviceaccount.com>
Reviewed-by: Tommy Chiu <tommychiu@google.com>
Reviewed-by: I-Chih Lu <ichihlu@google.com>
| -rw-r--r-- | nugget/proto/nugget/app/keymaster/keymaster_defs.proto | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nugget/proto/nugget/app/keymaster/keymaster_defs.proto b/nugget/proto/nugget/app/keymaster/keymaster_defs.proto index 719215e..da597b1 100644 --- a/nugget/proto/nugget/app/keymaster/keymaster_defs.proto +++ b/nugget/proto/nugget/app/keymaster/keymaster_defs.proto @@ -31,7 +31,7 @@ enum TagType { ULONG = 0x50000; /* 5 << 16 */ DATE = 0x60000; /* 6 << 16 */ BOOL = 0x70000; /* 7 << 16 */ - /* BIGNUM = 0x80000; 8 << 16 */ /* Unused. */ + BIGNUM_ = 0x80000; /* 8 << 16 */ BYTES = 0x90000; /* 9 << 16 */ ULONG_REP = 0xA0000; /* 10 << 16 */ }; @@ -104,7 +104,9 @@ enum Tag { /* RESERVED: AUTH_TOKEN = 0x903ea; // (TagType:BYTES | 1002) */ MAC_LENGTH = 0x303eb; // (TagType:UINT | 1003) RESET_SINCE_ID_ROTATION = 0x703ec; // (TagType:BOOL | 1004) - CONFIRMATION_TOKEN = 0x903ed;// (TagType:BYTES | 1005) + CONFIRMATION_TOKEN = 0x903ed; // (TagType:BYTES | 1005) + CERTIFICATE_SERIAL = 0x803ee; // (TagType:BIGNUM | 1006) + CERTIFICATE_SUBJECT = 0x903ef; // (TagType:BYTES | 1007) }; enum Algorithm { |