aboutsummaryrefslogtreecommitdiff
path: root/actions/recovery.go
diff options
context:
space:
mode:
authorJoseph Richey <joerichey@google.com>2022-04-09 01:44:51 -0700
committerGitHub <noreply@github.com>2022-04-09 01:44:51 -0700
commit53dc5f37339f40e78cd0e91b358322cc9e589185 (patch)
tree68eb53440456ff6cc9c6ecef8b0567510de5310a /actions/recovery.go
parentce8a5583c1cc2327cf65a048cfd1083225dad50e (diff)
parentba0a96b04b08f8c8b533d7dab7e6326c5ecd6ace (diff)
Merge pull request #354 from google/staticcheck-fix
Upgrade dependencies to latest version
Diffstat (limited to 'actions/recovery.go')
-rw-r--r--actions/recovery.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/recovery.go b/actions/recovery.go
index 8a769cc..2bb8a23 100644
--- a/actions/recovery.go
+++ b/actions/recovery.go
@@ -23,6 +23,8 @@ import (
"os"
"strconv"
+ "google.golang.org/protobuf/proto"
+
"github.com/google/fscrypt/crypto"
"github.com/google/fscrypt/metadata"
"github.com/google/fscrypt/util"
@@ -31,10 +33,10 @@ import (
// modifiedContextWithSource returns a copy of ctx with the protector source
// replaced by source.
func modifiedContextWithSource(ctx *Context, source metadata.SourceType) *Context {
- modifiedConfig := *ctx.Config
+ modifiedConfig := proto.Clone(ctx.Config).(*metadata.Config)
modifiedConfig.Source = source
modifiedCtx := *ctx
- modifiedCtx.Config = &modifiedConfig
+ modifiedCtx.Config = modifiedConfig
return &modifiedCtx
}