* New upstream release.debian/15+1533136590.3beb971-1

  - debian/patches/second-stage-path: dropped; the default loader path now
    includes an arch suffix.
  - debian/patches/sbsigntool-no-pesign: dropped; no longer needed.
* Drop remaining patches that were not being applied.
* Sync packaging from Ubuntu:
  - debian/copyright: Update upstream source location.
  - debian/control: add a Build-Depends on libelf-dev.
  - Enable arm64 build.
  - debian/patches/fixup_git.patch: don't run git in clean; we're not
    really in a git tree.
  - debian/rules, debian/shim.install: use the upstream install target as
    intended, and move files to the target directory using dh_install.
  - define RELEASE and COMMIT_ID for the snapshot.
  - Set ENABLE_HTTPBOOT to enable the HTTP Boot feature.
  - Update dh_auto_build/dh_auto_clean/dh_auto_install for new upstream
    options: set MAKELEVEL.
  - Define an EFI_ARCH variable, and use that for paths to shim. This
    makes it possible to build a shim for other architectures than amd64.
  - Set EFIDIR=$distro for dh_auto_install; that will let files be installed
    in the "right" final directories, and makes boot.csv for us.
  - Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built
    at compile-time for MokManager and fallback.
  - Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback
    and MokManager.

1 files changed, 104 insertions, 0 deletions

diff --git a/include/hexdump.h b/include/hexdump.h
new file mode 100644
index 00000000..d337b571
--- /dev/null
+++ b/include/hexdump.h
@@ -0,0 +1,104 @@
+#ifndef STATIC_HEXDUMP_H
+#define STATIC_HEXDUMP_H
+
+static int
+__attribute__((__unused__))
+isprint(char c)
+{
+	if (c < 0x20)
+		return 0;
+	if (c > 0x7e)
+		return 0;
+	return 1;
+}
+
+static UINTN
+__attribute__((__unused__))
+format_hex(UINT8 *data, UINTN size, CHAR16 *buf)
+{
+	UINTN sz = (UINTN)data % 16;
+	CHAR16 hexchars[] = L"0123456789abcdef";
+	int offset = 0;
+	UINTN i;
+	UINTN j;
+
+	for (i = 0; i < sz; i++) {
+		buf[offset++] = L' ';
+		buf[offset++] = L' ';
+		buf[offset++] = L' ';
+		if (i == 7)
+			buf[offset++] = L' ';
+	}
+	for (j = sz; j < 16 && j < size; j++) {
+		UINT8 d = data[j-sz];
+		buf[offset++] = hexchars[(d & 0xf0) >> 4];
+		buf[offset++] = hexchars[(d & 0x0f)];
+		if (j != 15)
+			buf[offset++] = L' ';
+		if (j == 7)
+			buf[offset++] = L' ';
+	}
+	for (i = j; i < 16; i++) {
+		buf[offset++] = L' ';
+		buf[offset++] = L' ';
+		if (i != 15)
+			buf[offset++] = L' ';
+		if (i == 7)
+			buf[offset++] = L' ';
+	}
+	buf[offset] = L'\0';
+	return j - sz;
+}
+
+static void
+__attribute__((__unused__))
+format_text(UINT8 *data, UINTN size, CHAR16 *buf)
+{
+	UINTN sz = (UINTN)data % 16;
+	int offset = 0;
+	UINTN i;
+	UINTN j;
+
+	for (i = 0; i < sz; i++)
+		buf[offset++] = L' ';
+	buf[offset++] = L'|';
+	for (j = sz; j < 16 && j < size; j++) {
+		if (isprint(data[j-sz]))
+			buf[offset++] = data[j-sz];
+		else
+			buf[offset++] = L'.';
+	}
+	buf[offset++] = L'|';
+	for (i = j; i < 16; i++)
+		buf[offset++] = L' ';
+	buf[offset] = L'\0';
+}
+
+static void
+__attribute__((__unused__))
+hexdump(UINT8 *data, UINTN size)
+{
+	UINTN display_offset = (UINTN)data & 0xffffffff;
+	UINTN offset = 0;
+	//console_print(L"hexdump: data=0x%016x size=0x%x\n", data, size);
+
+	while (offset < size) {
+		CHAR16 hexbuf[49];
+		CHAR16 txtbuf[19];
+		UINTN sz;
+
+		sz = format_hex(data+offset, size-offset, hexbuf);
+		if (sz == 0)
+			return;
+		msleep(200000);
+
+		format_text(data+offset, size-offset, txtbuf);
+		console_print(L"%08x  %s  %s\n", display_offset, hexbuf, txtbuf);
+		msleep(200000);
+
+		display_offset += sz;
+		offset += sz;
+	}
+}
+
+#endif /* STATIC_HEXDUMP_H */