Fix debug_level for UTIL_CTX_log()

Author: mtrojnar

src/eng_back.c

@@ -235,6 +235,7 @@ EVP_PKEY *ENGINE_CTX_load_privkey(ENGINE_CTX *ctx, const char *s_key_id,
 static int ENGINE_CTX_ctrl_set_debug_level(ENGINE_CTX *ctx, int level)
 {
 	ctx->debug_level = level;
+	UTIL_CTX_set_debug_level(ctx->util_ctx, level);
 	return 1;
 }
 

src/util.h

@@ -63,6 +63,7 @@ int UTIL_CTX_init_libp11(UTIL_CTX *ctx);
 int UTIL_CTX_free_libp11(UTIL_CTX *ctx);
 
 void UTIL_CTX_set_vlog_a(UTIL_CTX *ctx, PKCS11_VLOG_A_CB vlog);
+void UTIL_CTX_set_debug_level(UTIL_CTX *ctx, int debug_level);
 void UTIL_CTX_log(UTIL_CTX *ctx, int level, const char *format, ...);
 
 int UTIL_CTX_set_pin(UTIL_CTX *ctx, const char *pin);

src/util_uri.c

@@ -191,6 +191,11 @@ void UTIL_CTX_set_vlog_a(UTIL_CTX *ctx, PKCS11_VLOG_A_CB vlog)
 		PKCS11_set_vlog_a_method(ctx->pkcs11_ctx, vlog); /* update */
 }
 
+void UTIL_CTX_set_debug_level(UTIL_CTX *ctx, int debug_level)
+{
+	ctx->debug_level = debug_level;
+}
+
 void UTIL_CTX_log(UTIL_CTX *ctx, int level, const char *format, ...)
 {
 	va_list args;
@@ -382,9 +387,8 @@ static int UTIL_CTX_get_pin(UTIL_CTX *ctx, const char *token_label)
 	memset(ctx->pin, 0, MAX_PIN_LENGTH+1);
 	ctx->pin_length = MAX_PIN_LENGTH;
 	prompt = UI_construct_prompt(ui, "PKCS#11 token PIN", token_label);
-	if (!prompt) {
+	if (!prompt)
 		return 0;
-	}
 	if (UI_dup_input_string(ui, prompt,
 			UI_INPUT_FLAG_DEFAULT_PWD, ctx->pin, 4, MAX_PIN_LENGTH) <= 0) {
 		UTIL_CTX_log(ctx, LOG_ERR, "UI_dup_input_string failed\n");