1. openvpn
  2. Commit da0a42ca98623487726162b8710690cd3d003a63
Browse code

Bump version of openvpn plugin argument structs to 5

This was missed in commit 6690769f78bbfb889fef2a54088d979896c87d51
that exported base64_encode and base64_decode() functions.

Also check the version is >= 5 in auth-pam plugin to ensure
that the base64_decode function pointer can be referenced.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1533696271-21799-1-git-send-email-selva.nair@gmail.com>
URL: https://www.mail-archive.com/search?l=mid&q=1533696271-21799-1-git-send-email-selva.nair@gmail.com
Signed-off-by: Gert Doering <gert@greenie.muc.de>

Selva Nair authored on 2018/08/08 11:44:30
Showing 2 changed files
include/openvpn-plugin.h.in
History View file @ da0a42c
... ... 
@@ -219,10 +219,11 @@ struct openvpn_plugin_string_list
219 219 
  *           OpenVPN to plug-ins.
220 220 
  *
221 221 
  *    4      Exported secure_memzero() as plugin_secure_memzero()
222 
- *           Exported openvpn_base64_encode() as plugin_base64_encode()
222 
+ *
223 
+ *    5      Exported openvpn_base64_encode() as plugin_base64_encode()
223 224 
  *           Exported openvpn_base64_decode() as plugin_base64_decode()
224 225 
  */
225 
-#define OPENVPN_PLUGINv3_STRUCTVER 4
226 
+#define OPENVPN_PLUGINv3_STRUCTVER 5
226 227
227 228 
 /**
228 229 
  * Definitions needed for the plug-in callback functions.
src/plugins/auth-pam/auth-pam.c
History View file @ da0a42c
... ... 
@@ -356,8 +356,8 @@ openvpn_plugin_open_v3(const int v3structver,
356 356 
     const char **argv = args->argv;
357 357 
     const char **envp = args->envp;
358 358
359 
-    /* Check API compatibility -- struct version 4 or higher needed */
360 
-    if (v3structver < 4)
359 
+    /* Check API compatibility -- struct version 5 or higher needed */
360 
+    if (v3structver < 5)
361 361 
     {
362 362 
         fprintf(stderr, "AUTH-PAM: This plugin is incompatible with the running version of OpenVPN\n");
363 363 
         return OPENVPN_PLUGIN_FUNC_ERROR;