summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/efiauthenticated.h2
-rw-r--r--include/http.h (renamed from include/Http.h)0
-rw-r--r--include/ip4config2.h (renamed from include/Ip4Config2.h)0
-rw-r--r--include/ip6config.h (renamed from include/Ip6Config.h)0
-rw-r--r--include/passwordcrypt.h (renamed from include/PasswordCrypt.h)0
-rw-r--r--include/pe.h (renamed from include/PeImage.h)2
-rw-r--r--include/variables.h4
-rw-r--r--lib/security_policy.c5
-rw-r--r--shim.h10
9 files changed, 9 insertions, 14 deletions
diff --git a/include/efiauthenticated.h b/include/efiauthenticated.h
index 7157ffd2..7c683e36 100644
--- a/include/efiauthenticated.h
+++ b/include/efiauthenticated.h
@@ -1,7 +1,7 @@
#ifndef SHIM_EFIAUTHENTICATED_H
#define SHIM_EFIAUTHENTICATED_H
-#include <wincert.h>
+#include "wincert.h"
/***********************************************************************
* Signature Database
diff --git a/include/Http.h b/include/http.h
index 4b3746a7..4b3746a7 100644
--- a/include/Http.h
+++ b/include/http.h
diff --git a/include/Ip4Config2.h b/include/ip4config2.h
index efacaf83..efacaf83 100644
--- a/include/Ip4Config2.h
+++ b/include/ip4config2.h
diff --git a/include/Ip6Config.h b/include/ip6config.h
index f99ce013..f99ce013 100644
--- a/include/Ip6Config.h
+++ b/include/ip6config.h
diff --git a/include/PasswordCrypt.h b/include/passwordcrypt.h
index cadad727..cadad727 100644
--- a/include/PasswordCrypt.h
+++ b/include/passwordcrypt.h
diff --git a/include/PeImage.h b/include/pe.h
index 209b96fb..49b89ae0 100644
--- a/include/PeImage.h
+++ b/include/pe.h
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef SHIM_PEIMAGE_H
#define SHIM_PEIMAGE_H
-#include <wincert.h>
+#include "wincert.h"
#define SIGNATURE_16(A, B) ((A) | (B << 8))
#define SIGNATURE_32(A, B, C, D) (SIGNATURE_16 (A, B) | (SIGNATURE_16 (C, D) << 16))
diff --git a/include/variables.h b/include/variables.h
index 436adb46..ee746ff6 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -1,8 +1,8 @@
#ifndef SHIM_VARIABLES_H
#define SHIM_VARIABLES_H
-#include <efiauthenticated.h>
-#include <PeImage.h> /* for SHA256_DIGEST_SIZE */
+#include "efiauthenticated.h"
+#include "pe.h" /* for SHA256_DIGEST_SIZE */
#define certlist_for_each_certentry(cl, cl_init, s, s_init) \
for (cl = (EFI_SIGNATURE_LIST *)(cl_init), s = (s_init); \
diff --git a/lib/security_policy.c b/lib/security_policy.c
index 211f1cfd..b51bcf77 100644
--- a/lib/security_policy.c
+++ b/lib/security_policy.c
@@ -11,12 +11,7 @@
#include "shim.h"
-#include <variables.h>
-#include <simple_file.h>
-#include <errors.h>
-
#if defined(OVERRIDE_SECURITY_POLICY)
-#include <security_policy.h>
/*
* See the UEFI Platform Initialization manual (Vol2: DXE) for this
diff --git a/shim.h b/shim.h
index 0b3ad4f2..db372df4 100644
--- a/shim.h
+++ b/shim.h
@@ -128,13 +128,13 @@
#include "include/errors.h"
#include "include/execute.h"
#include "include/guid.h"
-#include "include/Http.h"
+#include "include/http.h"
#include "include/httpboot.h"
-#include "include/Ip4Config2.h"
-#include "include/Ip6Config.h"
+#include "include/ip4config2.h"
+#include "include/ip6config.h"
#include "include/netboot.h"
-#include "include/PasswordCrypt.h"
-#include "include/PeImage.h"
+#include "include/passwordcrypt.h"
+#include "include/pe.h"
#include "include/replacements.h"
#if defined(OVERRIDE_SECURITY_POLICY)
#include "include/security_policy.h"