libosdp 3.1.0__tar.gz → 3.1.2__tar.gz

{libosdp-3.1.0 → libosdp-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.1.0
+Version: 3.1.2
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
 Home-page: https://github.com/goToMain/libosdp
 Author: Siddharth Chandrasekaran

{libosdp-3.1.0 → libosdp-3.1.2}/libosdp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.1.0
+Version: 3.1.2
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
 Home-page: https://github.com/goToMain/libosdp
 Author: Siddharth Chandrasekaran

{libosdp-3.1.0 → libosdp-3.1.2}/setup.py

@@ -11,7 +11,7 @@ import shutil
 import subprocess
 
 project_name = "libosdp"
-project_version = "3.1.0"
+project_version = "3.1.2"
 current_dir = os.path.dirname(os.path.realpath(__file__))
 repo_root = os.path.realpath(os.path.join(current_dir, ".."))
 

{libosdp-3.1.0 → libosdp-3.1.2}/vendor/include/osdp_export.h

@@ -48,6 +48,16 @@
 
 /* ---------- Deprecation (with message) ---------- */
 
+/*
+ * Undefine API_DEPRECATED before redefining it. On macOS the SDK header
+ * <os/availability.h> defines API_DEPRECATED with a different signature
+ * (platform/version specifiers, not a plain string), which causes macro
+ * expansion errors when osdp.h uses OSDP_DEPRECATED_EXPORT("msg").
+ */
+#ifdef API_DEPRECATED
+#undef API_DEPRECATED
+#endif
+
 /* Prefer C++ [[deprecated("msg")]] if available, otherwise compiler specifics. */
 #if defined(__cplusplus) && API_HAS_CPP_ATTR(deprecated)
   /* [[deprecated("msg")]] supported */

{libosdp-3.1.0 → libosdp-3.1.2}/vendor/src/osdp_common.h

@@ -273,7 +273,6 @@ union osdp_ephemeral_data {
 #define PD_FLAG_HAS_SCBK       BIT(12) /* PD has a dedicated SCBK */
 #define PD_FLAG_SC_DISABLED    BIT(13) /* master_key=NULL && scbk=NULL */
 #define PD_FLAG_PKT_BROADCAST  BIT(14) /* this packet was addressed to 0x7F */
-#define PD_FLAG_CP_USE_CRC     BIT(15) /* CP uses CRC-16 instead of checksum */
 
 /* CP event requests; used with make_request() and check_request() */
 #define CP_REQ_RESTART_SC              0x00000001

{libosdp-3.1.0 → libosdp-3.1.2}/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.1.0"
+#define PROJECT_VERSION                "3.1.2"
 #define PROJECT_NAME                   "libosdp"
-#define GIT_BRANCH                     "master"
-#define GIT_REV                        "c92c896"
-#define GIT_TAG                        ""
+#define GIT_BRANCH                     "HEAD"
+#define GIT_REV                        "24d5ec7"
+#define GIT_TAG                        "v3.1.2"
 #define GIT_DIFF                       ""
 #define REPO_ROOT                      "/home/runner/work/libosdp/libosdp"
 

{libosdp-3.1.0 → libosdp-3.1.2}/vendor/src/osdp_cp.c

@@ -53,6 +53,7 @@ enum osdp_cp_error_e {
 	OSDP_CP_ERR_INPROG = -5,
 	OSDP_CP_ERR_UNKNOWN = -6,
 	OSDP_CP_ERR_SEQ_NUM = -7,
+	OSDP_CP_ERR_APP = -8, /* Application layer error */
 };
 
 struct cp_cmd_node {
@@ -416,13 +417,6 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		if (len != REPLY_NAK_DATA_LEN) {
 			break;
 		}
-		if (buf[pos] == OSDP_PD_NAK_MSG_CHK &&
-		    ISSET_FLAG(pd, PD_FLAG_CP_USE_CRC)) {
-			LOG_INF("PD NAK'd CRC-16, falling back to checksum");
-			CLEAR_FLAG(pd, PD_FLAG_CP_USE_CRC);
-			ret = OSDP_CP_ERR_RETRY_CMD;
-			break;
-		}
 		LOG_WRN("PD replied with NAK(%d) for CMD: %s(%02x)",
 			buf[pos], osdp_cmd_name(pd->cmd_id), pd->cmd_id);
 		ret = OSDP_CP_ERR_NONE;
@@ -481,16 +475,6 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		} else {
 			CLEAR_FLAG(pd, PD_FLAG_SC_CAPABLE);
 		}
-
-		/* Check checksum/CRC support capability */
-		t1 = OSDP_PD_CAP_CHECK_CHARACTER_SUPPORT;
-		if (pd->cap[t1].function_code == t1) {
-			if (pd->cap[t1].compliance_level & 0x01) {
-				SET_FLAG(pd, PD_FLAG_CP_USE_CRC);
-			} else {
-				CLEAR_FLAG(pd, PD_FLAG_CP_USE_CRC);
-			}
-		}
 		ret = OSDP_CP_ERR_NONE;
 		break;
 	case REPLY_OSTATR: {
@@ -657,7 +641,7 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		osdp_compute_session_keys(pd);
 		if (osdp_verify_pd_cryptogram(pd) != 0) {
 			LOG_ERR("Failed to verify PD cryptogram");
-			return OSDP_CP_ERR_GENERIC;
+			return OSDP_CP_ERR_APP;
 		}
 		ret = OSDP_CP_ERR_NONE;
 		break;
@@ -895,19 +879,20 @@ static int cp_phy_state_update(struct osdp_pd *pd)
 		break;
 	case OSDP_CP_PHY_STATE_REPLY_WAIT:
 		rc = cp_process_reply(pd);
-		if (rc == OSDP_CP_ERR_NONE) {
+		if (rc == OSDP_CP_ERR_NONE || rc == OSDP_CP_ERR_APP) {
 			pd->tstamp = osdp_millis_now();
 			osdp_phy_progress_sequence(pd);
-			cp_phy_state_done(pd);
-			return OSDP_CP_ERR_NONE;
 		}
-		if (rc == OSDP_CP_ERR_SEQ_NUM ||
+		if (rc == OSDP_CP_ERR_NONE ||
+		    rc == OSDP_CP_ERR_SEQ_NUM ||
 		    (rc == OSDP_CP_ERR_UNKNOWN && pd->cmd_id == CMD_POLL &&
 		     ISSET_FLAG(pd, OSDP_FLAG_IGN_UNSOLICITED))) {
 			cp_phy_state_done(pd);
 			return OSDP_CP_ERR_NONE;
 		}
-		if (rc == OSDP_CP_ERR_GENERIC || rc == OSDP_CP_ERR_UNKNOWN) {
+		if (rc == OSDP_CP_ERR_GENERIC ||
+		    rc == OSDP_CP_ERR_UNKNOWN ||
+		    rc == OSDP_CP_ERR_APP) {
 			goto error;
 		}
 		if (rc == OSDP_CP_ERR_RETRY_CMD) {
@@ -1528,8 +1513,6 @@ static int cp_add_pd(struct osdp *ctx, int num_pd, const osdp_pd_info_t *info_li
 		pd->flags = info->flags;
 		pd->seq_number = -1;
 		SET_FLAG(pd, PD_FLAG_SC_DISABLED);
-		/* Default to CRC-16 until we know PD capabilities */
-		SET_FLAG(pd, PD_FLAG_CP_USE_CRC);
 		memcpy(&pd->channel, &info->channel, sizeof(struct osdp_channel));
 		if (info->scbk != NULL) {
 			memcpy(pd->sc.scbk, info->scbk, 16);

{libosdp-3.1.0 → libosdp-3.1.2}/vendor/src/osdp_phy.c

@@ -79,7 +79,7 @@ static int osdp_channel_receive(struct osdp_pd *pd)
 	return total_recv;
 }
 
-static uint8_t osdp_compute_checksum(uint8_t *msg, int length)
+uint8_t osdp_compute_checksum(uint8_t *msg, int length)
 {
 	uint8_t checksum = 0;
 	int i, whole_checksum;
@@ -187,10 +187,7 @@ int osdp_phy_packet_init(struct osdp_pd *pd, uint8_t *buf, int max_len)
 		id = pd->cmd_id;
 	}
 	pkt->control = phy_get_next_seq_number(pd);
-	if (is_pd_mode(pd) ||
-	    (is_cp_mode(pd) && ISSET_FLAG(pd, PD_FLAG_CP_USE_CRC))) {
-		pkt->control |= PKT_CONTROL_CRC;
-	}
+	pkt->control |= PKT_CONTROL_CRC;
 
 	if (sc_is_active(pd)) {
 		pkt->control |= PKT_CONTROL_SCB;
@@ -212,7 +209,7 @@ static int phy_packet_finalize(struct osdp_pd *pd, uint8_t *buf,
 	uint16_t crc16;
 	struct osdp_packet_header *pkt;
 	uint8_t *data;
-	int data_len, checksum_len;
+	int data_len;
 
 	/* Do a sanity check only; we expect header to be pre-filled */
 	if ((unsigned long)len <= sizeof(struct osdp_packet_header)) {
@@ -238,10 +235,9 @@ static int phy_packet_finalize(struct osdp_pd *pd, uint8_t *buf,
 		return OSDP_ERR_PKT_FMT;
 	}
 
-	/* len: with CRC (2 bytes) or checksum (1 byte) */
-	checksum_len = (pkt->control & PKT_CONTROL_CRC) ? 2 : 1;
-	pkt->len_lsb = BYTE_0(len + checksum_len);
-	pkt->len_msb = BYTE_1(len + checksum_len);
+	/* len: with 2 byte CRC */
+	pkt->len_lsb = BYTE_0(len + 2);
+	pkt->len_msb = BYTE_1(len + 2);
 
 	if (is_data_trace_enabled(pd)) {
 		uint8_t control;
@@ -287,15 +283,14 @@ static int phy_packet_finalize(struct osdp_pd *pd, uint8_t *buf,
 			}
 			len += osdp_encrypt_data(pd, is_cp_mode(pd), data, data_len);
 		}
-		/* len: with 4bytes MAC; with CRC (2 bytes) or checksum (1 byte); without 1 byte mark */
+		/* len: with 4bytes MAC; with 2 byte CRC; without 1 byte mark */
 		if (len + 4 > max_len) {
 			goto out_of_space_error;
 		}
 
-		/* len: with CRC/checksum; with 4 byte MAC */
-		checksum_len = (pkt->control & PKT_CONTROL_CRC) ? 2 : 1;
-		pkt->len_lsb = BYTE_0(len + checksum_len + 4);
-		pkt->len_msb = BYTE_1(len + checksum_len + 4);
+		/* len: with 2 byte CRC; with 4 byte MAC */
+		pkt->len_lsb = BYTE_0(len + 2 + 4);
+		pkt->len_msb = BYTE_1(len + 2 + 4);
 
 		/* compute and extend the buf with 4 MAC bytes */
 		osdp_compute_mac(pd, is_cp_mode(pd), buf, len);
@@ -304,22 +299,14 @@ static int phy_packet_finalize(struct osdp_pd *pd, uint8_t *buf,
 		len += 4;
 	}
 
-	/* fill crc16 or checksum */
-	if (pkt->control & PKT_CONTROL_CRC) {
-		if (len + 2 > max_len) {
-			goto out_of_space_error;
-		}
-		crc16 = osdp_compute_crc16(buf, len);
-		buf[len + 0] = BYTE_0(crc16);
-		buf[len + 1] = BYTE_1(crc16);
-		len += 2;
-	} else {
-		if (len + 1 > max_len) {
-			goto out_of_space_error;
-		}
-		buf[len] = osdp_compute_checksum(buf, len);
-		len += 1;
+	/* fill crc16 */
+	if (len + 2 > max_len) {
+		goto out_of_space_error;
 	}
+	crc16 = osdp_compute_crc16(buf, len);
+	buf[len + 0] = BYTE_0(crc16);
+	buf[len + 1] = BYTE_1(crc16);
+	len += 2;
 
 	return len + packet_has_mark(pd);