[PATCH v2 2/4] sign-file: remove open coding of ERR_clear_error()

[PATCH v2 2/4] sign-file: remove open coding of ERR_clear_error()

[James Bottomley]

drain_openssl_errors() is nothing more than an open coding of
ERR_clear_error().  Use the correct API everywhere.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
 scripts/sign-file.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index 563419bc2837..49f1cf456254 100644
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -92,16 +92,6 @@ static void display_openssl_errors(const char *f, int l)
 	}
 }
 
-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);			\
@@ -140,11 +130,11 @@ static EVP_PKEY *read_private_key(const char *private_key_name)
 		ENGINE *e;
 
 		ENGINE_load_builtin_engines();
-		drain_openssl_errors();
+		ERR_clear_error();
 		e = ENGINE_by_id("pkcs11");
 		ERR(!e, "Load PKCS#11 ENGINE");
 		if (ENGINE_init(e))
-			drain_openssl_errors();
+			ERR_clear_error();
 		else
 			ERR(1, "ENGINE_init");
 		if (key_pass)
-- 
2.16.4

Re: [PATCH v2 2/4] sign-file: remove open coding of ERR_clear_error()

[David Woodhouse]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

On Mon, 2018-10-22 at 11:45 +0100, James Bottomley wrote:
> drain_openssl_errors() is nothing more than an open coding of
> ERR_clear_error().  Use the correct API everywhere.
> 
> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com
> >

Acked-by: David Woodhouse <dwmw@amazon.co.uk>

[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5213 bytes --]