Fix the iteration assignment before verifier computation

samadDotDev · samadDotDev · commit 923bd019d0ff · 2024-07-08T19:42:56.000-05:00
diff --git a/src/controller/CommissioningWindowOpener.cpp b/src/controller/CommissioningWindowOpener.cpp
@@ -111,6 +111,7 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindow(const Commissionin
         ReturnErrorOnFailure(DRBG_get_bytes(mPBKDFSaltBuffer, sizeof(mPBKDFSaltBuffer)));
         mPBKDFSalt = ByteSpan(mPBKDFSaltBuffer);
     }
+    mPBKDFIterations = params.GetIteration();
 
     bool randomSetupPIN = !params.HasSetupPIN();
     ReturnErrorOnFailure(
@@ -122,7 +123,6 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindow(const Commissionin
     mCommissioningWindowVerifierCallback = nullptr;
     mNodeId                              = params.GetNodeId();
     mCommissioningWindowTimeout          = params.GetTimeout();
-    mPBKDFIterations                     = params.GetIteration();
 
     if (params.GetReadVIDPIDAttributes())
     {

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindow(const Commissionin`
`111`	`111`	`ReturnErrorOnFailure(DRBG_get_bytes(mPBKDFSaltBuffer, sizeof(mPBKDFSaltBuffer)));`
`112`	`112`	`mPBKDFSalt = ByteSpan(mPBKDFSaltBuffer);`
`113`	`113`	`}`
	`114`	`+ mPBKDFIterations = params.GetIteration();`
`114`	`115`
`115`	`116`	`bool randomSetupPIN = !params.HasSetupPIN();`
`116`	`117`	`ReturnErrorOnFailure(`
`@@ -122,7 +123,6 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindow(const Commissionin`
`122`	`123`	`mCommissioningWindowVerifierCallback = nullptr;`
`123`	`124`	`mNodeId = params.GetNodeId();`
`124`	`125`	`mCommissioningWindowTimeout = params.GetTimeout();`
`125`		`- mPBKDFIterations = params.GetIteration();`
`126`	`126`
`127`	`127`	`if (params.GetReadVIDPIDAttributes())`
`128`	`128`	`{`