tss: Make ApECID key mandatory and also use it for baseband TSS requests

1 files changed, 9 insertions, 18 deletions

diff --git a/src/tss.c b/src/tss.c
index 6ec3811..ac21f74 100644
--- a/src/tss.c
+++ b/src/tss.c
@@ -221,15 +221,6 @@ int tss_request_add_ap_img4_tags(plist_t request, plist_t parameters) {
 		return -1;
 	}
 
-	/* ApECID */
-	node = plist_dict_get_item(parameters, "ApECID");
-	if (!node || plist_get_node_type(node) != PLIST_UINT) {
-		error("ERROR: Unable to find required ApECID in parameters\n");
-		return -1;
-	}
-	plist_dict_set_item(request, "ApECID", plist_copy(node));
-	node = NULL;
-
 	/* ApNonce */
 	node = plist_dict_get_item(parameters, "ApNonce");
 	if (!node || plist_get_node_type(node) != PLIST_DATA) {
@@ -300,15 +291,6 @@ int tss_request_add_ap_img3_tags(plist_t request, plist_t parameters) {
 	/* @APTicket */
 	plist_dict_set_item(request, "@APTicket", plist_new_bool(1));
 
-	/* ApECID */
-	node = plist_dict_get_item(parameters, "ApECID");
-	if (!node || plist_get_node_type(node) != PLIST_UINT) {
-		error("ERROR: Unable to find required ApECID in parameters\n");
-		return -1;
-	}
-	plist_dict_set_item(request, "ApECID", plist_copy(node));
-	node = NULL;
-
 	/* ApBoardID */
 	node = plist_dict_get_item(request, "ApBoardID");
 	if (!node || plist_get_node_type(node) != PLIST_UINT) {
@@ -348,6 +330,15 @@ int tss_request_add_ap_img3_tags(plist_t request, plist_t parameters) {
 int tss_request_add_common_tags(plist_t request, plist_t parameters, plist_t overrides) {
 	plist_t node = NULL;
 
+	/* ApECID */
+	node = plist_dict_get_item(parameters, "ApECID");
+	if (!node || plist_get_node_type(node) != PLIST_UINT) {
+		error("ERROR: Unable to find required ApECID in parameters\n");
+		return -1;
+	}
+	plist_dict_set_item(request, "ApECID", plist_copy(node));
+	node = NULL;
+
 	/* UniqueBuildID */
 	node = plist_dict_get_item(parameters, "UniqueBuildID");
 	if (node) {