| 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; | 12 option optimize_for = LITE_RUNTIME; |
| 13 option retain_unknown_fields = true; | |
| 14 | 13 |
| 15 package sync_pb; | 14 package sync_pb; |
| 16 | 15 |
| 17 import "encryption.proto"; | 16 import "encryption.proto"; |
| 18 | 17 |
| 19 message NigoriKey { | 18 message NigoriKey { |
| 20 optional string name = 1; | 19 optional string name = 1; |
| 21 optional bytes user_key = 2; | 20 optional bytes user_key = 2; |
| 22 optional bytes encryption_key = 3; | 21 optional bytes encryption_key = 3; |
| 23 optional bytes mac_key = 4; | 22 optional bytes mac_key = 4; |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 133 |
| 135 // Boolean indicating whether this node was originally missing a | 134 // Boolean indicating whether this node was originally missing a |
| 136 // |keystore_migration_time| field value, and was fixed on the server by | 135 // |keystore_migration_time| field value, and was fixed on the server by |
| 137 // giving the field a value. | 136 // giving the field a value. |
| 138 // THIS FIELD SHOULD ONLY BE SET BY THE SERVER. | 137 // THIS FIELD SHOULD ONLY BE SET BY THE SERVER. |
| 139 optional bool server_only_was_missing_keystore_migration_time = 40; | 138 optional bool server_only_was_missing_keystore_migration_time = 40; |
| 140 | 139 |
| 141 // Boolean corresponding to whether arc pakcage items should be encrypted. | 140 // Boolean corresponding to whether arc pakcage items should be encrypted. |
| 142 optional bool encrypt_arc_package = 41; | 141 optional bool encrypt_arc_package = 41; |
| 143 } | 142 } |
| OLD | NEW |