Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1451?usp=email
to review the following change.
Change subject: ssl_verify: Fix parsing of timeout from auth pending file
......................................................................
ssl_verify: Fix parsing of timeout from auth pending file
Make sure the value is not negative before casting
it to unsigned.
Change-Id: I8a5efb2ed009a702f10dc8f40c677f014547b4c8
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/ssl_verify.c
1 file changed, 6 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/51/1451/1
diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c
index a11003c..5effa2c 100644
--- a/src/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -874,11 +874,6 @@
return supported;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
/**
* Checks if the deferred state should also send auth pending
* request to the client. Also removes the auth_pending control file
@@ -888,7 +883,8 @@
* @returns false The file had an invlaid format or another error occured
*/
static bool
-key_state_check_auth_pending_file(struct auth_deferred_status *ads, struct
tls_multi *multi,
+key_state_check_auth_pending_file(struct auth_deferred_status *ads,
+ struct tls_multi *multi,
struct tls_session *session)
{
bool ret = true;
@@ -916,7 +912,7 @@
buf_chomp(extra_buf);
long timeout = strtol(BSTR(timeout_buf), NULL, 10);
- if (timeout == 0)
+ if (timeout <= 0)
{
msg(M_WARN, "could not parse auth pending file timeout");
buffer_list_free(lines);
@@ -933,14 +929,14 @@
pending_method);
auth_set_client_reason(multi, buf);
msg(M_INFO,
- "Client does not supported auth pending method "
- "'%s'",
+ "Client does not supported auth pending method '%s'",
pending_method);
ret = false;
}
else
{
- send_auth_pending_messages(multi, session, BSTR(extra_buf),
timeout);
+ send_auth_pending_messages(multi, session, BSTR(extra_buf),
+ (unsigned int)timeout);
}
}
@@ -950,10 +946,6 @@
return ret;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
/**
* Removes auth_pending and auth_control files from file system
* and key_state structure
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1451?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I8a5efb2ed009a702f10dc8f40c677f014547b4c8
Gerrit-Change-Number: 1451
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
