| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 // | 4 // |
| 5 // Sync protocol datatype extension for nigori keys. | 5 // Sync protocol datatype extension for nigori keys. |
| 6 | 6 |
| 7 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change | 7 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change |
| 8 // any fields in this file. | 8 // any fields in this file. |
| 9 | 9 |
| 10 syntax = "proto2"; | 10 syntax = "proto2"; |
| 11 | 11 |
| 12 option optimize_for = LITE_RUNTIME; |
| 13 option retain_unknown_fields = true; |
| 14 |
| 12 package sync_pb; | 15 package sync_pb; |
| 13 | 16 |
| 14 import "encryption.proto"; | 17 import "encryption.proto"; |
| 15 | 18 |
| 16 message NigoriKey { | 19 message NigoriKey { |
| 17 optional string name = 1; | 20 optional string name = 1; |
| 18 optional bytes user_key = 2; | 21 optional bytes user_key = 2; |
| 19 optional bytes encryption_key = 3; | 22 optional bytes encryption_key = 3; |
| 20 optional bytes mac_key = 4; | 23 optional bytes mac_key = 4; |
| 21 } | 24 } |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 // The time (in epoch milliseconds) at which the keystore migration was | 105 // The time (in epoch milliseconds) at which the keystore migration was |
| 103 // performed. | 106 // performed. |
| 104 optional int64 keystore_migration_time = 32; | 107 optional int64 keystore_migration_time = 32; |
| 105 | 108 |
| 106 // The time (in epoch milliseconds) at which a custom passphrase was set. | 109 // The time (in epoch milliseconds) at which a custom passphrase was set. |
| 107 // Note: this field may not be set if the custom passphrase was applied before | 110 // Note: this field may not be set if the custom passphrase was applied before |
| 108 // this field was introduced. | 111 // this field was introduced. |
| 109 optional int64 custom_passphrase_time = 33; | 112 optional int64 custom_passphrase_time = 33; |
| 110 } | 113 } |
| 111 | 114 |
| OLD | NEW |