mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
6951526792
1. Rename function _do_env_set() to env_do_env_set(). 2. Replace kwbimage hack with UBOOT_CUSTOMIZE_CONFIG: "--disable TOOLS_KWBIMAGE" and "--disable TOOLS_LIBCRYPTO". 3. Disable CONFIG_CMD_BOOTEFI_BOOTMGR for all supported devices because the newly added UEFI bootmenu entries doesn't work. 4. Enable CONFIG_VERSION_VARIABLE for the OpenWrt One. Signed-off-by: Shiji Yang <yangshiji66@qq.com> Co-authored-by: Daniel Golle <daniel@makrotopia.org>
25 lines
629 B
Diff
25 lines
629 B
Diff
--- a/tools/image-host.c
|
|
+++ b/tools/image-host.c
|
|
@@ -1162,6 +1162,7 @@ static int fit_config_add_verification_d
|
|
* 2) get public key (X509_get_pubkey)
|
|
* 3) provide der format (d2i_RSAPublicKey)
|
|
*/
|
|
+#ifdef CONFIG_TOOLS_LIBCRYPTO
|
|
static int read_pub_key(const char *keydir, const void *name,
|
|
unsigned char **pubkey, int *pubkey_len)
|
|
{
|
|
@@ -1215,6 +1216,13 @@ err_cert:
|
|
fclose(f);
|
|
return ret;
|
|
}
|
|
+#else
|
|
+static int read_pub_key(const char *keydir, const void *name,
|
|
+ unsigned char **pubkey, int *pubkey_len)
|
|
+{
|
|
+ return -ENOSYS;
|
|
+}
|
|
+#endif
|
|
|
|
int fit_pre_load_data(const char *keydir, void *keydest, void *fit)
|
|
{
|