6dd3c09 manifest: remove the nothing of manifest digest (unused) — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

manifest: remove the nothing of manifest digest (unused)

Baptiste Daroussin committed 2 years ago

commit 6dd3c09ebff5b05b358f5486638189ca28c9abd4
parent 0ae3fb3

5 files changed +11 -36

modified libpkg/pkg.h.in

@@ -745,11 +745,10 @@ int pkg_parse_manifest_fileat(int fd, struct pkg *pkg, const char *);

  * @param buf A pointer which will hold the allocated buffer containing the
  * manifest. To be free'ed.
  * @param flags Flags for manifest emitting.
  * @param pdigest A pointer that will hold digest of manifest produced, ignored
  * if NULL. To be free'ed if not NULL.
  * @return An error code.
  */
 int pkg_emit_manifest_file(struct pkg*, FILE *, short, char **pdigest);
 int pkg_emit_manifest_file(struct pkg*, FILE *, short);
 /* pkg_dep */
 const char *pkg_dep_get(struct pkg_dep const * const , const pkg_dep_attr);

modified libpkg/pkg_create.c

@@ -133,14 +133,14 @@ pkg_create_from_dir(struct pkg *pkg, const char *root,

 	 */
 	xstring *b = xstring_new();
 	pkg_emit_manifest_buf(pkg, b, PKG_MANIFEST_EMIT_COMPACT, NULL);
 	pkg_emit_manifest_buf(pkg, b, PKG_MANIFEST_EMIT_COMPACT);
 	fflush(b->fp);
 	packing_append_buffer(pkg_archive, b->buf, "+COMPACT_MANIFEST", strlen(b->buf));
 	xstring_reset(b);
 	if (pc->expand_manifest)
 		pkg_emit_manifest_buf(pkg, b, PKG_MANIFEST_EMIT_UCL, NULL);
 		pkg_emit_manifest_buf(pkg, b, PKG_MANIFEST_EMIT_UCL);
 	else
 		pkg_emit_manifest_buf(pkg, b, 0, NULL);
 		pkg_emit_manifest_buf(pkg, b, 0);
 	fflush(b->fp);
 	packing_append_buffer(pkg_archive, b->buf, "+MANIFEST", strlen(b->buf));
 	xstring_free(b);

modified libpkg/pkg_manifest.c

@@ -1265,17 +1265,6 @@ emit_manifest(struct pkg *pkg, xstring **out, short flags)

 	return (EPKG_OK);
 }
 static void
 pkg_emit_manifest_digest(const unsigned char *digest, size_t len, char *hexdigest)
 {
 	unsigned int i;
 	for (i = 0; i < len; i ++)
 		sprintf(hexdigest + (i * 2), "%02x", digest[i]);
 	hexdigest[len * 2] = '\0';
 }
 /*
  * This routine is able to output to either a (FILE *) or a (struct sbuf *). It
  * exist only to avoid code duplication and should not be called except from

@@ -1283,19 +1272,12 @@ pkg_emit_manifest_digest(const unsigned char *digest, size_t len, char *hexdiges

  */
 static int
 pkg_emit_manifest_generic(struct pkg *pkg, void *out, short flags,
 	    char **pdigest, bool out_is_a_buf)
     bool out_is_a_buf)
 {
 	xstring *output = NULL;
 	unsigned char digest[SHA256_BLOCK_SIZE];
 	SHA256_CTX *sign_ctx = NULL;
 	int rc;
 	if (pdigest != NULL) {
 		*pdigest = xmalloc(sizeof(digest) * 2 + 1);
 		sign_ctx = xmalloc(sizeof(SHA256_CTX));
 		sha256_init(sign_ctx);
 	}
 	if (out_is_a_buf)
 		output = out;

@@ -1308,12 +1290,6 @@ pkg_emit_manifest_generic(struct pkg *pkg, void *out, short flags,

 	if (!out_is_a_buf)
 		fprintf(out, "%s\n", output->buf);
 	if (pdigest != NULL) {
 		sha256_final(sign_ctx, digest);
 		pkg_emit_manifest_digest(digest, sizeof(digest), *pdigest);
 		free(sign_ctx);
 	}
 	if (!out_is_a_buf)
 		xstring_free(output);

@@ -1321,15 +1297,15 @@ pkg_emit_manifest_generic(struct pkg *pkg, void *out, short flags,

 }
 int
 pkg_emit_manifest_file(struct pkg *pkg, FILE *f, short flags, char **pdigest)
 pkg_emit_manifest_file(struct pkg *pkg, FILE *f, short flags)
 {
 	return (pkg_emit_manifest_generic(pkg, f, flags, pdigest, false));
 	return (pkg_emit_manifest_generic(pkg, f, flags, false));
 }
 int
 pkg_emit_manifest_buf(struct pkg *pkg, xstring *b, short flags, char **pdigest)
 pkg_emit_manifest_buf(struct pkg *pkg, xstring *b, short flags)
 {
 	return (pkg_emit_manifest_generic(pkg, b, flags, pdigest, true));
 	return (pkg_emit_manifest_generic(pkg, b, flags, true));
 }

modified libpkg/private/pkg.h

@@ -714,7 +714,7 @@ int pkgdb_set_pkg_digest(struct pkgdb *db, struct pkg *pkg);

 int pkgdb_is_dir_used(struct pkgdb *db, struct pkg *p, const char *dir, int64_t *res);
 int pkgdb_file_set_cksum(struct pkgdb *db, struct pkg_file *file, const char *sha256);
 int pkg_emit_manifest_buf(struct pkg*, xstring *, short, char **);
 int pkg_emit_manifest_buf(struct pkg*, xstring *, short);
 int pkg_emit_filelist(struct pkg *, FILE *);
 bool ucl_object_emit_buf(const ucl_object_t *obj, enum ucl_emitter emit_type,

modified src/utils.c

@@ -358,7 +358,7 @@ print_info(struct pkg * const pkg, uint64_t options)

 		if (pkg_type(pkg) == PKG_REMOTE)
 			outflags |= PKG_MANIFEST_EMIT_COMPACT;
 		pkg_emit_manifest_file(pkg, stdout, outflags, NULL);
 		pkg_emit_manifest_file(pkg, stdout, outflags);
 		return;
 	}