brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-27 23:20:26 +09:00
Code Issues Projects Releases Wiki Activity

autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION

Browse Source 
Use if() instead for this option, renaming the two different
passwd_abort() functions to indicate their purpose.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-07-20 20:51:16 -06:00 committed by Tom Rini
parent 0c4bd318f5
commit e8c780560a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/autoboot.c
View File

@ -10,6 +10,7 @@
#include <cli.h> #include <cli.h>
#include <console.h> #include <console.h>
#include <fdtdec.h> #include <fdtdec.h>
#include <hash.h>
#include <menu.h> #include <menu.h>
#include <post.h> #include <post.h>
#include <u-boot/sha256.h> #include <u-boot/sha256.h>
@ -35,7 +36,6 @@ static int stored_bootdelay;
#endif #endif
#if defined(CONFIG_AUTOBOOT_KEYED) #if defined(CONFIG_AUTOBOOT_KEYED)
#if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
/* /*
* Use a "constant-length" time compare function for this * Use a "constant-length" time compare function for this
@ -54,7 +54,7 @@ static int slow_equals(u8 *a, u8 *b, int len)
return diff == 0; return diff == 0;
} }
static int passwd_abort(uint64_t etime) static int passwd_abort_sha256(uint64_t etime)
{ {
const char *sha_env_str = env_get("bootstopkeysha256"); const char *sha_env_str = env_get("bootstopkeysha256");
u8 sha_env[SHA256_SUM_LEN]; u8 sha_env[SHA256_SUM_LEN];
@ -105,8 +105,8 @@ static int passwd_abort(uint64_t etime)
return abort; return abort;
} }
#else
static int passwd_abort(uint64_t etime) static int passwd_abort_key(uint64_t etime)
{ {
int abort = 0; int abort = 0;
struct { struct {
@ -182,7 +182,6 @@ static int passwd_abort(uint64_t etime)
return abort; return abort;
} }
#endif
/*************************************************************************** /***************************************************************************
* Watch for 'delay' seconds for autoboot stop or autoboot delay string. * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
@ -201,7 +200,10 @@ static int __abortboot(int bootdelay)
printf(CONFIG_AUTOBOOT_PROMPT, bootdelay); printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
# endif # endif
abort = passwd_abort(etime); if (IS_ENABLED(CONFIG_AUTOBOOT_ENCRYPTION))
abort = passwd_abort_sha256(etime);
else
abort = passwd_abort_key(etime);
if (!abort) if (!abort)
debug_bootkeys("key timeout\n"); debug_bootkeys("key timeout\n");