crypto: fix error capture when loading engine

tniessen · danielleadams · commit a40989faea6e · 2022-01-31T23:47:56.000-05:00
PR-URL: #41187 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
@@ -597,9 +597,8 @@ EnginePointer LoadEngineById(const char* id, CryptoErrorStore* errors) {
   }
 
   if (!engine && errors != nullptr) {
-    if (ERR_get_error() != 0) {
-      errors->Capture();
-    } else {
+    errors->Capture();
+    if (errors->Empty()) {
       errors->Insert(NodeCryptoError::ENGINE_NOT_FOUND, id);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -597,9 +597,8 @@ EnginePointer LoadEngineById(const char* id, CryptoErrorStore* errors) {`
`597`	`597`	`}`
`598`	`598`
`599`	`599`	`if (!engine && errors != nullptr) {`
`600`		`- if (ERR_get_error() != 0) {`
`601`		`- errors->Capture();`
`602`		`- } else {`
	`600`	`+ errors->Capture();`
	`601`	`+ if (errors->Empty()) {`
`603`	`602`	`errors->Insert(NodeCryptoError::ENGINE_NOT_FOUND, id);`
`604`	`603`	`}`
`605`	`604`	`}`