Fix a regression introduced in #7698 that breaks root token generation.

hashicorp · Oct 24, 2019 · bc503a7 · bc503a7
1 parent 33ff82b
commit bc503a7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/vault/generate_root.go b/vault/generate_root.go
@@ -39,11 +39,11 @@ type GenerateRootStrategy interface {
 type generateStandardRootToken struct{}
 
 func (g generateStandardRootToken) authenticate(ctx context.Context, c *Core, combinedKey []byte) error {
-	_, err := c.unsealKeyToMasterKey(ctx, combinedKey)
+	masterKey, err := c.unsealKeyToMasterKey(ctx, combinedKey)
 	if err != nil {
 		return errwrap.Wrapf("unable to authenticate: {{err}}", err)
 	}
-	if err := c.barrier.VerifyMaster(combinedKey); err != nil {
+	if err := c.barrier.VerifyMaster(masterKey); err != nil {
 		return errwrap.Wrapf("master key verification failed: {{err}}", err)
 	}