Commit 94fbf93add446439fb6f28d231d9b95d96b5d5f2

Stefan Sperling 2018-04-22T15:48:01

unpriv process doesn't know the actual object id

diff --git a/lib/got_lib_privsep.h b/lib/got_lib_privsep.h
index a5baf89..a5c748f 100644
--- a/lib/got_lib_privsep.h
+++ b/lib/got_lib_privsep.h
@@ -99,10 +99,9 @@ struct got_imsg_object {
 	int flags;
 	size_t hdrlen;
 	size_t size;
-	struct got_object_id id;
 
 	int ndeltas; /* this many GOT_IMSG_DELTA messages follow */
-} __attribute__((__packed__));
+};
 
 /* Structure for GOT_IMSG_LOOSE_OBJECT_HEADER_REPLY data. */
 struct got_imsg_loose_object_header_reply {
diff --git a/lib/privsep.c b/lib/privsep.c
index 3638155..ffd6c61 100644
--- a/lib/privsep.c
+++ b/lib/privsep.c
@@ -103,7 +103,6 @@ got_privsep_send_obj(struct imsgbuf *ibuf, struct got_object *obj, int ndeltas)
 	iobj.flags = obj->flags;
 	iobj.hdrlen = obj->hdrlen;
 	iobj.size = obj->size;
-	memcpy(iobj.id.sha1, obj->id.sha1, SHA1_DIGEST_LENGTH);
 	iobj.ndeltas = ndeltas;
 
 	if (ndeltas > 0) {
@@ -196,7 +195,6 @@ got_privsep_recv_obj(struct got_object **obj, struct imsgbuf *ibuf)
 		(*obj)->type = iobj.type;
 		(*obj)->hdrlen = iobj.hdrlen;
 		(*obj)->size = iobj.size;
-		memcpy((*obj)->id.sha1, iobj.id.sha1, SHA1_DIGEST_LENGTH);
 		for (i = 0; i < iobj.ndeltas; i++) {
 			/* TODO: Handle deltas */
 		}