From ca7a84b8aea203025acbda193f78ea98946236b5 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 8 Apr 2022 23:16:59 -0700 Subject: Switch to google.golang.org/protobuf/proto github.com/golang/protobuf/proto has been deprecated in favor of google.golang.org/protobuf/proto, so migrate to the non-deprecated one. --- actions/recovery.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'actions/recovery.go') 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 } -- cgit v1.2.3