Merge pull request #25 from OSGP/feature/FDP-2239-hash-obv-nieuwe-psk

FDP-2239: use new psk for calculating hash
OSGP · May 31, 2024 · f37ad90 · f37ad90
2 parents 5480652 + ac02879
commit f37ad90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ion/src/main/kotlin/org/gxf/crestdevicesimulator/simulator/response/command/PskService.kt b/...ion/src/main/kotlin/org/gxf/crestdevicesimulator/simulator/response/command/PskService.kt
@@ -39,8 +39,7 @@ class PskService(
         logger.info { "Validating hash for identity: ${simulatorProperties.pskIdentity}" }
 
         val secret = activePreSharedKey.secret
-        val oldKey = activePreSharedKey.preSharedKey
-        val expectedHash = DigestUtils.sha256Hex("$secret$oldKey")
+        val expectedHash = DigestUtils.sha256Hex("$secret$newPsk")
 
         if (expectedHash != hash) {
             throw InvalidPskHashException("PSK set Hash for Identity ${simulatorProperties.pskIdentity} did not match")

diff --git a/...src/test/kotlin/org/gxf/crestdevicesimulator/simulator/response/command/PskServiceTest.kt b/...src/test/kotlin/org/gxf/crestdevicesimulator/simulator/response/command/PskServiceTest.kt
@@ -71,7 +71,7 @@ class PskServiceTest {
 
     @Test
     fun shouldSetNewPskInStoreWhenTheKeyIsValid() {
-        val expectedHash = DigestUtils.sha256Hex("$secret$oldKey")
+        val expectedHash = DigestUtils.sha256Hex("$secret$newKey")
         val pskCommand = "!PSK:$newKey:${expectedHash};PSK:$newKey:${expectedHash}:SET"
         val psk = PreSharedKey(
             identity,