* 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, 94 insertions, 87 deletions

diff --git a/Cryptlib/SysCall/CrtWrapper.c b/Cryptlib/SysCall/CrtWrapper.c
index 3a852b9e..78789538 100644
--- a/Cryptlib/SysCall/CrtWrapper.c
+++ b/Cryptlib/SysCall/CrtWrapper.c
@@ -2,7 +2,7 @@
   C Run-Time Libraries (CRT) Wrapper Implementation for OpenSSL-based

   Cryptographic Library.

 

-Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 

-#include <OpenSslSupport.h>

+#include <CrtLibSupport.h>

 

 int errno = 0;

 

@@ -136,6 +136,30 @@ char *strrchr (const char *str, int c)
   }

 }

 

+/* Compare first n bytes of string s1 with string s2, ignoring case */

+int strncasecmp (const char *s1, const char *s2, size_t n)

+{

+  int Val;

+

+  ASSERT(s1 != NULL);

+  ASSERT(s2 != NULL);

+

+  if (n != 0) {

+    do {

+      Val = tolower(*s1) - tolower(*s2);

+      if (Val != 0) {

+        return Val;

+      }

+      ++s1;

+      ++s2;

+      if (*s1 == '\0') {

+        break;

+      }

+    } while (--n != 0);

+  }

+  return 0;

+}

+

 /* Read formatted data from a string */

 int sscanf (const char *buffer, const char *format, ...)

 {

@@ -146,6 +170,70 @@ int sscanf (const char *buffer, const char *format, ...)
   return 0;

 }

 

+/* Maps errnum to an error-message string */

+char * strerror (int errnum)

+{

+  return NULL;

+}

+

+/* Computes the length of the maximum initial segment of the string pointed to by s1

+   which consists entirely of characters from the string pointed to by s2. */

+size_t strspn (const char *s1 , const char *s2)

+{

+  UINT8   Map[32];

+  UINT32  Index;

+  size_t  Count;

+

+  for (Index = 0; Index < 32; Index++) {

+    Map[Index] = 0;

+  }

+

+  while (*s2) {

+    Map[*s2 >> 3] |= (1 << (*s2 & 7));

+    s2++;

+  }

+

+  if (*s1) {

+    Count = 0;

+    while (Map[*s1 >> 3] & (1 << (*s1 & 7))) {

+      Count++;

+      s1++;

+    }

+

+    return Count;

+  }

+

+  return 0;

+}

+

+/* Computes the length of the maximum initial segment of the string pointed to by s1

+   which consists entirely of characters not from the string pointed to by s2. */

+size_t strcspn (const char *s1, const char *s2)

+{

+  UINT8  Map[32];

+  UINT32 Index;

+  size_t Count;

+

+  for (Index = 0; Index < 32; Index++) {

+    Map[Index] = 0;

+  }

+

+  while (*s2) {

+    Map[*s2 >> 3] |= (1 << (*s2 & 7));

+    s2++;

+  }

+

+  Map[0] |= 1;

+

+  Count   = 0;

+  while (!(Map[*s1 >> 3] & (1 << (*s1 & 7)))) {

+    Count ++;

+    s1++;

+  }

+

+  return Count;

+}

+

 //

 // -- Character Classification Routines --

 //

@@ -277,52 +365,12 @@ char *getenv (const char *varname)
 // -- Stream I/O Routines --

 //

 

-/* Write formatted output using a pointer to a list of arguments */

-int vfprintf (FILE *stream, const char *format, VA_LIST arg)

-{

-  return 0;

-}

-

 /* Write data to a stream */

 size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)

 {

   return 0;

 }

 

-//

-//  -- Dummy OpenSSL Support Routines --

-//

-

-void *UI_OpenSSL(void)

-{

-  return NULL;

-}

-

-int X509_load_cert_file (VOID *ctx, const char *file, int type)

-{

-  return 0;

-}

-

-int X509_load_crl_file (VOID *ctx, const char *file, int type)

-{

-  return 0;

-}

-

-int chmod (const char *c, mode_t m)

-{

-  return -1;

-}

-

-int close (int f)

-{

-  return -1;

-}

-

-void closelog (void)

-{

-

-}

-

 #ifdef __GNUC__

 

 typedef

@@ -331,7 +379,6 @@ VOID
   VOID

   ) __attribute__((__noreturn__));

 

-

 STATIC

 VOID

 EFIAPI

@@ -341,8 +388,7 @@ NopFunction (
 {

 }

 

-

-void exit (int e)

+void abort (void)

 {

   NoReturnFuncPtr NoReturnFunc;

 

@@ -353,8 +399,9 @@ void exit (int e)
 

 #else

 

-void exit (int e)

+void abort (void)

 {

+  // Do nothing

 }

 

 #endif

@@ -374,11 +421,6 @@ size_t fread (void *b, size_t c, size_t i, FILE *f)
   return 0;

 }

 

-int fprintf (FILE *f, const char *s, ...)

-{

-  return 0;

-}

-

 uid_t getuid (void)

 {

   return 0;

@@ -399,42 +441,7 @@ gid_t getegid (void)
   return 0;

 }

 

-off_t lseek (int a, off_t o, int d)

-{

-  return 0;

-}

-

-void openlog (const char *c, int a, int b)

-{

-

-}

-

-ssize_t read (int f, void *b, size_t c)

-{

-  return 0;

-}

-

-int stat (const char *c, struct stat *s)

-{

-  return -1;

-}

-

-int strcasecmp (const char *c, const char *s)

-{

-  return 0;

-}

-

-int strncasecmp (const char *c, const char *s, size_t l)

-{

-  return 0;

-}

-

-void syslog (int a, const char *c, ...)

-{

-

-}

-

-ssize_t write (int f, const void *b, size_t l)

+int printf (char const *fmt, ...)

 {

   return 0;

 }