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/+/1360?usp=email
to review the following change.
Change subject: ssl_pkt: Avoid conversion warnings
......................................................................
ssl_pkt: Avoid conversion warnings
I considered changing opcode to be uint8_t directly, but
most code treats it as int now, so that would be a much
bigger change. Similar for key_id.
Change-Id: I2a1786b2bf15852222c28e1b73ab7edbb5f19d7f
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/ssl_pkt.c
1 file changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/60/1360/1
diff --git a/src/openvpn/ssl_pkt.c b/src/openvpn/ssl_pkt.c
index d7f7ac3..77803ec 100644
--- a/src/openvpn/ssl_pkt.c
+++ b/src/openvpn/ssl_pkt.c
@@ -160,17 +160,14 @@
}
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
void
write_control_auth(struct tls_session *session, struct key_state *ks, struct
buffer *buf,
struct link_socket_actual **to_link_addr, int opcode, int
max_ack,
bool prepend_ack)
{
- uint8_t header = ks->key_id | (opcode << P_OPCODE_SHIFT);
+ ASSERT(ks->key_id >= 0 && ks->key_id <= 1 << P_OPCODE_SHIFT);
+ ASSERT(opcode >= 0 && opcode <= P_LAST_OPCODE);
+ uint8_t header = (uint8_t)(ks->key_id | (opcode << P_OPCODE_SHIFT));
/* Workaround for Softether servers. Softether has a bug that it only
* allows 4 ACks in packets and drops packets if more ACKs are contained
@@ -474,7 +471,7 @@
/* Get the valid time quantisation for our hmac,
* we divide time by handwindow/2 and allow the previous
* and future session time if specified by offset */
- uint32_t session_id_time = ntohl(now / ((handwindow + 1) / 2) + offset);
+ uint32_t session_id_time = ntohl((uint32_t)(now / ((handwindow + 1) / 2) +
offset));
hmac_ctx_reset(hmac);
/* We do not care about endian here since it does not need to be
@@ -501,10 +498,6 @@
return result.sid;
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
bool
check_session_hmac_and_pkt_id(struct tls_pre_decrypt_state *state,
const struct openvpn_sockaddr *from,
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1360?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: I2a1786b2bf15852222c28e1b73ab7edbb5f19d7f
Gerrit-Change-Number: 1360
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
