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/+/1297?usp=email
to review the following change.
Change subject: ssl: change return type of calc_control_channel_frame_overhead
to size_t
......................................................................
ssl: change return type of calc_control_channel_frame_overhead to size_t
This avoids dealing with conversion warnings inside
the function. Since we only add values that are
supposed to be positive this should be safe.
Note that we now cast the return value to int at
the caller side. There we actually substract it and
want to catch the case where the result gets negative.
Since all the involved values are quite small compared
to INT_MAX I decided to just cast it without further
checks.
Change-Id: I71e9d4a61d37483685723c16e98f59755694cadf
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/ssl.c
1 file changed, 3 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/97/1297/1
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 567560f..dfbbbc6 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -180,21 +180,16 @@
frame->tun_mtu = max_int(frame->tun_mtu, TLS_CHANNEL_MTU_MIN);
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
/**
* calculate the maximum overhead that control channel frames have
* This includes header, op code and everything apart from the
* payload itself. This method is a bit pessimistic and might give higher
* overhead than we actually have */
-static int
+static size_t
calc_control_channel_frame_overhead(const struct tls_session *session)
{
const struct key_state *ks = &session->key[KS_PRIMARY];
- int overhead = 0;
+ size_t overhead = 0;
/* opcode */
overhead += 1;
@@ -227,10 +222,6 @@
return overhead;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
void
init_ssl_lib(void)
{
@@ -2651,7 +2642,7 @@
int max_pkt_len = min_int(TLS_CHANNEL_BUF_SIZE,
session->opt->frame.tun_mtu);
/* Subtract overhead */
- max_pkt_len -= calc_control_channel_frame_overhead(session);
+ max_pkt_len -= (int)calc_control_channel_frame_overhead(session);
/* calculate total available length for outgoing tls ciphertext */
int maxlen = max_pkt_len * rel_avail;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1297?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: I71e9d4a61d37483685723c16e98f59755694cadf
Gerrit-Change-Number: 1297
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
