The object name patch went mainline with 2020.07. Signed-off-by: Bastian Krause <[email protected]> --- ...erriding-the-object-name-when-alread.patch | 81 ------------------- patches/u-boot-2020.04/series | 4 - rules/u-boot-tools.make | 4 +- 3 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 patches/u-boot-2020.04/0001-lib-rsa-avoid-overriding-the-object-name-when-alread.patch delete mode 100644 patches/u-boot-2020.04/series
diff --git a/patches/u-boot-2020.04/0001-lib-rsa-avoid-overriding-the-object-name-when-alread.patch b/patches/u-boot-2020.04/0001-lib-rsa-avoid-overriding-the-object-name-when-alread.patch deleted file mode 100644 index 5ba930fb5..000000000 --- a/patches/u-boot-2020.04/0001-lib-rsa-avoid-overriding-the-object-name-when-alread.patch +++ /dev/null @@ -1,81 +0,0 @@ -From: Jan Luebbe <[email protected]> -Date: Mon, 16 Mar 2020 11:45:22 +0100 -Subject: [PATCH] lib: rsa: avoid overriding the object name when already - specified - -If "object=" is specified in "keydir" when using the pkcs11 engine do -not append another "object=<key-name-hint>". This makes it possible to -use object names other than the key name hint. These two string -identifiers are not necessarily equal. - -Signed-off-by: Jan Luebbe <[email protected]> -Signed-off-by: Bastian Krause <[email protected]> -Reviewed-by: George McCollister <[email protected]> -Forwarded: https://lists.denx.de/pipermail/u-boot/2020-May/411892.html ---- - doc/uImage.FIT/signature.txt | 8 +++++--- - lib/rsa/rsa-sign.c | 22 ++++++++++++++++------ - 2 files changed, 21 insertions(+), 9 deletions(-) - -diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt -index 3591225a6edd..d4afd755e9fc 100644 ---- a/doc/uImage.FIT/signature.txt -+++ b/doc/uImage.FIT/signature.txt -@@ -481,12 +481,14 @@ openssl. This may require setting up LD_LIBRARY_PATH if engine is not installed - to openssl's default search paths. - - PKCS11 engine support forms "key id" based on "keydir" and with --"key-name-hint". "key-name-hint" is used as "object" name and "keydir" if --defined is used to define (prefix for) which PKCS11 source is being used for --lookup up for the key. -+"key-name-hint". "key-name-hint" is used as "object" name (if not defined in -+keydir). "keydir" (if defined) is used to define (prefix for) which PKCS11 source -+is being used for lookup up for the key. - - PKCS11 engine key ids: - "pkcs11:<keydir>;object=<key-name-hint>;type=<public|private>" -+or, if keydir contains "object=" -+ "pkcs11:<keydir>;type=<public|private>" - or - "pkcs11:object=<key-name-hint>;type=<public|private>", - -diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c -index 580c74470939..1914b9641312 100644 ---- a/lib/rsa/rsa-sign.c -+++ b/lib/rsa/rsa-sign.c -@@ -135,9 +135,14 @@ static int rsa_engine_get_pub_key(const char *keydir, const char *name, - - if (engine_id && !strcmp(engine_id, "pkcs11")) { - if (keydir) -- snprintf(key_id, sizeof(key_id), -- "pkcs11:%s;object=%s;type=public", -- keydir, name); -+ if (strstr(keydir, "object=")) -+ snprintf(key_id, sizeof(key_id), -+ "pkcs11:%s;type=public", -+ keydir); -+ else -+ snprintf(key_id, sizeof(key_id), -+ "pkcs11:%s;object=%s;type=public", -+ keydir, name); - else - snprintf(key_id, sizeof(key_id), - "pkcs11:object=%s;type=public", -@@ -255,9 +260,14 @@ static int rsa_engine_get_priv_key(const char *keydir, const char *name, - - if (engine_id && !strcmp(engine_id, "pkcs11")) { - if (keydir) -- snprintf(key_id, sizeof(key_id), -- "pkcs11:%s;object=%s;type=private", -- keydir, name); -+ if (strstr(keydir, "object=")) -+ snprintf(key_id, sizeof(key_id), -+ "pkcs11:%s;type=private", -+ keydir); -+ else -+ snprintf(key_id, sizeof(key_id), -+ "pkcs11:%s;object=%s;type=private", -+ keydir, name); - else - snprintf(key_id, sizeof(key_id), - "pkcs11:object=%s;type=private", diff --git a/patches/u-boot-2020.04/series b/patches/u-boot-2020.04/series deleted file mode 100644 index 02db98548..000000000 --- a/patches/u-boot-2020.04/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-lib-rsa-avoid-overriding-the-object-name-when-alread.patch -# d5b0f03c362d4c4e9d26f37173d666d6 - git-ptx-patches magic diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make index 21b17c527..597ea5e30 100644 --- a/rules/u-boot-tools.make +++ b/rules/u-boot-tools.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools # # Paths and names # -U_BOOT_TOOLS_VERSION := 2020.04 -U_BOOT_TOOLS_MD5 := 51113d2288c55110e33a895c65ab9f60 +U_BOOT_TOOLS_VERSION := 2020.07 +U_BOOT_TOOLS_MD5 := 86e51eeccd15e658ad1df943a0edf622 U_BOOT_TOOLS := u-boot-$(U_BOOT_TOOLS_VERSION) U_BOOT_TOOLS_SUFFIX := tar.bz2 U_BOOT_TOOLS_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) -- 2.27.0 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
