Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jun 2015 07:00:54 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r284674 - stable/10/usr.sbin/uefisign
Message-ID:  <201506210700.t5L70sIP062011@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Sun Jun 21 07:00:54 2015
New Revision: 284674
URL: https://svnweb.freebsd.org/changeset/base/284674

Log:
  MFC r283141:
  
  Remove the warning about invalid PE checksum; apparently nothing
  cares about those checksums anyway.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/uefisign/pe.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/uefisign/pe.c
==============================================================================
--- stable/10/usr.sbin/uefisign/pe.c	Sun Jun 21 06:57:40 2015	(r284673)
+++ stable/10/usr.sbin/uefisign/pe.c	Sun Jun 21 07:00:54 2015	(r284674)
@@ -346,7 +346,9 @@ static void
 parse_optional_32_plus(struct executable *x, off_t off,
     int number_of_sections)
 {
+#if 0
 	uint32_t computed_checksum;
+#endif
 	const struct pe_optional_header_32_plus	*po;
 
 	range_check(x, off, sizeof(*po), "PE Optional Header");
@@ -373,13 +375,13 @@ parse_optional_32_plus(struct executable
 #if 0
 	printf("checksum 0x%x at offset %zd, len %zd\n",
 	    po->po_checksum, x->x_checksum_off, x->x_checksum_len);
-#endif
 
 	computed_checksum = compute_checksum(x);
 	if (computed_checksum != po->po_checksum) {
 		warnx("invalid PE+ checksum; is 0x%x, should be 0x%x",
 		    po->po_checksum, computed_checksum);
 	}
+#endif
 
 	if (x->x_len < x->x_headers_len)
 		errx(1, "invalid SizeOfHeaders %d", po->po_size_of_headers);
@@ -393,7 +395,9 @@ parse_optional_32_plus(struct executable
 static void
 parse_optional_32(struct executable *x, off_t off, int number_of_sections)
 {
+#if 0
 	uint32_t computed_checksum;
+#endif
 	const struct pe_optional_header_32 *po;
 
 	range_check(x, off, sizeof(*po), "PE Optional Header");
@@ -420,13 +424,13 @@ parse_optional_32(struct executable *x, 
 #if 0
 	printf("checksum at offset %zd, len %zd\n",
 	    x->x_checksum_off, x->x_checksum_len);
-#endif
 
 	computed_checksum = compute_checksum(x);
 	if (computed_checksum != po->po_checksum) {
 		warnx("invalid PE checksum; is 0x%x, should be 0x%x",
 		    po->po_checksum, computed_checksum);
 	}
+#endif
 
 	if (x->x_len < x->x_headers_len)
 		errx(1, "invalid SizeOfHeaders %d", po->po_size_of_headers);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506210700.t5L70sIP062011>