|
4 | 4 |
|
5 | 5 | //! A configuration of a trust quroum at a given epoch
|
6 | 6 |
|
7 |
| -use crate::crypto::{EncryptedRackSecret, RackSecret, Salt, Sha3_256Digest}; |
| 7 | +use crate::crypto::{EncryptedRackSecrets, RackSecret, Sha3_256Digest}; |
8 | 8 | use crate::validators::ValidatedReconfigureMsg;
|
9 | 9 | use crate::{Epoch, PlatformId, Threshold};
|
10 | 10 | use gfss::shamir::{Share, SplitError};
|
@@ -47,8 +47,8 @@ pub struct Configuration {
|
47 | 47 | /// The number of sleds required to reconstruct the rack secret
|
48 | 48 | pub threshold: Threshold,
|
49 | 49 |
|
50 |
| - // There is no previous configuration for the initial configuration |
51 |
| - pub previous_configuration: Option<PreviousConfiguration>, |
| 50 | + // There are no encrypted rack secrets for the initial configuration |
| 51 | + pub encrypted_rack_secrets: Option<EncryptedRackSecrets>, |
52 | 52 | }
|
53 | 53 |
|
54 | 54 | impl IdOrdItem for Configuration {
|
@@ -105,34 +105,9 @@ impl Configuration {
|
105 | 105 | coordinator,
|
106 | 106 | members,
|
107 | 107 | threshold: reconfigure_msg.threshold(),
|
108 |
| - previous_configuration: None, |
| 108 | + encrypted_rack_secrets: None, |
109 | 109 | },
|
110 | 110 | shares,
|
111 | 111 | ))
|
112 | 112 | }
|
113 | 113 | }
|
114 |
| - |
115 |
| -/// Information for the last committed configuration that is necessary to track |
116 |
| -/// in the next `Configuration`. |
117 |
| -#[derive( |
118 |
| - Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, |
119 |
| -)] |
120 |
| -pub struct PreviousConfiguration { |
121 |
| - /// The epoch of the last committed configuration |
122 |
| - pub epoch: Epoch, |
123 |
| - |
124 |
| - /// Is the previous configuration LRTQ? |
125 |
| - pub is_lrtq: bool, |
126 |
| - |
127 |
| - /// The encrypted rack secret for the last committed epoch |
128 |
| - /// |
129 |
| - /// This allows us to derive old encryption keys so they can be rotated |
130 |
| - pub encrypted_last_committed_rack_secret: EncryptedRackSecret, |
131 |
| - |
132 |
| - /// A random value used to derive the key to encrypt the rack secret from |
133 |
| - /// the last committed epoch. |
134 |
| - /// |
135 |
| - /// We only encrypt the rack secret once and so we use a nonce of all zeros. |
136 |
| - /// This is why there is no corresponding `nonce` field. |
137 |
| - pub encrypted_last_committed_rack_secret_salt: Salt, |
138 |
| -} |
0 commit comments