libosdp 3.2.3__tar.gz → 3.2.6__tar.gz

{libosdp-3.2.3 → libosdp-3.2.6}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.2.3
+Version: 3.2.6
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
-Home-page: https://github.com/goToMain/libosdp
+Home-page: https://github.com/osdp-dev/libosdp
 Author: Siddharth Chandrasekaran
 Author-email: sidcha.dev@gmail.com
 Classifier: Programming Language :: Python :: 3
@@ -42,13 +42,13 @@ pip install libosdp
 Or, from github,
 
 ```sh
-pip install -e "git+https://github.com/goToMain/libosdp#egg=libosdp&subdirectory=python"
+pip install -e "git+https://github.com/osdp-dev/libosdp#egg=libosdp&subdirectory=python"
 ```
 
 Or, from source using,
 
 ```sh
-git clone https://github.com/goToMain/libosdp --recurse-submodules
+git clone https://github.com/osdp-dev/libosdp --recurse-submodules
 cd libosdp/python
 python3 setup.py install
 ```
@@ -141,5 +141,5 @@ pd.set_event_completion_handler(on_event_complete)
 ```
 
 [1]: https://doc.osdp.dev/api/
-[2]: https://github.com/goToMain/libosdp/blob/master/examples/python/cp_app.py
-[3]: https://github.com/goToMain/libosdp/blob/master/examples/python/pd_app.py
+[2]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/cp_app.py
+[3]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/pd_app.py

{libosdp-3.2.3 → libosdp-3.2.6}/README.md

@@ -21,13 +21,13 @@ pip install libosdp
 Or, from github,
 
 ```sh
-pip install -e "git+https://github.com/goToMain/libosdp#egg=libosdp&subdirectory=python"
+pip install -e "git+https://github.com/osdp-dev/libosdp#egg=libosdp&subdirectory=python"
 ```
 
 Or, from source using,
 
 ```sh
-git clone https://github.com/goToMain/libosdp --recurse-submodules
+git clone https://github.com/osdp-dev/libosdp --recurse-submodules
 cd libosdp/python
 python3 setup.py install
 ```
@@ -120,5 +120,5 @@ pd.set_event_completion_handler(on_event_complete)
 ```
 
 [1]: https://doc.osdp.dev/api/
-[2]: https://github.com/goToMain/libosdp/blob/master/examples/python/cp_app.py
-[3]: https://github.com/goToMain/libosdp/blob/master/examples/python/pd_app.py
+[2]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/cp_app.py
+[3]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/pd_app.py

{libosdp-3.2.3 → libosdp-3.2.6}/libosdp.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.2.3
+Version: 3.2.6
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
-Home-page: https://github.com/goToMain/libosdp
+Home-page: https://github.com/osdp-dev/libosdp
 Author: Siddharth Chandrasekaran
 Author-email: sidcha.dev@gmail.com
 Classifier: Programming Language :: Python :: 3
@@ -42,13 +42,13 @@ pip install libosdp
 Or, from github,
 
 ```sh
-pip install -e "git+https://github.com/goToMain/libosdp#egg=libosdp&subdirectory=python"
+pip install -e "git+https://github.com/osdp-dev/libosdp#egg=libosdp&subdirectory=python"
 ```
 
 Or, from source using,
 
 ```sh
-git clone https://github.com/goToMain/libosdp --recurse-submodules
+git clone https://github.com/osdp-dev/libosdp --recurse-submodules
 cd libosdp/python
 python3 setup.py install
 ```
@@ -141,5 +141,5 @@ pd.set_event_completion_handler(on_event_complete)
 ```
 
 [1]: https://doc.osdp.dev/api/
-[2]: https://github.com/goToMain/libosdp/blob/master/examples/python/cp_app.py
-[3]: https://github.com/goToMain/libosdp/blob/master/examples/python/pd_app.py
+[2]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/cp_app.py
+[3]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/pd_app.py

{libosdp-3.2.3 → libosdp-3.2.6}/setup.py

@@ -12,7 +12,7 @@ import shutil
 import subprocess
 
 project_name = "libosdp"
-project_version = "3.2.3"
+project_version = "3.2.6"
 current_dir = os.path.dirname(os.path.realpath(__file__))
 repo_root = os.path.realpath(os.path.join(current_dir, ".."))
 
@@ -229,7 +229,7 @@ setup(
     author       = "Siddharth Chandrasekaran",
     author_email = "sidcha.dev@gmail.com",
     description  = "Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)",
-    url          = "https://github.com/goToMain/libosdp",
+    url          = "https://github.com/osdp-dev/libosdp",
     ext_modules  = [
         Extension(
             name               = "osdp_sys",

{libosdp-3.2.3 → libosdp-3.2.6}/vendor/src/osdp_common.h

@@ -492,9 +492,9 @@ void osdp_sc_teardown(struct osdp_pd *pd);
 
 static inline uint16_t bread_u16_le(const uint8_t *buf, int *pos)
 {
-    uint16_t v = buf[(*pos)++];
-    v |= (uint16_t)buf[(*pos)++] << 8;
-    return v;
+    uint32_t v = buf[(*pos)++];
+    v |= (uint32_t)buf[(*pos)++] << 8;
+    return (uint16_t)v;
 }
 
 static inline uint32_t bread_u24_le(const uint8_t *buf, int *pos)
@@ -546,9 +546,9 @@ static inline void bwrite_u32_le(uint32_t val, uint8_t *buf, int *len)
 
 static inline uint16_t bread_u16_be(const uint8_t *buf, int *pos)
 {
-    uint16_t v = (uint16_t)buf[(*pos)++] << 8;
+    uint32_t v = (uint32_t)buf[(*pos)++] << 8;
     v |= buf[(*pos)++];
-    return v;
+    return (uint16_t)v;
 }
 
 static inline uint32_t bread_u24_be(const uint8_t *buf, int *pos)

{libosdp-3.2.3 → libosdp-3.2.6}/vendor/src/osdp_config.h

@@ -11,11 +11,11 @@
  * @brief The following macros are defined defined from the variable in cmake
  * files. All @XXX@ are replaced by the value of XXX as resolved by cmake.
  */
-#define PROJECT_VERSION                "3.2.3"
+#define PROJECT_VERSION                "3.2.6"
 #define PROJECT_NAME                   "libosdp"
-#define GIT_BRANCH                     "release_v3.2"
-#define GIT_REV                        "a4079c9"
-#define GIT_TAG                        ""
+#define GIT_BRANCH                     "detached"
+#define GIT_REV                        "v3.2.6-0-g9ff9013"
+#define GIT_TAG                        "v3.2.6"
 #define GIT_DIFF                       ""
 #define REPO_ROOT                      "/home/runner/work/libosdp/libosdp"
 

{libosdp-3.2.3 → libosdp-3.2.6}/vendor/src/osdp_cp.c

@@ -473,7 +473,7 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		t = OSDP_PD_CAP_RECEIVE_BUFFERSIZE;
 		if (pd->cap[t].function_code == t) {
 			pd->peer_rx_size = pd->cap[t].compliance_level;
-			pd->peer_rx_size |= pd->cap[t].num_items << 8;
+			pd->peer_rx_size |= (uint32_t)pd->cap[t].num_items << 8;
 		}
 
 		/* post-capabilities hooks */
@@ -573,7 +573,8 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		event.type = OSDP_EVENT_KEYPRESS;
 		event.keypress.reader_no = buf[pos++];
 		event.keypress.length = buf[pos++];
-		if ((len - REPLY_KEYPAD_DATA_LEN) != event.keypress.length) {
+		if (event.keypress.length != (len - REPLY_KEYPAD_DATA_LEN) ||
+		    event.keypress.length > OSDP_EVENT_KEYPRESS_MAX_DATALEN) {
 			break;
 		}
 		memcpy(event.keypress.data, buf + pos, event.keypress.length);
@@ -591,7 +592,8 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		event.cardread.length = bread_u16_le(buf, &pos);
 		event.cardread.direction = 0; /* un-specified */
 		t = (event.cardread.length + 7) / 8; /* len: bytes */
-		if (t != (len - REPLY_RAW_DATA_LEN)) {
+		if (t != (len - REPLY_RAW_DATA_LEN) ||
+		    t > OSDP_EVENT_CARDREAD_MAX_DATALEN) {
 			break;
 		}
 		memcpy(event.cardread.data, buf + pos, t);
@@ -605,7 +607,7 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		 * for deprecation in v2.2.2. To avoid confusions, we will just
 		 * ignore it here.
 		 *
-		 * See: https://github.com/goToMain/libosdp/issues/206
+		 * See: https://github.com/osdp-dev/libosdp/issues/206
 		 */
 		LOG_WRN("Ignoring deprecated response osdp_FMT");
 		ret = OSDP_CP_ERR_NONE;

{libosdp-3.2.3 → libosdp-3.2.6}/vendor/src/osdp_diag.c

@@ -52,7 +52,7 @@ void osdp_packet_capture_finish(struct osdp_pd *pd)
 		LOG_ERR("Unable to stop capture (flush/close failed)");
 		return;
 	}
-	LOG_INF("Captured %d packets", num_packets);
+	LOG_INF("Captured %zu packets", num_packets);
 }
 
 void osdp_capture_packet(struct osdp_pd *pd, uint8_t *buf, int len)

{libosdp-3.2.3 → libosdp-3.2.6}/vendor/src/osdp_file.c

@@ -218,7 +218,12 @@ int osdp_file_cmd_tx_decode(struct osdp_pd *pd, uint8_t *buf, int len)
 	xfer.offset = bread_u32_le(buf, &pos);
 	xfer.length = bread_u16_le(buf, &pos);
 	assert(pos == sizeof(struct osdp_cmd_file_xfer));
-	assert(xfer.length + pos == len);
+
+	if (xfer.length > (uint16_t)(len - FILE_TRANSFER_HEADER_SIZE)) {
+		LOG_ERR("TX_Decode: declared length %d exceeds %d bytes present",
+			xfer.length, len - FILE_TRANSFER_HEADER_SIZE);
+		return -1;
+	}
 
 	if (f->state == OSDP_FILE_IDLE || f->state == OSDP_FILE_DONE) {
 		if (pd->command_callback) {
@@ -253,6 +258,15 @@ int osdp_file_cmd_tx_decode(struct osdp_pd *pd, uint8_t *buf, int len)
 		return -1;
 	}
 
+	/* Bound the wire offset and length against the declared file size
+	 * before handing them to the write handler, so a peer cannot make it
+	 * write outside the file it announced. */
+	if ((uint64_t)xfer.offset + xfer.length > f->size) {
+		LOG_ERR("TX_Decode: chunk off:%d len:%d exceeds size:%d",
+			xfer.offset, xfer.length, f->size);
+		return -1;
+	}
+
 	f->length = f->ops.write(f->ops.arg, data, xfer.length, xfer.offset);
 	if (f->length != xfer.length) {
 		LOG_ERR("TX_Decode: user write failed! rc:%d len:%d off:%d",
@@ -296,7 +310,13 @@ int osdp_file_cmd_stat_build(struct osdp_pd *pd, uint8_t *buf, int max_len)
 	}
 	LOG_DBG("length: %d offset: %d size: %d", f->length, f->offset, f->size);
 	f->length = 0;
-	assert(f->offset <= f->size);
+
+	/*
+	 * Don't assert f->offset:w <= f->size: a legitimately retransmitted
+	 * chunk (lost FTSTAT) re-drives the running offset and can transiently
+	 * overshoot. The write-side bound in tx_decode is the real guard.
+	 */
+
 	if (f->offset == f->size) { /* EOF */
 		if (f->ops.close(f->ops.arg) < 0) {
 			LOG_ERR("Stat_Build: Close failed!");

{libosdp-3.2.3 → libosdp-3.2.6}/vendor/src/osdp_pd.c

@@ -170,7 +170,7 @@ static int pd_translate_event(struct osdp_pd *pd, const struct osdp_event *event
 			 * osdp_FMT was underspecified by SIA from get-go. It
 			 * was marked for deprecation in v2.2.2.
 			 *
-			 * See: https://github.com/goToMain/libosdp/issues/206
+			 * See: https://github.com/osdp-dev/libosdp/issues/206
 			 */
 			LOG_WRN("Event CardRead::format::OSDP_CARD_FMT_ASCII"
 				" is deprecated. Ignoring");
@@ -474,12 +474,14 @@ static int pd_decode_command(struct osdp_pd *pd, uint8_t *buf, int len)
 		pd->reply_id = REPLY_PDCAP;
 		ret = OSDP_PD_ERR_NONE;
 		break;
-	case CMD_OUT:
+	case CMD_OUT: {
+		int count;
 		if ((len % CMD_OUT_DATA_LEN) != 0) {
 			break;
 		}
+		count = len / CMD_OUT_DATA_LEN;
 		ret = OSDP_PD_ERR_REPLY;
-		for (i = 0; i < len / CMD_OUT_DATA_LEN; i++) {
+		for (i = 0; i < count; i++) {
 			cmd.id = OSDP_CMD_OUTPUT;
 			cmd.output.output_no = buf[pos++];
 			cmd.output.control_code = buf[pos++];
@@ -491,15 +493,20 @@ static int pd_decode_command(struct osdp_pd *pd, uint8_t *buf, int len)
 				break;
 			}
 		}
-		pd->reply_id = REPLY_ACK;
-		ret = OSDP_PD_ERR_NONE;
+		if (i == count) {
+			pd->reply_id = REPLY_ACK;
+			ret = OSDP_PD_ERR_NONE;
+		}
 		break;
-	case CMD_LED:
+	}
+	case CMD_LED: {
+		int count;
 		if ((len % CMD_LED_DATA_LEN) != 0) {
 			break;
 		}
+		count = len / CMD_LED_DATA_LEN;
 		ret = OSDP_PD_ERR_REPLY;
-		for (i = 0; i < len / CMD_LED_DATA_LEN; i++) {
+		for (i = 0; i < count; i++) {
 			cmd.id = OSDP_CMD_LED;
 			cmd.led.reader = buf[pos++];
 			cmd.led.led_number = buf[pos++];
@@ -523,15 +530,20 @@ static int pd_decode_command(struct osdp_pd *pd, uint8_t *buf, int len)
 				break;
 			}
 		}
-		pd->reply_id = REPLY_ACK;
-		ret = OSDP_PD_ERR_NONE;
+		if (i == count) {
+			pd->reply_id = REPLY_ACK;
+			ret = OSDP_PD_ERR_NONE;
+		}
 		break;
-	case CMD_BUZ:
+	}
+	case CMD_BUZ: {
+		int count;
 		if ((len % CMD_BUZ_DATA_LEN) != 0) {
 			break;
 		}
+		count = len / CMD_BUZ_DATA_LEN;
 		ret = OSDP_PD_ERR_REPLY;
-		for (i = 0; i < len / CMD_BUZ_DATA_LEN; i++) {
+		for (i = 0; i < count; i++) {
 			cmd.id = OSDP_CMD_BUZZER;
 			cmd.buzzer.reader = buf[pos++];
 			cmd.buzzer.control_code = buf[pos++];
@@ -545,9 +557,12 @@ static int pd_decode_command(struct osdp_pd *pd, uint8_t *buf, int len)
 				break;
 			}
 		}
-		pd->reply_id = REPLY_ACK;
-		ret = OSDP_PD_ERR_NONE;
+		if (i == count) {
+			pd->reply_id = REPLY_ACK;
+			ret = OSDP_PD_ERR_NONE;
+		}
 		break;
+	}
 	case CMD_TEXT:
 		if (len < CMD_TEXT_DATA_LEN) {
 			break;

{libosdp-3.2.3 → libosdp-3.2.6}/vendor/src/osdp_phy.c

@@ -421,7 +421,7 @@ static int phy_validate_header(struct osdp_pd *pd, uint8_t *buf,
 		return OSDP_ERR_PKT_FMT;
 	}
 
-	pkt_len = (pkt->len_msb << 8) | pkt->len_lsb;
+	pkt_len = ((uint32_t)pkt->len_msb << 8) | pkt->len_lsb;
 	if (pkt_len > max_len ||
 	    pkt_len < sizeof(struct osdp_packet_header) + 1 ||
 	    (is_cp_mode(pd) && !(pkt->pd_address & 0x80)) ||
@@ -466,6 +466,7 @@ static bool phy_rescan_packet_buf(struct osdp_pd *pd)
 static int phy_check_header(struct osdp_pd *pd)
 {
 	int ret, len;
+	unsigned long need;
 	uint8_t cur_byte = 0, prev_byte = 0;
 	uint8_t *buf = pd->packet_buf;
 
@@ -491,10 +492,19 @@ static int phy_check_header(struct osdp_pd *pd)
 		prev_byte = cur_byte;
 	}
 
-	/* Found start of a new packet; wait until we have atleast the header */
-	len = osdp_rb_pop_buf(pd->rx.rb, buf + pd->packet_buf_len,
-			      sizeof(struct osdp_packet_header) - 1);
-	pd->packet_buf_len += len;
+	/*
+	 * Found start of a new packet; top up only the header bytes still
+	 * missing. On re-entry with a partially collected header, popping a
+	 * fixed sizeof(header)-1 bytes would overshoot packet_buf_len past the
+	 * packet and wedge the framer (see osdp_phy_check_packet()).
+	 */
+	need = sizeof(struct osdp_packet_header) +
+	       (buf[0] == OSDP_PKT_MARK ? 1 : 0);
+	if (pd->packet_buf_len < need) {
+		len = osdp_rb_pop_buf(pd->rx.rb, buf + pd->packet_buf_len,
+				      need - pd->packet_buf_len);
+		pd->packet_buf_len += len;
+	}
 
 	/* Validate header using shared function */
 	ret = phy_validate_header(pd, buf, pd->packet_buf_len, OSDP_PACKET_BUF_SIZE);
@@ -530,7 +540,7 @@ static int phy_check_packet(struct osdp_pd *pd, uint8_t *buf, int pkt_len)
 	/* validate CRC/checksum */
 	if (pkt->control & PKT_CONTROL_CRC) {
 		pkt_len -= 2; /* consume CRC */
-		cur = (buf[pkt_len + 1] << 8) | buf[pkt_len];
+		cur = ((uint32_t)buf[pkt_len + 1] << 8) | buf[pkt_len];
 		comp = osdp_compute_crc16(buf, pkt_len);
 		if (comp != cur) {
 			LOG_ERR("Invalid crc 0x%04x/0x%04x", comp, cur);
@@ -672,6 +682,17 @@ int osdp_phy_check_packet(struct osdp_pd *pd)
 	}
 
 	if (!zero_copy) {
+		/*
+		 * Guard the unsigned subtraction below: if we ever hold more
+		 * bytes than the header declared, the wrap-around would ask for
+		 * a huge (negative when cast to int) count and wedge the framer.
+		 * Treat it as a malformed frame so the link resets and recovers.
+		 */
+		if (pd->packet_buf_len > pd->packet_len) {
+			LOG_ERR("Buffered %lu bytes exceeds packet length %lu",
+				pd->packet_buf_len, pd->packet_len);
+			return OSDP_ERR_PKT_FMT;
+		}
 		/* Traditional: collect remaining packet bytes from ring buffer */
 		ret = osdp_rb_pop_buf(pd->rx.rb,
 				      pd->packet_buf + pd->packet_buf_len,