3 files changed, 41 insertions, 14 deletions

diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 5d9581499f..05fdc8aae6 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -1488,6 +1488,9 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
 			decompressed_size
 			);
 
+	if (!verbose)
+		return 0;
+
 	struct cbfs_file_attr_hash *attr = NULL;
 	while ((attr = cbfs_file_get_next_hash(entry, attr)) != NULL) {
 		size_t hash_len = vb2_digest_size(attr->hash.algo);
@@ -1507,9 +1510,6 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
 		free(hash_str);
 	}
 
-	if (!verbose)
-		return 0;
-
 	DEBUG(" cbfs_file=0x%x, offset=0x%x, content_address=0x%x+0x%x\n",
 	      cbfs_get_entry_addr(image, entry), ntohl(entry->offset),
 	      cbfs_get_entry_addr(image, entry) + ntohl(entry->offset),
@@ -1572,21 +1572,45 @@ static int cbfs_print_parseable_entry_info(struct cbfs_image *image,
 	fprintf(fp, "%s%s", type, sep);
 	fprintf(fp, "0x%zx%s", metadata_size, sep);
 	fprintf(fp, "0x%zx%s", data_size, sep);
-	fprintf(fp, "0x%zx\n", metadata_size + data_size);
+	fprintf(fp, "0x%zx", metadata_size + data_size);
+
+	if (verbose) {
+		unsigned int decompressed_size = 0;
+		unsigned int compression = cbfs_file_get_compression_info(entry,
+			&decompressed_size);
+		if (compression != CBFS_COMPRESS_NONE)
+			fprintf(fp, "%scomp:%s:0x%x", sep, lookup_name_by_type(
+				types_cbfs_compression, compression, "????"),
+				decompressed_size);
+
+		struct cbfs_file_attr_hash *attr = NULL;
+		while ((attr = cbfs_file_get_next_hash(entry, attr)) != NULL) {
+			size_t hash_len = vb2_digest_size(attr->hash.algo);
+			if (!hash_len)
+				continue;
+			char *hash_str = bintohex(attr->hash.raw, hash_len);
+			int valid = vb2_hash_verify(CBFS_SUBHEADER(entry),
+				ntohl(entry->len), &attr->hash) == VB2_SUCCESS;
+			fprintf(fp, "%shash:%s:%s:%s", sep,
+				vb2_get_hash_algorithm_name(attr->hash.algo),
+				hash_str, valid ? "valid" : "invalid");
+			free(hash_str);
+		}
+	}
+	fprintf(fp, "\n");
 
 	return 0;
 }
 
-int cbfs_print_directory(struct cbfs_image *image)
+void cbfs_print_directory(struct cbfs_image *image)
 {
 	if (cbfs_is_legacy_cbfs(image))
 		cbfs_print_header_info(image);
 	printf("%-30s %-10s %-12s   Size   Comp\n", "Name", "Offset", "Type");
 	cbfs_legacy_walk(image, cbfs_print_entry_info, NULL);
-	return 0;
 }
 
-int cbfs_print_parseable_directory(struct cbfs_image *image)
+void cbfs_print_parseable_directory(struct cbfs_image *image)
 {
 	size_t i;
 	const char *header[] = {
@@ -1603,7 +1627,6 @@ int cbfs_print_parseable_directory(struct cbfs_image *image)
 		fprintf(stdout, "%s%s", header[i], sep);
 	fprintf(stdout, "%s\n", header[i]);
 	cbfs_legacy_walk(image, cbfs_print_parseable_entry_info, stdout);
-	return 0;
 }
 
 int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry,
diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h
index 74c35c9443..664d1461d7 100644
--- a/util/cbfstool/cbfs_image.h
+++ b/util/cbfstool/cbfs_image.h
@@ -162,8 +162,8 @@ int cbfs_is_legacy_cbfs(struct cbfs_image *image);
 int cbfs_is_valid_entry(struct cbfs_image *image, struct cbfs_file *entry);
 
 /* Print CBFS component information. */
-int cbfs_print_directory(struct cbfs_image *image);
-int cbfs_print_parseable_directory(struct cbfs_image *image);
+void cbfs_print_directory(struct cbfs_image *image);
+void cbfs_print_parseable_directory(struct cbfs_image *image);
 int cbfs_print_header_info(struct cbfs_image *image);
 int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry,
 			  void *arg);
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 2fd8eaa6db..6936d57ece 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -1084,12 +1084,16 @@ static int cbfs_print(void)
 	if (cbfs_image_from_buffer(&image, param.image_region,
 							param.headeroffset))
 		return 1;
-	if (param.machine_parseable)
-		return cbfs_print_parseable_directory(&image);
-	else {
+	if (param.machine_parseable) {
+		if (verbose)
+			printf("[FMAP REGION]\t%s\n", param.region_name);
+		cbfs_print_parseable_directory(&image);
+	} else {
 		printf("FMAP REGION: %s\n", param.region_name);
-		return cbfs_print_directory(&image);
+		cbfs_print_directory(&image);
 	}
+
+	return 0;
 }
 
 static int cbfs_extract(void)