commit - d735340e74df3af82f7acd745d0145d7dd5e19b7a8468c3abf9a03a5488b16da
commit + 8fdee7bf59a9dd9448ca69b333c468f8c8a7b7081a59bc04fefc0860e9fd655e
blob - cecb8152c3b9fe8fb18a6eaf0e1d00931364d8b95de35a6b25877daf3fa58a1f
blob + 164f63488f1682eae5f149d33d73747c9d141a30162adff288c0afc44bd21675
--- lib/got_lib_privsep.h
+++ lib/got_lib_privsep.h
struct got_imsg_tree_entry {
char id[GOT_HASH_DIGEST_MAXLEN];
- int algo;
mode_t mode;
size_t namelen;
/* Followed by namelen bytes of entry's name, not NUL-terminated. */
const struct got_error *got_privsep_recv_commit(struct got_commit_object **,
struct imsgbuf *);
const struct got_error *got_privsep_recv_tree(struct got_tree_object **,
- struct imsgbuf *);
+ struct imsgbuf *, enum got_hash_algorithm);
struct got_parsed_tree_entry;
const struct got_error *got_privsep_send_tree(struct imsgbuf *,
struct got_parsed_tree_entry *, int);
blob - 9aa29827721c2d057703092f2a82ef7a70ab41ccf23d9bd94375bb010814f5b2
blob + 6ad8c0975454c605fda9000029e430776f0913cad04bef17cc53db01f51a6e02
--- lib/object_open_privsep.c
+++ lib/object_open_privsep.c
if (err)
return err;
- return got_privsep_recv_tree(tree, pack->privsep_child->ibuf);
+ return got_privsep_recv_tree(tree, pack->privsep_child->ibuf,
+ pack->algo);
}
static const struct got_error *
if (err)
return err;
- return got_privsep_recv_tree(tree, ibuf);
+ return got_privsep_recv_tree(tree, ibuf, got_repo_get_hash_algo(repo));
}
static const struct got_error *
blob - 214a1a0b755fa5586a586fa314f60f36c69f3a7834268eddc4cd1b09a3f7feb9
blob + 1da9367a400df47360b6316deba363fa4b3c49346f35dc39ba465111cd4bf694
--- lib/privsep.c
+++ lib/privsep.c
if (pte->algo == GOT_HASH_SHA1 &&
imsg_add(wbuf, gap, sizeof(gap)) == -1)
return got_error_from_errno("imsg_add TREE_ENTRY");
- if (imsg_add(wbuf, &pte->algo, sizeof(pte->algo)) == -1)
- return got_error_from_errno("imsg_add TREE_ENTRY");
if (imsg_add(wbuf, &pte->mode, sizeof(pte->mode)) == -1)
return got_error_from_errno("imsg_add TREE_ENTRY");
if (imsg_add(wbuf, &pte->namelen, sizeof(pte->namelen)) == -1)
static const struct got_error *
recv_tree_entries(void *data, size_t datalen, struct got_tree_object *tree,
- int *nentries)
+ int *nentries, enum got_hash_algorithm algo)
{
const struct got_error *err = NULL;
struct got_imsg_tree_entries *ientries;
memcpy(te->name, te_name, ite.namelen);
te->name[ite.namelen] = '\0';
memcpy(te->id.hash, ite.id, sizeof(te->id.hash));
- te->id.algo = ite.algo;
+ te->id.algo = algo;
te->mode = ite.mode;
te->idx = *nentries;
(*nentries)++;
}
const struct got_error *
-got_privsep_recv_tree(struct got_tree_object **tree, struct imsgbuf *ibuf)
+got_privsep_recv_tree(struct got_tree_object **tree, struct imsgbuf *ibuf,
+ enum got_hash_algorithm algo)
{
const struct got_error *err = NULL;
const size_t min_datalen = sizeof(struct got_imsg_tree_object);
break;
}
err = recv_tree_entries(imsg.data, datalen,
- *tree, &nentries);
+ *tree, &nentries, algo);
break;
default:
err = got_error(GOT_ERR_PRIVSEP_MSG);