Skeleton code for MFi setup (feature bit 51).

openairplay · Jan 4, 2022 · bd3ce4e · bd3ce4e
1 parent ead0377
commit bd3ce4e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/ap2-receiver.py b/ap2-receiver.py
@@ -1047,7 +1047,9 @@ def handle_pair_SV(self, op):
         self.end_headers()
         self.wfile.write(res)
 
-        if self.server.hap.encrypted:
+        if self.server.hap.encrypted and self.server.hap.mfi_setup:
+            SCR_LOG.warning('MFi setup not yet possible. Disable feature bit 51.')
+        elif self.server.hap.encrypted:
             hexdump(self.server.hap.accessory_shared_key) if DEBUG else ''
             self.upgrade_to_encrypted(self.server.hap.accessory_shared_key)
 

diff --git a/ap2/pairing/hap.py b/ap2/pairing/hap.py
@@ -28,6 +28,10 @@
 ACCESSORY_SECRET = "accessory-secret"
 
 
+class MFiUnhandledException(Exception):
+    pass
+
+
 class PairingMethod:
     PAIR_SETUP = b'\x00'
     PAIR_SETUP_AUTH = b'\x01'
@@ -282,6 +286,7 @@ def __init__(self, identifier, isDebug=False):
         self.isDebug = isDebug
         self.transient = False
         self.encrypted = False
+        self.mfi_setup = False
         self.pair_setup_steps_n = 5
         if self.isDebug:
             self.logger = get_screen_logger('HAP', level='DEBUG')
@@ -398,6 +403,16 @@ def pair_setup(self, req):
                 PairingFlags(flags) == PairingFlags.TRANSIENT:
             self.transient = True
             self.pair_setup_steps_n = 2
+        elif req[Tlv8.Tag.STATE] == PairingState.M1 and \
+                req[Tlv8.Tag.METHOD] == PairingMethod.PAIR_SETUP_AUTH and \
+                Tlv8.Tag.FLAGS in req and \
+                PairingFlags(flags) == PairingFlags.TRANSIENT:
+            """MFi setup - bitflag 51 was enabled
+            result will be wrong, but we can safely set these params.
+            """
+            self.pair_setup_steps_n = 2
+            self.transient = True
+            self.mfi_setup = True
 
         if req[Tlv8.Tag.STATE] == PairingState.M1:
             self.logger.debug(f"-----\tPair-Setup [1/{self.pair_setup_steps_n}]")
@@ -407,6 +422,11 @@ def pair_setup(self, req):
             res = self.pair_setup_m3_m4(req[Tlv8.Tag.PUBLICKEY], req[Tlv8.Tag.PROOF])
             if self.transient:
                 self.encrypted = True
+            if self.mfi_setup:
+                try:
+                    raise MFiUnhandledException()
+                except MFiUnhandledException:
+                    self.logger.error("MFi setup is not yet possible.")
         elif req[Tlv8.Tag.STATE] == PairingState.M5:
             res = self.pair_setup_m5_m6(req[Tlv8.Tag.ENCRYPTEDDATA])
         return Tlv8.encode(res)