Fix cipher context assignment in handlecipherconfig.go

The previous version was always assigning the last cipher context in the slice instead of the one with the correct ID. Signed-off-by: Paul Gaiduk <paulg@zededa.com>
lf-edge · Dec 15, 2023 · 5a232ae · 5a232ae
1 parent 3e63dda
commit 5a232ae
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/pillar/cmd/zedagent/handlecipherconfig.go b/pkg/pillar/cmd/zedagent/handlecipherconfig.go
@@ -114,10 +114,10 @@ func parseCipherBlock(ctx *getconfigContext, key string, cfgCipherBlock *zconfig
 
 	// get CipherContext and embed it into CipherBlockStatus to avoid potential races
 	for _, cfgCipherContext := range ctx.cipherContexts {
-		if cfgCipherContext.ContextID != cipherBlock.CipherContextID {
-			continue
+		if cfgCipherContext.ContextID == cipherBlock.CipherContextID {
+			cipherBlock.CipherContext = &cfgCipherContext
+			break
 		}
-		cipherBlock.CipherContext = &cfgCipherContext
 	}
 
 	if cipherBlock.CipherContext == nil {