[fix] Derive symmetric key correctly

freak4pc · Sn0wfreezeDev · commit 7d72fa1ac19d · 2023-10-16T17:19:56.000+02:00
diff --git a/OpenHaystack/OpenHaystack/HaystackApp/Model/Accessory.swift b/OpenHaystack/OpenHaystack/HaystackApp/Model/Accessory.swift
@@ -214,7 +214,7 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable, Hashable {
             /// Derive FindMyKeys until we have symmetric key from one week before now
             while self.lastDerivationTimestamp < Date() - TimeInterval(7 * 24 * 60 * 60) {
                 self.lastDerivationTimestamp.addTimeInterval(self.updateInterval)
-                self.oldestRelevantSymmetricKey = Accessory.kdf(inputData: self.symmetricKey, sharedInfo: "update".data(using: .ascii)!, bytesToReturn: 32)
+                self.oldestRelevantSymmetricKey = Accessory.kdf(inputData: self.oldestRelevantSymmetricKey, sharedInfo: "update".data(using: .ascii)!, bytesToReturn: 32)
             }
 
             /// we need to generate Keys from seven days in the past until now and 10 extra keys in case of desynchronization

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable, Hashable {`
`214`	`214`	`/// Derive FindMyKeys until we have symmetric key from one week before now`
`215`	`215`	`while self.lastDerivationTimestamp < Date() - TimeInterval(7 * 24 * 60 * 60) {`
`216`	`216`	`self.lastDerivationTimestamp.addTimeInterval(self.updateInterval)`
`217`		`- self.oldestRelevantSymmetricKey = Accessory.kdf(inputData: self.symmetricKey, sharedInfo: "update".data(using: .ascii)!, bytesToReturn: 32)`
	`217`	`+ self.oldestRelevantSymmetricKey = Accessory.kdf(inputData: self.oldestRelevantSymmetricKey, sharedInfo: "update".data(using: .ascii)!, bytesToReturn: 32)`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`/// we need to generate Keys from seven days in the past until now and 10 extra keys in case of desynchronization`