Linux + iPhone Continuity / iMessage / SMS
fix(ios): non-latin DER error
Zack Bartel86c5e8657289
diff --git a/apple/TetherFramework/Package.swift b/apple/TetherFramework/Package.swiftindex d1b6882..d8f6f0e 100644--- a/apple/TetherFramework/Package.swift+++ b/apple/TetherFramework/Package.swift@@ -26,5 +26,10 @@ let package = Package(name: "TetherFramework",path: "Sources/TetherFramework"),+ .testTarget(+ name: "TetherFrameworkTests",+ dependencies: ["TetherFramework"],+ path: "Tests/TetherFrameworkTests"+ ),])diff --git a/apple/TetherFramework/Sources/TetherFramework/CertificateManager.swift b/apple/TetherFramework/Sources/TetherFramework/CertificateManager.swiftindex db4a4d5..5531f2a 100644--- a/apple/TetherFramework/Sources/TetherFramework/CertificateManager.swift+++ b/apple/TetherFramework/Sources/TetherFramework/CertificateManager.swift@@ -360,6 +360,8 @@ public final class CertificateManager {var serialBytes = [UInt8](repeating: 0, count: 8)_ = SecRandomCopyBytes(kSecRandomDefault, serialBytes.count, &serialBytes)serialBytes[0] &= 0x7F // Ensure positive+ // A zero leading byte would make asn1Integer emit a non-minimal DER INTEGER.+ if serialBytes[0] == 0 { serialBytes[0] = 1 }// TBSCertificatelet version = asn1ExplicitTag(0, asn1Integer([0x02])) // v3@@ -439,13 +441,21 @@ public final class CertificateManager {}private func asn1UTCTime(_ date: Date) -> [UInt8] {- let formatter = DateFormatter()- formatter.dateFormat = "yyMMddHHmmss'Z'"- formatter.timeZone = TimeZone(identifier: "UTC")- let bytes = Array(formatter.string(from: date).utf8)+ let bytes = Array(Self.utcTimeString(date).utf8)return [0x17, UInt8(bytes.count)] + bytes}+ // YYMMDDHHMMSSZ, always Gregorian/UTC/ASCII digits.+ static func utcTimeString(_ date: Date) -> String {+ var calendar = Calendar(identifier: .gregorian)+ calendar.timeZone = TimeZone(secondsFromGMT: 0)!+ let c = calendar.dateComponents([.year, .month, .day, .hour, .minute, .second], from: date)+ return String(+ format: "%02d%02d%02d%02d%02d%02dZ",+ c.year! % 100, c.month!, c.day!, c.hour!, c.minute!, c.second!+ )+ }+private func asn1ExplicitTag(_ tag: UInt8, _ contents: [UInt8]) -> [UInt8] {let tagByte = 0xA0 | tagreturn [tagByte] + asn1Length(contents.count) + contentsdiff --git a/apple/TetherFramework/Tests/TetherFrameworkTests/CertificateManagerTests.swift b/apple/TetherFramework/Tests/TetherFrameworkTests/CertificateManagerTests.swiftnew file mode 100644index 0000000..2d88cee--- /dev/null+++ b/apple/TetherFramework/Tests/TetherFrameworkTests/CertificateManagerTests.swift@@ -0,0 +1,18 @@+//+// CertificateManagerTests.swift+// TetherFrameworkTests+//++import Foundation+import Testing+@testable import TetherFramework++struct CertificateManagerTests {+ // The DER UTCTime field must be 13 ASCII bytes in the Gregorian calendar regardless+ // of the device locale; a locale-aware formatter breaks certificate generation.+ @Test func utcTimeIsGregorianASCII() {+ let encoded = CertificateManager.utcTimeString(Date(timeIntervalSince1970: 1_788_000_000))+ #expect(encoded == "260829104000Z")+ #expect(encoded.utf8.count == 13)+ }+}