Add master key to ControlPanel initialization.

Signed-off-by: Johan Carlsson <johan.carlsson@teenage.engineering>

Author: Johan Carlsson

osdp/_bus.py

@@ -44,12 +44,12 @@ def send_command(self, command: Command):
 		else:
 			log.warning("Device not found with address %s", command.address)
 
-	def add_device(self, address: int, use_crc: bool, use_secure_channel: bool) -> Device:
+	def add_device(self, address: int, use_crc: bool, use_secure_channel: bool, master_key: bytes) -> Device:
 		found_device = self._configured_devices.get(address)
 		self._configured_devices_lock.acquire()
 		if found_device is not None:
 			self._configured_devices.pop(address)
-		self._configured_devices[address] = Device(address, use_crc, use_secure_channel)
+		self._configured_devices[address] = Device(address, use_crc, use_secure_channel, master_key)
 		self._configured_devices_lock.release()
 		return self._configured_devices[address]
 

osdp/_control_panel.py

@@ -23,10 +23,11 @@
 
 class ControlPanel:
 
-	def __init__(self):
+	def __init__(self, master_key: bytes = None):
 		self._buses = {}
 		self._reply_handlers = []
 		self._reply_timeout = 5.0
+		self._master_key = master_key
 
 	def start_connection(self, connection: OsdpConnection) -> UUID:
 		bus = Bus(connection, self.on_reply_received)
@@ -100,7 +101,7 @@ def shutdown(self):
 	def add_device(self, connection_id: UUID, address: int, use_crc: bool, use_secure_channel: bool):
 		bus = self._buses.get(connection_id)
 		if bus is not None:
-			bus.add_device(address, use_crc, use_secure_channel)
+			bus.add_device(address, use_crc, use_secure_channel, self._master_key)
 
 	def remove_device(self, connection_id: UUID, address: int):
 		bus = self._buses.get(connection_id)

osdp/_device.py

@@ -13,13 +13,13 @@
 
 class Device(object):
 
-	def __init__(self, address: int, use_crc: bool, use_secure_channel: bool):
+	def __init__(self, address: int, use_crc: bool, use_secure_channel: bool, master_key: bytes):
 		self._use_secure_channel = use_secure_channel
 		self.address = address
 		self.message_control = Control(0, use_crc, use_secure_channel)
 
 		self._commands = queue.Queue()
-		self._secure_channel = SecureChannel()
+		self._secure_channel = SecureChannel(master_key)
 		self._last_valid_reply = datetime.datetime.utcfromtimestamp(0)
 
 	@property

osdp/_secure_channel.py

@@ -10,7 +10,7 @@ class SecureChannel:
 		0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F
 	])
 
-	def __init__(self):
+	def __init__(self, master_key: bytes):
 		self._cmac = None
 		self._enc = None
 		self._rmac = None
@@ -21,6 +21,7 @@ def __init__(self):
 		self.server_cryptogram = None
 		self.is_initialized = False
 		self.is_established = False
+		self.master_key = master_key
 		self.reset()
 
 	def initialize(self, cuid: bytes, client_random_number: bytes, client_cryptogram: bytes):