File openvpn-2.4.2-pkcs11_pin_prompt.patch of Package openvpn

Overview Repositories Revisions Requests Users Attributes Meta

File openvpn-2.4.2-pkcs11_pin_prompt.patch of Package openvpn (Revision 72831512a0f765af72915f4ebe44d140)

Currently displaying revision 72831512a0f765af72915f4ebe44d140 , Show latest

Dirty fix for the OpenVPN #538 "no PIN prompt with PKCS11 when systemd is enabled" bug
https://community.openvpn.net/openvpn/ticket/538

--- ./src/openvpn/console.h
+++ ./src/openvpn/console.h
@@ -117,4 +117,21 @@ query_user_SINGLE(char *prompt, size_t prompt_len,
     return query_user_exec();
 }
 
+/* A plain "make Gert happy" wrapper over built-in user querying method.
+ * Same arguments as @query_user_add
+ *
+ * Allows to use built-in method for PKCS11 PIN prompt regardless of
+ * the systemd support status and presence,
+ * see https://community.openvpn.net/openvpn/ticket/538 for details.
+*/
+static inline bool
+query_user_builtin_SINGLE(char *prompt, size_t prompt_len,
+                  char *resp, size_t resp_len,
+                  bool echo)
+{
+    query_user_clear();
+    query_user_add(prompt, prompt_len, resp, resp_len, echo);
+    return query_user_exec_builtin();
+}
+
 #endif /* ifndef CONSOLE_H */
--- ./src/openvpn/pkcs11.c
+++ ./src/openvpn/pkcs11.c
@@ -814,7 +814,7 @@ _pkcs11_openvpn_show_pkcs11_ids_pin_prompt(
     ASSERT(token!=NULL);
 
     buf_printf(&pass_prompt, "Please enter '%s' token PIN or 'cancel': ", token->display);
-    if (!query_user_SINGLE(BSTR(&pass_prompt), BLEN(&pass_prompt),
+    if (!query_user_builtin_SINGLE(BSTR(&pass_prompt), BLEN(&pass_prompt),
                            pin, pin_max, false))
     {
         msg(M_FATAL, "Could not retrieve the PIN");

Places

File openvpn-2.4.2-pkcs11_pin_prompt.patch of Package openvpn (Revision 72831512a0f765af72915f4ebe44d140)

Places