-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: Cherry-pick https://github.com/torvalds/linux/blob/master/s…
…cripts/ssl-common.h to satisfy dependencies of new signing logic Signed-off-by: Felicitas Pojtinger <[email protected]>
- Loading branch information
Showing
1 changed file
with
40 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ Reviewed-by: Neal Gompa <[email protected]> | |
Signed-off-by: Jarkko Sakkinen <[email protected]> | ||
--- | ||
diff --git a/certs/extract-cert.c b/certs/extract-cert.c | ||
index 70e9ec89d..7d6d468ed 100644 | ||
index 70e9ec89d87d..7d6d468ed612 100644 | ||
--- a/certs/extract-cert.c | ||
+++ b/certs/extract-cert.c | ||
@@ -21,14 +21,17 @@ | ||
|
@@ -193,7 +193,7 @@ index 70e9ec89d..7d6d468ed 100644 | |
BIO *b; | ||
X509 *x509; | ||
diff --git a/scripts/sign-file.c b/scripts/sign-file.c | ||
index 3edb156ae..7070245ed 100644 | ||
index 3edb156ae52c..7070245edfc1 100644 | ||
--- a/scripts/sign-file.c | ||
+++ b/scripts/sign-file.c | ||
@@ -27,14 +27,17 @@ | ||
|
@@ -368,3 +368,41 @@ index 3edb156ae..7070245ed 100644 | |
digest_algo = EVP_get_digestbyname(hash_algo); | ||
ERR(!digest_algo, "EVP_get_digestbyname"); | ||
|
||
diff --git a/scripts/ssl-common.h b/scripts/ssl-common.h | ||
new file mode 100644 | ||
index 000000000000..2db0e181143c | ||
--- /dev/null | ||
+++ b/scripts/ssl-common.h | ||
@@ -0,0 +1,32 @@ | ||
+/* SPDX-License-Identifier: LGPL-2.1+ */ | ||
+/* | ||
+ * SSL helper functions shared by sign-file and extract-cert. | ||
+ */ | ||
+ | ||
+static void drain_openssl_errors(int l, int silent) | ||
+{ | ||
+ const char *file; | ||
+ char buf[120]; | ||
+ int e, line; | ||
+ | ||
+ if (ERR_peek_error() == 0) | ||
+ return; | ||
+ if (!silent) | ||
+ fprintf(stderr, "At main.c:%d:\n", l); | ||
+ | ||
+ while ((e = ERR_peek_error_line(&file, &line))) { | ||
+ ERR_error_string(e, buf); | ||
+ if (!silent) | ||
+ fprintf(stderr, "- SSL %s: %s:%d\n", buf, file, line); | ||
+ ERR_get_error(); | ||
+ } | ||
+} | ||
+ | ||
+#define ERR(cond, fmt, ...) \ | ||
+ do { \ | ||
+ bool __cond = (cond); \ | ||
+ drain_openssl_errors(__LINE__, 0); \ | ||
+ if (__cond) { \ | ||
+ errx(1, fmt, ## __VA_ARGS__); \ | ||
+ } \ | ||
+ } while (0) |