diff options
Diffstat (limited to 'cast')
-rw-r--r-- | cast/common/BUILD.gn | 1 | ||||
-rw-r--r-- | cast/common/certificate/cast_cert_validator_unittest.cc | 2 | ||||
-rw-r--r-- | cast/common/certificate/cast_crl_unittest.cc | 2 | ||||
-rw-r--r-- | cast/common/channel/proto/authority_keys.proto | 17 | ||||
-rw-r--r-- | cast/sender/channel/cast_auth_util_unittest.cc | 2 |
5 files changed, 21 insertions, 3 deletions
diff --git a/cast/common/BUILD.gn b/cast/common/BUILD.gn index 4ec3034a..a5c04ec5 100644 --- a/cast/common/BUILD.gn +++ b/cast/common/BUILD.gn @@ -57,6 +57,7 @@ source_set("channel") { proto_library("channel_proto") { sources = [ + "channel/proto/authority_keys.proto", "channel/proto/cast_channel.proto", ] } diff --git a/cast/common/certificate/cast_cert_validator_unittest.cc b/cast/common/certificate/cast_cert_validator_unittest.cc index 7b0ee1d7..c29de9cc 100644 --- a/cast/common/certificate/cast_cert_validator_unittest.cc +++ b/cast/common/certificate/cast_cert_validator_unittest.cc @@ -156,7 +156,7 @@ DateTime MarchFirst2037() { return CreateDate(2037, 3, 1); } -#define TEST_DATA_PREFIX "test/data/cast/common/certificate/" +#define TEST_DATA_PREFIX OPENSCREEN_TEST_DATA_DIR "/cast/common/certificate/" // Tests verifying a valid certificate chain of length 2: // diff --git a/cast/common/certificate/cast_crl_unittest.cc b/cast/common/certificate/cast_crl_unittest.cc index de3d922e..e514756c 100644 --- a/cast/common/certificate/cast_crl_unittest.cc +++ b/cast/common/certificate/cast_crl_unittest.cc @@ -85,7 +85,7 @@ bool TestVerifyRevocation(CastCertError expected_result, return expected_result == result.code(); } -#define TEST_DATA_PREFIX "test/data/cast/common/certificate/" +#define TEST_DATA_PREFIX OPENSCREEN_TEST_DATA_DIR "cast/common/certificate/" bool RunTest(const DeviceCertTest& test_case) { std::unique_ptr<TrustStore> crl_trust_store; diff --git a/cast/common/channel/proto/authority_keys.proto b/cast/common/channel/proto/authority_keys.proto new file mode 100644 index 00000000..5689e364 --- /dev/null +++ b/cast/common/channel/proto/authority_keys.proto @@ -0,0 +1,17 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +syntax = "proto2"; + +option optimize_for = LITE_RUNTIME; + +package cast_channel.proto; + +message AuthorityKeys { + message Key { + required bytes fingerprint = 1; + required bytes public_key = 2; + } + repeated Key keys = 1; +} diff --git a/cast/sender/channel/cast_auth_util_unittest.cc b/cast/sender/channel/cast_auth_util_unittest.cc index 61d49aa1..be8c71e7 100644 --- a/cast/sender/channel/cast_auth_util_unittest.cc +++ b/cast/sender/channel/cast_auth_util_unittest.cc @@ -99,7 +99,7 @@ bool ConvertTimeSeconds(const certificate::DateTime& time, uint64_t* seconds) { return true; } -#define TEST_DATA_PREFIX "test/data/cast/common/certificate/" +#define TEST_DATA_PREFIX OPENSCREEN_TEST_DATA_DIR "cast/common/certificate/" class CastAuthUtilTest : public testing::Test { public: |