@@ -86,9 +86,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -309,7 +308,7 @@ cc_handle_deferred_v1(int seconds, const char *name, const char **envp)

     /* do mighty complicated work that will really take time here... */

     plugin_log(PLOG_NOTE, MODULE, "in async/deferred handler, sleep(%d)", seconds);

-    sleep(seconds);

+    sleep((unsigned int)seconds);

     /* write config options to openvpn */

     int ret = write_cc_options_file(name, envp);

@@ -124,9 +124,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -170,7 +169,7 @@ atoi_null0(const char *str)

 /* Require a minimum OpenVPN Plugin API */

 OPENVPN_EXPORT int

-openvpn_plugin_min_version_required_v1()

+openvpn_plugin_min_version_required_v1(void)

 {

     return OPENVPN_PLUGIN_VERSION_MIN;

 }

@@ -349,9 +348,9 @@ auth_user_pass_verify(struct plugin_context *context,

      */

     /* do mighty complicated work that will really take time here... */

-    plog(context, PLOG_NOTE, "in async/deferred handler, usleep(%d)",

-         context->test_deferred_auth*1000);

-    usleep(context->test_deferred_auth*1000);

+    useconds_t wait_time = (useconds_t)context->test_deferred_auth*1000;

+    plog(context, PLOG_NOTE, "in async/deferred handler, usleep(%u)", wait_time);

+    usleep(wait_time);

     /* now signal success state to openvpn */

     int fd = open(auth_control_file, O_WRONLY);

@@ -69,9 +69,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -52,9 +52,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -55,9 +55,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -59,9 +59,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -175,7 +174,7 @@ openvpn_plugin_func_v1(openvpn_plugin_handle_t handle, const int type, const cha

     /* test the BASE64 encode function */

     char *buf = NULL;

-    int r = ovpn_base64_encode(clcert_cn, strlen(clcert_cn), &buf);

+    int r = ovpn_base64_encode(clcert_cn, (int)strlen(clcert_cn), &buf);

     ovpn_log(PLOG_NOTE, PLUGIN_NAME, "BASE64 encoded '%s' (return value %i):  '%s'",

              clcert_cn, r, buf);

@@ -54,9 +54,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -165,31 +165,30 @@ send_control(int fd, int code)

     }

 }

-static int

-recv_string(int fd, char *buffer, int len)

+static ssize_t

+recv_string(int fd, char *buffer, size_t len)

 {

     if (len > 0)

     {

-        ssize_t size;

         memset(buffer, 0, len);

-        size = read(fd, buffer, len);

+        ssize_t size = read(fd, buffer, len);

         buffer[len-1] = 0;

         if (size >= 1)

         {

-            return (int)size;

+            return size;

         }

     }

     return -1;

 }

-static int

+static ssize_t

 send_string(int fd, const char *string)

 {

-    const int len = strlen(string) + 1;

+    const size_t len = strlen(string) + 1;

     const ssize_t size = write(fd, string, len);

     if (size == len)

     {

-        return (int) size;

+        return size;

     }

     else

     {

@@ -645,27 +644,26 @@ openvpn_plugin_abort_v1(openvpn_plugin_handle_t handle)

  * PAM conversation function

  */

 static int

-my_conv(int n, const struct pam_message **msg_array,

+my_conv(int num_msg, const struct pam_message **msg_array,

         struct pam_response **response_array, void *appdata_ptr)

 {

     const struct user_pass *up = ( const struct user_pass *) appdata_ptr;

     struct pam_response *aresp;

-    int i;

     int ret = PAM_SUCCESS;

     *response_array = NULL;

-    if (n <= 0 || n > PAM_MAX_NUM_MSG)

+    if (num_msg <= 0 || num_msg > PAM_MAX_NUM_MSG)

     {

         return (PAM_CONV_ERR);

     }

-    if ((aresp = calloc(n, sizeof *aresp)) == NULL)

+    if ((aresp = calloc((size_t)num_msg, sizeof *aresp)) == NULL)

     {

         return (PAM_BUF_ERR);

     }

     /* loop through each PAM-module query */

-    for (i = 0; i < n; ++i)

+    for (int i = 0; i < num_msg; ++i)

     {

         const struct pam_message *msg = msg_array[i];

         aresp[i].resp_retcode = 0;

@@ -683,9 +681,9 @@ my_conv(int n, const struct pam_message **msg_array,

         {

             /* use name/value list match method */

             const struct name_value_list *list = up->name_value_list;

-            int j;

             /* loop through name/value pairs */

+            int j; /* checked after loop */

             for (j = 0; j < list->len; ++j)

             {

                 const char *match_name = list->data[j].name;

@@ -79,7 +79,7 @@ searchandreplace(const char *tosearch, const char *searchfor, const char *replac

     while (scratch)

     {

-        strncat(temp, searching, scratch-searching);

+        strncat(temp, searching, (size_t)(scratch-searching));

         strcat(temp, replacewith);

         searching = scratch+strlen(searchfor);

@@ -93,9 +93,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -88,9 +88,8 @@ get_env(const char *name, const char *envp[])

 {

     if (envp)

     {

-        int i;

-        const int namelen = strlen(name);

-        for (i = 0; envp[i]; ++i)

+        const size_t namelen = strlen(name);

+        for (int i = 0; envp[i]; ++i)

         {

             if (!strncmp(envp[i], name, namelen))

             {

@@ -108,10 +107,10 @@ get_env(const char *name, const char *envp[])

 /*

  * Return the length of a string array

  */

-static int

+static size_t

 string_array_len(const char *array[])

 {

-    int i = 0;

+    size_t i = 0;

     if (array)

     {

         while (array[i])

@@ -141,14 +140,14 @@ recv_control(int fd)

     }

 }

-static int

+static ssize_t

 send_control(int fd, int code)

 {

     unsigned char c = (unsigned char) code;

     const ssize_t size = write(fd, &c, sizeof(c));

     if (size == sizeof(c))

     {

-        return (int) size;

+        return size;

     }

     else

     {

@@ -281,7 +280,6 @@ OPENVPN_EXPORT openvpn_plugin_handle_t

 openvpn_plugin_open_v1(unsigned int *type_mask, const char *argv[], const char *envp[])

 {

     struct down_root_context *context;

-    int i = 0;

     /*

      * Allocate our context

@@ -320,7 +318,7 @@ openvpn_plugin_open_v1(unsigned int *type_mask, const char *argv[], const char *

     }

     /* Ignore argv[0], as it contains just the plug-in file name */

-    for (i = 1; i < string_array_len(argv); i++)

+    for (int i = 1; i < string_array_len(argv); i++)

     {

         context->command[i-1] = (char *) argv[i];

     }