mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-10-22 21:58:14 +00:00
Ryan Eatmon
1fe53d8a1a
Backport a set of kernel patches to 6.6 to fix the OpenSSL build failures. Signed-off-by: Ryan Eatmon <reatmon@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
206 lines
5.0 KiB
Diff
206 lines
5.0 KiB
Diff
From 300e6d4116f956b035281ec94297dc4dc8d4e1d3 Mon Sep 17 00:00:00 2001
|
|
From: Jan Stancek <jstancek@redhat.com>
|
|
Date: Fri, 12 Jul 2024 09:11:14 +0200
|
|
Subject: sign-file,extract-cert: move common SSL helper functions to a header
|
|
|
|
Couple error handling helpers are repeated in both tools, so
|
|
move them to a common header.
|
|
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
|
|
Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com>
|
|
Reviewed-by: Neal Gompa <neal@gompa.dev>
|
|
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
|
|
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
---
|
|
MAINTAINERS | 1 +
|
|
certs/Makefile | 2 +-
|
|
certs/extract-cert.c | 37 ++-----------------------------------
|
|
scripts/sign-file.c | 37 ++-----------------------------------
|
|
scripts/ssl-common.h | 39 +++++++++++++++++++++++++++++++++++++++
|
|
5 files changed, 45 insertions(+), 71 deletions(-)
|
|
create mode 100644 scripts/ssl-common.h
|
|
|
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
index 9278c30ef1d5a..23f9028848552 100644
|
|
--- a/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
@@ -5204,6 +5204,7 @@ S: Maintained
|
|
F: Documentation/admin-guide/module-signing.rst
|
|
F: certs/
|
|
F: scripts/sign-file.c
|
|
+F: scripts/ssl-common.h
|
|
F: tools/certs/
|
|
|
|
CFAG12864B LCD DRIVER
|
|
diff --git a/certs/Makefile b/certs/Makefile
|
|
index 1094e3860c2a7..f6fa4d8d75e05 100644
|
|
--- a/certs/Makefile
|
|
+++ b/certs/Makefile
|
|
@@ -84,5 +84,5 @@ targets += x509_revocation_list
|
|
|
|
hostprogs := extract-cert
|
|
|
|
-HOSTCFLAGS_extract-cert.o = $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null)
|
|
+HOSTCFLAGS_extract-cert.o = $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null) -I$(srctree)/scripts
|
|
HOSTLDLIBS_extract-cert = $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)
|
|
diff --git a/certs/extract-cert.c b/certs/extract-cert.c
|
|
index 70e9ec89d87d3..8e7ba9974a1fa 100644
|
|
--- a/certs/extract-cert.c
|
|
+++ b/certs/extract-cert.c
|
|
@@ -23,6 +23,8 @@
|
|
#include <openssl/err.h>
|
|
#include <openssl/engine.h>
|
|
|
|
+#include "ssl-common.h"
|
|
+
|
|
/*
|
|
* OpenSSL 3.0 deprecates the OpenSSL's ENGINE API.
|
|
*
|
|
@@ -40,41 +42,6 @@ void format(void)
|
|
exit(2);
|
|
}
|
|
|
|
-static void display_openssl_errors(int l)
|
|
-{
|
|
- const char *file;
|
|
- char buf[120];
|
|
- int e, line;
|
|
-
|
|
- if (ERR_peek_error() == 0)
|
|
- return;
|
|
- fprintf(stderr, "At main.c:%d:\n", l);
|
|
-
|
|
- while ((e = ERR_get_error_line(&file, &line))) {
|
|
- ERR_error_string(e, buf);
|
|
- fprintf(stderr, "- SSL %s: %s:%d\n", buf, file, line);
|
|
- }
|
|
-}
|
|
-
|
|
-static void drain_openssl_errors(void)
|
|
-{
|
|
- const char *file;
|
|
- int line;
|
|
-
|
|
- if (ERR_peek_error() == 0)
|
|
- return;
|
|
- while (ERR_get_error_line(&file, &line)) {}
|
|
-}
|
|
-
|
|
-#define ERR(cond, fmt, ...) \
|
|
- do { \
|
|
- bool __cond = (cond); \
|
|
- display_openssl_errors(__LINE__); \
|
|
- if (__cond) { \
|
|
- err(1, fmt, ## __VA_ARGS__); \
|
|
- } \
|
|
- } while(0)
|
|
-
|
|
static const char *key_pass;
|
|
static BIO *wb;
|
|
static char *cert_dst;
|
|
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
|
|
index 3edb156ae52c3..39ba58db5d4ea 100644
|
|
--- a/scripts/sign-file.c
|
|
+++ b/scripts/sign-file.c
|
|
@@ -29,6 +29,8 @@
|
|
#include <openssl/err.h>
|
|
#include <openssl/engine.h>
|
|
|
|
+#include "ssl-common.h"
|
|
+
|
|
/*
|
|
* OpenSSL 3.0 deprecates the OpenSSL's ENGINE API.
|
|
*
|
|
@@ -83,41 +85,6 @@ void format(void)
|
|
exit(2);
|
|
}
|
|
|
|
-static void display_openssl_errors(int l)
|
|
-{
|
|
- const char *file;
|
|
- char buf[120];
|
|
- int e, line;
|
|
-
|
|
- if (ERR_peek_error() == 0)
|
|
- return;
|
|
- fprintf(stderr, "At main.c:%d:\n", l);
|
|
-
|
|
- while ((e = ERR_get_error_line(&file, &line))) {
|
|
- ERR_error_string(e, buf);
|
|
- fprintf(stderr, "- SSL %s: %s:%d\n", buf, file, line);
|
|
- }
|
|
-}
|
|
-
|
|
-static void drain_openssl_errors(void)
|
|
-{
|
|
- const char *file;
|
|
- int line;
|
|
-
|
|
- if (ERR_peek_error() == 0)
|
|
- return;
|
|
- while (ERR_get_error_line(&file, &line)) {}
|
|
-}
|
|
-
|
|
-#define ERR(cond, fmt, ...) \
|
|
- do { \
|
|
- bool __cond = (cond); \
|
|
- display_openssl_errors(__LINE__); \
|
|
- if (__cond) { \
|
|
- errx(1, fmt, ## __VA_ARGS__); \
|
|
- } \
|
|
- } while(0)
|
|
-
|
|
static const char *key_pass;
|
|
|
|
static int pem_pw_cb(char *buf, int len, int w, void *v)
|
|
diff --git a/scripts/ssl-common.h b/scripts/ssl-common.h
|
|
new file mode 100644
|
|
index 0000000000000..e6711c75ed913
|
|
--- /dev/null
|
|
+++ b/scripts/ssl-common.h
|
|
@@ -0,0 +1,39 @@
|
|
+/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
+/*
|
|
+ * SSL helper functions shared by sign-file and extract-cert.
|
|
+ */
|
|
+
|
|
+static void display_openssl_errors(int l)
|
|
+{
|
|
+ const char *file;
|
|
+ char buf[120];
|
|
+ int e, line;
|
|
+
|
|
+ if (ERR_peek_error() == 0)
|
|
+ return;
|
|
+ fprintf(stderr, "At main.c:%d:\n", l);
|
|
+
|
|
+ while ((e = ERR_get_error_line(&file, &line))) {
|
|
+ ERR_error_string(e, buf);
|
|
+ fprintf(stderr, "- SSL %s: %s:%d\n", buf, file, line);
|
|
+ }
|
|
+}
|
|
+
|
|
+static void drain_openssl_errors(void)
|
|
+{
|
|
+ const char *file;
|
|
+ int line;
|
|
+
|
|
+ if (ERR_peek_error() == 0)
|
|
+ return;
|
|
+ while (ERR_get_error_line(&file, &line)) {}
|
|
+}
|
|
+
|
|
+#define ERR(cond, fmt, ...) \
|
|
+ do { \
|
|
+ bool __cond = (cond); \
|
|
+ display_openssl_errors(__LINE__); \
|
|
+ if (__cond) { \
|
|
+ errx(1, fmt, ## __VA_ARGS__); \
|
|
+ } \
|
|
+ } while (0)
|
|
--
|
|
cgit 1.3.1-korg
|
|
|