Skip to contentSkip to conversation

sign-file: remove open coding of ERR_clear_error()

PATCH In review James Bottomley 2 participants 2 messages Oct 22, 2018

Subsystems (2)
Keys/keyrings Certificate handling
lore
Share & tools
lore

James Bottomley

author
#0 lore raw

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

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

Signed-off-by James Bottomley <[email protected]>
---
 scripts/sign-file.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
scripts/sign-file.c +2 -12
index 563419bc2837..49f1cf456254 100644
@@ -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)
Signature · 1 line
2.16.4