Updating UUIDs for macOS 11.6

nrf52832 pin layout
Copying public to clipboard as Byte array or escaped string
2026-02-17 11:09:53 +00:00 · 2021-09-21 17:27:34 +02:00 · 2021-08-25 15:53:03 +02:00 · 2021-08-25 14:39:58 +02:00 · 2021-08-06 11:46:56 +02:00 · 2021-08-06 11:23:47 +02:00
14 changed files with 193 additions and 56 deletions
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/build-app.yml
@@ -18,7 +18,7 @@ defaults:

 jobs:
  format-swift:
-    runs-on: macos-latest
+    runs-on: macos-11
    steps:
      - name: "Checkout code"
        uses: actions/checkout@v2
--- a/.github/workflows/build-cve-2020-9986.yaml
+++ b/.github/workflows/build-cve-2020-9986.yaml
@@ -16,7 +16,7 @@ defaults:

 jobs:
  lint-swiftlint:
-    runs-on: macos-latest
+    runs-on: macos-11
    steps:
      - name: "Checkout code"
        uses: actions/checkout@v2
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -16,7 +16,7 @@ defaults:

 jobs:
  build-firmware:
-    runs-on: macos-latest
+    runs-on: macos-11
    steps:
      - uses: actions/checkout@v2

--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:

  build-and-release:
    name: "Create release on GitHub"
-    runs-on: macos-latest
+    runs-on: macos-11
    env:
      APP: OpenHaystack
      PROJECT_DIR: OpenHaystack
--- a/OpenHaystack/OpenHaystack/BoringSSL/BoringSSL.m
+++ b/OpenHaystack/OpenHaystack/BoringSSL/BoringSSL.m
@@ -72,7 +72,7 @@
    // Public key will be stored in point
    int res = EC_POINT_oct2point(group, point, pointBytes.bytes, pointBytes.length, ctx);
    [self printPoint:point withGroup:group];
-
+    
    // Free the big numbers
    BN_CTX_free(ctx);

@@ -117,9 +117,7 @@

    // Free
    BN_CTX_free(ctx);
-    
-    
-    
+
    return key;
 }

@@ -159,6 +157,8 @@
    NSMutableData *privateKeyBytes = [[NSMutableData alloc] initWithLength:keySize];

    size_t size = BN_bn2bin(privateKey, privateKeyBytes.mutableBytes);
+    
+    

    EC_KEY_free(key); 
    if (size == 0) {
--- a/OpenHaystack/OpenHaystack/HaystackApp/FileManager.swift
+++ b/OpenHaystack/OpenHaystack/HaystackApp/FileManager.swift
@@ -30,8 +30,14 @@ extension FileManager {
            if isDir.boolValue == true {
                try self.copyFolder(from: fileURL, to: to.appendingPathComponent(file))
            } else {
-                // Copy file
-                try FileManager.default.copyItem(at: fileURL, to: to.appendingPathComponent(file))
+                do {
+                    // Copy file
+                    try FileManager.default.copyItem(at: fileURL, to: to.appendingPathComponent(file))
+                } catch {
+                    if fileURL.lastPathComponent != "CodeResources" {
+                        throw error
+                    }
+                }
            }
        }
    }
--- a/OpenHaystack/OpenHaystack/HaystackApp/Mail
+++ b/OpenHaystack/OpenHaystack/HaystackApp/Mail
@@ -20,8 +20,36 @@ struct MailPluginManager {

    let pluginURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent("Library/Mail/Bundles").appendingPathComponent(mailBundleName + ".mailbundle")

+    let localPluginURL = Bundle.main.url(forResource: mailBundleName, withExtension: "mailbundle")!
+
    var isMailPluginInstalled: Bool {
-        return FileManager.default.fileExists(atPath: pluginURL.path)
+        //Check if the plug-in is compatible by comparing the IDs
+        guard FileManager.default.fileExists(atPath: pluginURL.path) else {
+            return false
+        }
+
+        let infoPlistURL = pluginURL.appendingPathComponent("Contents/Info.plist")
+        let localInfoPlistURL = localPluginURL.appendingPathComponent("Contents/Info.plist")
+
+        guard let infoPlistData = try? Data(contentsOf: infoPlistURL),
+            let infoPlistDict = try? PropertyListSerialization.propertyList(from: infoPlistData, options: [], format: nil) as? [String: AnyHashable],
+            let localInfoPlistData = try? Data(contentsOf: localInfoPlistURL),
+            let localInfoPlistDict = try? PropertyListSerialization.propertyList(from: localInfoPlistData, options: [], format: nil) as? [String: AnyHashable]
+        else { return false }
+
+        //Compare the supported plug-ins
+        let uuidEntries = localInfoPlistDict.keys.filter({ $0.contains("PluginCompatibilityUUIDs") })
+        for uuidEntry in uuidEntries {
+            guard let localEntry = localInfoPlistDict[uuidEntry] as? [String],
+                let installedEntry = infoPlistDict[uuidEntry] as? [String]
+            else { return false }
+
+            if localEntry != installedEntry {
+                return false
+            }
+        }
+
+        return true
    }

    /// Shows a NSSavePanel to install the mail plugin at the required place.
@@ -58,9 +86,12 @@ struct MailPluginManager {
            throw PluginError.permissionNotGranted
        }

-        let localPluginURL = Bundle.main.url(forResource: mailBundleName, withExtension: "mailbundle")!
-
        do {
+            //Remove old plug-ins first
+            if FileManager.default.fileExists(atPath: pluginURL.path) {
+                try FileManager.default.removeItem(at: pluginURL)
+            }
+
            try FileManager.default.createDirectory(at: pluginsFolderURL, withIntermediateDirectories: true, attributes: nil)
        } catch {
            print(error.localizedDescription)
--- a/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift
+++ b/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift
@@ -19,10 +19,10 @@ struct PreviewData {
    static let latitude: Double = 49.878046
    static let longitude: Double = 8.656993

-    static func randomLocation() -> CLLocation {
+    static func randomLocation(lat: Double = latitude, lng: Double = longitude, distance: Double = 0.005) -> CLLocation {
        return CLLocation(
-            latitude: latitude + Double.random(in: 0..<0.005) * (Bool.random() ? -1 : 1),
-            longitude: longitude + Double.random(in: 0..<0.005) * (Bool.random() ? -1 : 1)
+            latitude: lat + Double.random(in: 0..<distance) * (Bool.random() ? -1 : 1),
+            longitude: lng + Double.random(in: 0..<distance) * (Bool.random() ? -1 : 1)
        )
    }

@@ -37,6 +37,16 @@ struct PreviewData {
        accessory.isDeployed = true
        accessory.isActive = true
        accessory.isNearby = Bool.random()
+        //Generate recent locations
+        let startDate = Date().addingTimeInterval(-60 * 60 * 24)
+        var date = startDate
+        var locations: [FindMyLocationReport] = []
+        while date < Date() {
+            let location = randomLocation(lat: accessory.lastLocation!.coordinate.latitude, lng: accessory.lastLocation!.coordinate.longitude, distance: 0.0005)
+            locations.append(FindMyLocationReport(lat: location.coordinate.latitude, lng: location.coordinate.longitude, acc: 10, dP: date, t: date, c: 0))
+            date += 30 * 60
+        }
+        accessory.locations = locations
        return accessory
    }

--- a/OpenHaystack/OpenHaystack/HaystackApp/Views/AccessoryListEntry.swift
+++ b/OpenHaystack/OpenHaystack/HaystackApp/Views/AccessoryListEntry.swift
@@ -71,8 +71,12 @@ struct AccessoryListEntry: View {
            Divider()
            Button("Rename", action: { self.editingName = true })
            Divider()
-            Button("Copy advertisment key (Base64)", action: { self.copyPublicKey(of: accessory) })
            Button("Copy key ID (Base64)", action: { self.copyPublicKeyHash(of: accessory) })
+            Menu("Copy advertisement key") {
+                Button("Base64", action: { self.copyAdvertisementKeyB64(of: accessory) })
+                Button("Byte array", action: { self.copyAdvertisementKey(escapedString: false) })
+                Button("Escaped string", action: { self.copyAdvertisementKey(escapedString: true) })
+            }
            Divider()
            Button("Mark as \(accessory.isDeployed ? "deployable" : "deployed")", action: { accessory.isDeployed.toggle() })
        }
@@ -90,6 +94,18 @@ struct AccessoryListEntry: View {
        }
    }

+    func copyAdvertisementKeyB64(of accessory: Accessory) {
+        do {
+            let publicKey = try accessory.getAdvertisementKey()
+            let pasteboard = NSPasteboard.general
+            pasteboard.prepareForNewContents(with: .currentHostOnly)
+            pasteboard.setString(publicKey.base64EncodedString(), forType: .string)
+        } catch {
+            os_log("Failed extracing public key %@", String(describing: error))
+            assert(false)
+        }
+    }
+
    func copyPublicKeyHash(of accessory: Accessory) {
        do {
            let keyID = try accessory.getKeyId()
@@ -102,6 +118,28 @@ struct AccessoryListEntry: View {
        }
    }

+    func copyAdvertisementKey(escapedString: Bool) {
+        do {
+            let publicKey = try self.accessory.getAdvertisementKey()
+            let keyByteArray = [UInt8](publicKey)
+
+            if escapedString {
+                let string = keyByteArray.map { "\\x\(String($0, radix: 16))" }.joined()
+                let pasteboard = NSPasteboard.general
+                pasteboard.prepareForNewContents(with: .currentHostOnly)
+                pasteboard.setString(string, forType: .string)
+            } else {
+                let string = keyByteArray.map { "0x\(String($0, radix: 16))" }.joined(separator: ", ")
+                let pasteboard = NSPasteboard.general
+                pasteboard.prepareForNewContents(with: .currentHostOnly)
+                pasteboard.setString(string, forType: .string)
+            }
+        } catch {
+            os_log("Failed extracing public key %@", String(describing: error))
+            assert(false)
+        }
+    }
+
    struct AccessoryListEntry_Previews: PreviewProvider {
        @StateObject static var accessory = PreviewData.accessories.first!
        @State static var alertType: OpenHaystackMainView.AlertType?
--- a/OpenHaystack/OpenHaystack/OpenHaystackApp.swift
+++ b/OpenHaystack/OpenHaystack/OpenHaystackApp.swift
@@ -13,12 +13,16 @@ import SwiftUI
 struct OpenHaystackApp: App {
    @StateObject var accessoryController: AccessoryController
    var accessoryNearbyMonitor: AccessoryNearbyMonitor?
+    var frameWidth: CGFloat? = nil
+    var frameHeight: CGFloat? = nil

    init() {
        let accessoryController: AccessoryController
        if ProcessInfo().arguments.contains("-preview") {
            accessoryController = AccessoryControllerPreview(accessories: PreviewData.accessories, findMyController: FindMyController())
            self.accessoryNearbyMonitor = nil
+            //            self.frameWidth = 1920
+            //            self.frameHeight = 1080
        } else {
            accessoryController = AccessoryController()
            self.accessoryNearbyMonitor = AccessoryNearbyMonitor(accessoryController: accessoryController)
@@ -30,6 +34,7 @@ struct OpenHaystackApp: App {
        WindowGroup {
            OpenHaystackMainView()
                .environmentObject(self.accessoryController)
+                .frame(width: self.frameWidth, height: self.frameHeight)
        }
        .commands {
            SidebarCommands()
--- a/OpenHaystack/OpenHaystackMail/Info.plist
+++ b/OpenHaystack/OpenHaystackMail/Info.plist
@@ -22,43 +22,89 @@
 	<string>Copyright © 2021 SEEMOO – TU Darmstadt</string>
 	<key>NSPrincipalClass</key>
 	<string>OpenHaystackPluginService</string>
-	<key>Supported10.15PluginCompatibilityUUIDs</key>
-	<array>
-		<string># UUIDs for versions from 10.12 to 99.99.99</string>
-		<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
-		<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
-		<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
-		<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
-		<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
-		<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
-		<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
-		<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
-		<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
-		<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
-		<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
-		<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
-		<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
-		<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
-	</array>
-	<key>Supported11.0PluginCompatibilityUUIDs</key>
-	<array>
-		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-	</array>
-	<key>Supported11.1PluginCompatibilityUUIDs</key>
-	<array>
-		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-	</array>
-	<key>Supported11.2PluginCompatibilityUUIDs</key>
-	<array>
-		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-	</array>
-	<key>Supported11.3PluginCompatibilityUUIDs</key>
-	<array>
-		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-	</array>
-	<key>Supported11.4PluginCompatibilityUUIDs</key>
-	<array>
-		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-	</array>
+    <key>Supported10.14PluginCompatibilityUUIDs</key>
+        <array>
+            <string># UUIDs for versions from 10.12 to 99.99.99</string>
+            <string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
+            <string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
+            <string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
+            <string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
+            <string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
+            <string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
+            <string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
+            <string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
+            <string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
+            <string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
+            <string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
+            <string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
+            <string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
+            <string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
+        </array>
+        <key>Supported10.15PluginCompatibilityUUIDs</key>
+        <array>
+            <string># UUIDs for versions from 10.12 to 99.99.99</string>
+            <string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
+            <string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
+            <string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
+            <string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
+            <string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
+            <string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
+            <string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
+            <string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
+            <string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
+            <string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
+            <string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
+            <string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
+            <string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
+            <string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
+        </array>
+        <key>Supported11.0PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.10PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.1PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.2PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.3PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.4PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.5PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.6PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.7PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.8PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported11.9PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
+        <key>Supported12.0PluginCompatibilityUUIDs</key>
+        <array>
+            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+        </array>
 </dict>
 </plist>
--- a/README.md
+++ b/README.md
@@ -123,7 +123,8 @@ Feel free to port OpenHaystack to other devices that support Bluetooth Low Energ

 ## References

- Alexander Heinrich, Milan Stute, Tim Kornhuber, Matthias Hollick. **Who Can _Find My_ Devices? Security and Privacy of Apple's Crowd-Sourced Bluetooth Location Tracking System.** _Proceedings on Privacy Enhancing Technologies (PoPETs)_, 2021. [📄 Preprint](https://arxiv.org/abs/2103.02282).
+- Alexander Heinrich, Milan Stute, Tim Kornhuber, Matthias Hollick. **Who Can _Find My_ Devices? Security and Privacy of Apple's Crowd-Sourced Bluetooth Location Tracking System.** _Proceedings on Privacy Enhancing Technologies (PoPETs)_, 2021. [doi:10.2478/popets-2021-0045](https://doi.org/10.2478/popets-2021-0045) [📄 Paper](https://www.petsymposium.org/2021/files/papers/issue3/popets-2021-0045.pdf) [📄 Preprint](https://arxiv.org/abs/2103.02282).
+- Alexander Heinrich, Milan Stute, and Matthias Hollick. **DEMO: OpenHaystack: A Framework for Tracking Personal Bluetooth Devices via Apple’s Massive Find My Network.** _14th ACM Conference on Security and Privacy in Wireless and Mobile (WiSec ’21)_, 2021.
 - Tim Kornhuber. **Analysis of Apple's Crowd-Sourced Location Tracking System.** _Technical University of Darmstadt_, Master's thesis, 2020.
 - Apple Inc. **Find My Network Accessory Specification – Developer Preview – Release R3.** 2020. [📄 Download](https://developer.apple.com/find-my/).

--- a/Resources/Icon/OpenHaystackIcon.graffle
+++ b/Resources/Icon/OpenHaystackIcon.graffle
--- a/Resources/Pins-NRF52832.jpg
+++ b/Resources/Pins-NRF52832.jpg
Author	SHA1	Message	Date
Alexander Heinrich	e39e328a89	Updating UUIDs for macOS 11.6	2021-09-21 17:27:34 +02:00
Alexander Heinrich	f9149cdc74	nrf52832 pin layout	2021-08-25 15:53:03 +02:00
Alexander Heinrich	206a2e7004	Copying public to clipboard as Byte array or escaped string	2021-08-25 14:39:58 +02:00
Alexander Heinrich	78fba7391c	Checking if the Mail plug-in is installed in the correct version. Otherwise the new mail plug-in will be installed	2021-08-06 11:46:56 +02:00
Alexander Heinrich	aa7c0a50af	Updating workflows to macOS 11	2021-08-06 11:23:47 +02:00
Alexander Heinrich	48ceb9550c	Small icon changes	2021-08-06 11:19:19 +02:00
Alexander Heinrich	6105a9454a	Updating preview for better control of Screenshots	2021-08-06 11:19:19 +02:00
VladutLP	71fb26da56	Added a bunch of ID's into the plist for Mail app version 14	2021-08-06 11:16:10 +02:00
Milan Stute	c7a15fe0e4	Add WiSec demo	2021-06-02 14:09:57 +02:00