| 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"; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 optional bool sync_tab_favicons = 29; | 87 optional bool sync_tab_favicons = 29; |
| 88 | 88 |
| 89 // The state of the passphrase required to decrypt |encryption_keybag|. | 89 // The state of the passphrase required to decrypt |encryption_keybag|. |
| 90 enum PassphraseType { | 90 enum PassphraseType { |
| 91 // Gaia-based encryption passphrase. Deprecated. | 91 // Gaia-based encryption passphrase. Deprecated. |
| 92 IMPLICIT_PASSPHRASE = 1; | 92 IMPLICIT_PASSPHRASE = 1; |
| 93 // Keystore key encryption passphrase. Uses |keystore_bootstrap| to | 93 // Keystore key encryption passphrase. Uses |keystore_bootstrap| to |
| 94 // decrypt |encryption_keybag|. | 94 // decrypt |encryption_keybag|. |
| 95 KEYSTORE_PASSPHRASE = 2; | 95 KEYSTORE_PASSPHRASE = 2; |
| 96 // Previous Gaia-based passphrase frozen and treated as a custom passphrase. | 96 // Previous Gaia-based passphrase frozen and treated as a custom passphrase. |
| 97 FROZEN_IMPLICIT_PASSPHRASE = 3; | 97 FROZEN_IMPLICIT_PASSPHRASE = 3; |
| 98 // User provided custom passphrase. | 98 // User provided custom passphrase. |
| 99 CUSTOM_PASSPHRASE = 4; | 99 CUSTOM_PASSPHRASE = 4; |
| 100 } | 100 } |
| 101 optional PassphraseType passphrase_type = 30 | 101 optional PassphraseType passphrase_type = 30 [default = IMPLICIT_PASSPHRASE]; |
| 102 [default = IMPLICIT_PASSPHRASE]; | |
| 103 | 102 |
| 104 // The keystore decryptor token blob. Encrypted with the keystore key, and | 103 // The keystore decryptor token blob. Encrypted with the keystore key, and |
| 105 // contains the encryption key used to decrypt |encryption_keybag|. | 104 // contains the encryption key used to decrypt |encryption_keybag|. |
| 106 // Only set if passphrase_state == KEYSTORE_PASSPHRASE. | 105 // Only set if passphrase_state == KEYSTORE_PASSPHRASE. |
| 107 optional EncryptedData keystore_decryptor_token = 31; | 106 optional EncryptedData keystore_decryptor_token = 31; |
| 108 | 107 |
| 109 // The time (in epoch milliseconds) at which the keystore migration was | 108 // The time (in epoch milliseconds) at which the keystore migration was |
| 110 // performed. | 109 // performed. |
| 111 optional int64 keystore_migration_time = 32; | 110 optional int64 keystore_migration_time = 32; |
| 112 | 111 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 135 | 134 |
| 136 // Boolean indicating whether this node was originally missing a | 135 // Boolean indicating whether this node was originally missing a |
| 137 // |keystore_migration_time| field value, and was fixed on the server by | 136 // |keystore_migration_time| field value, and was fixed on the server by |
| 138 // giving the field a value. | 137 // giving the field a value. |
| 139 // THIS FIELD SHOULD ONLY BE SET BY THE SERVER. | 138 // THIS FIELD SHOULD ONLY BE SET BY THE SERVER. |
| 140 optional bool server_only_was_missing_keystore_migration_time = 40; | 139 optional bool server_only_was_missing_keystore_migration_time = 40; |
| 141 | 140 |
| 142 // Boolean corresponding to whether arc pakcage items should be encrypted. | 141 // Boolean corresponding to whether arc pakcage items should be encrypted. |
| 143 optional bool encrypt_arc_package = 41; | 142 optional bool encrypt_arc_package = 41; |
| 144 } | 143 } |
| 145 | |
| OLD | NEW |