From b0cb4808863ef4cd19b49d0aa4021f3c7d4876ac Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Sun, 30 Mar 2025 00:55:36 +0000 Subject: [PATCH] Update printableString patch --- ...ded-signatures-add-support-for-printableString-.patch} | 8 ++++---- SPECS/grub2.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename SOURCES/{1000-Add-support-for-printableString-in-x509.patch => 1000-appended-signatures-add-support-for-printableString-.patch} (91%) diff --git a/SOURCES/1000-Add-support-for-printableString-in-x509.patch b/SOURCES/1000-appended-signatures-add-support-for-printableString-.patch similarity index 91% rename from SOURCES/1000-Add-support-for-printableString-in-x509.patch rename to SOURCES/1000-appended-signatures-add-support-for-printableString-.patch index ded39b4..8e9bd44 100644 --- a/SOURCES/1000-Add-support-for-printableString-in-x509.patch +++ b/SOURCES/1000-appended-signatures-add-support-for-printableString-.patch @@ -1,7 +1,7 @@ -From 14123e7711a5fec457c5b342c646c3a1f1544963 Mon Sep 17 00:00:00 2001 +From 5f99a195e8603eb522efb1f04039a91bf6c31a05 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Sat, 29 Mar 2025 23:35:42 +0000 -Subject: [PATCH] Add support for printableString in x509 +Subject: [PATCH] appended signatures: add support for printableString in x509 Original patch by Daniel Axtens @@ -11,7 +11,7 @@ Signed-off-by: Andrew Lukoshko 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c -index 42ec65c..e58dcab 100644 +index 42ec65c..c2cfe5f 100644 --- a/grub-core/commands/appendedsig/x509.c +++ b/grub-core/commands/appendedsig/x509.c @@ -310,22 +310,36 @@ decode_string (char *der, int der_size, char **string, @@ -46,7 +46,7 @@ index 42ec65c..e58dcab 100644 + { + err = + grub_error (GRUB_ERR_BAD_FILE_TYPE, -+ "Error reading size of UTF-8 string: %s", ++ "Error reading size of printable string: %s", + asn1_strerror (result)); + goto cleanup_choice; + } diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index d22ae1e..ca73e32 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -92,7 +92,7 @@ hardware devices.\ %include %{SOURCE11} # AlmaLinux -Patch1000: 1000-Add-support-for-printableString-in-x509.patch +Patch1000: 1000-appended-signatures-add-support-for-printableString-.patch %description %{desc}