diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | lib/security/gpg.c | 2 | ||||
| -rw-r--r-- | lib/security/openssl.c | 4 | ||||
| -rw-r--r-- | ui/ncurses/nc-boot-editor.c | 2 | ||||
| -rw-r--r-- | ui/ncurses/nc-cui.c | 4 |
5 files changed, 19 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9eb0855..ed2ea82 100644 --- a/configure.ac +++ b/configure.ac @@ -239,6 +239,14 @@ AC_ARG_VAR( AS_IF([test "x$VERIFY_DIGEST" = x], [VERIFY_DIGEST="sha256"]) AC_DEFINE_UNQUOTED(VERIFY_DIGEST, "$VERIFY_DIGEST", [openssl verify dgst]) +AC_ARG_ENABLE([hard-lockdown], + [AS_HELP_STRING([--enable-hard-lockdown], + [if signed boot configured, the absence of the + LOCKDOWN_FILE does not disable signed boot at + runtime @<:@default=no@:>@])], + [AC_DEFINE(HARD_LOCKDOWN, 1, [Enable hard lockdown])], + []) + AC_ARG_ENABLE( [busybox], [AS_HELP_STRING( diff --git a/lib/security/gpg.c b/lib/security/gpg.c index 761d6ce..aae85aa 100644 --- a/lib/security/gpg.c +++ b/lib/security/gpg.c @@ -354,8 +354,10 @@ int lockdown_status() { /* assume most restrictive lockdown type */ int ret = PB_LOCKDOWN_SIGN; +#if !defined(HARD_LOCKDOWN) if (access(LOCKDOWN_FILE, F_OK) == -1) return PB_LOCKDOWN_NONE; +#endif /* determine lockdown type */ FILE *authorized_signatures_handle = NULL; diff --git a/lib/security/openssl.c b/lib/security/openssl.c index 03ea332..6454f8a 100644 --- a/lib/security/openssl.c +++ b/lib/security/openssl.c @@ -456,8 +456,10 @@ int lockdown_status(void) int ret = PB_LOCKDOWN_SIGN; PKCS12 *p12 = NULL; +#if !defined(HARD_LOCKDOWN) if (access(LOCKDOWN_FILE, F_OK) == -1) return PB_LOCKDOWN_NONE; +#endif /* determine lockdown type */ @@ -471,6 +473,6 @@ int lockdown_status(void) fclose(authorized_signatures_handle); } - return ret; + return ret; } diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c index 2e5749b..3f7c5e5 100644 --- a/ui/ncurses/nc-boot-editor.c +++ b/ui/ncurses/nc-boot-editor.c @@ -637,9 +637,11 @@ struct boot_editor *boot_editor_init(struct cui *cui, return NULL; #if defined(SIGNED_BOOT) +#if !defined(HARD_LOCKDOWN) if (access(LOCKDOWN_FILE, F_OK) == -1) boot_editor->use_signature_files = false; else +#endif boot_editor->use_signature_files = true; #else boot_editor->use_signature_files = false; diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 20a9048..8a3f97d 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -61,10 +61,14 @@ static void cui_cancel_autoboot_on_exit(struct cui *cui); static bool lockdown_active(void) { +#if defined(SIGNED_BOOT) && defined(HARD_LOCKDOWN) + return true; +#else bool lockdown = false; if (access(LOCKDOWN_FILE, F_OK) != -1) lockdown = true; return lockdown; +#endif } static void cui_start(void) |
