utils: Do not propagate OpenSSL errors when non-mandatory attribute i…

…s missing The fallback is handled for multiple attributes, but not for single attribute, which is not recognized by the module. This is demonstrated by softokn and the CKA_ALLOWED_MECHANISMS attribute. Signed-off-by: Jakub Jelen <[email protected]>
Jakuje · Oct 23, 2024 · 3a873fd · 3a873fd
1 parent 0ef56dc
commit 3a873fd
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/util.c b/src/util.c
@@ -110,13 +110,8 @@ CK_RV p11prov_fetch_attributes(P11PROV_CTX *ctx, P11PROV_SESSION *session,
         ret = CKR_OK;
     }
 done:
-    if (ret == CKR_OK) {
-        /* if there was any error, remove it, as we got success */
-        p11prov_pop_error_to_mark(ctx);
-    } else {
-        /* otherwise clear the mark and leave errors on the stack */
-        p11prov_clear_last_error_mark(ctx);
-    }
+    /* if there was any error, remove it, as it will be handled by the caller */
+    p11prov_pop_error_to_mark(ctx);
     return ret;
 }