Two minor changes not reflected OSS side (#11020)
This commit is contained in:
parent
016ed8dd5e
commit
a7b372b447
|
@ -193,6 +193,7 @@ func printKeyStatus(ks *api.KeyStatus) string {
|
|||
return columnOutput([]string{
|
||||
fmt.Sprintf("Key Term | %d", ks.Term),
|
||||
fmt.Sprintf("Install Time | %s", ks.InstallTime.UTC().Format(time.RFC822)),
|
||||
fmt.Sprintf("Encryption Count | %d", ks.Encryptions),
|
||||
}, nil)
|
||||
}
|
||||
|
||||
|
|
|
@ -212,6 +212,7 @@ func DeserializeKeyring(buf []byte) (*Keyring, error) {
|
|||
// Create a new keyring
|
||||
k := NewKeyring()
|
||||
k.masterKey = enc.MasterKey
|
||||
k.rotationConfig = enc.RotationConfig
|
||||
for _, key := range enc.Keys {
|
||||
k.keys[key.Term] = key
|
||||
if key.Term > k.activeTerm {
|
||||
|
|
Loading…
Reference in New Issue