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/+/1302?usp=email
to review the following change.
Change subject: ssl: Clean up type handling in parse_early_negotiation_tlvs()
......................................................................
ssl: Clean up type handling in parse_early_negotiation_tlvs()
buf_read_u16 does not return uint16_t.
Change-Id: Ie7ad637223c332f7611c09b20a8d7a3a92d97ec7
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/ssl.c
1 file changed, 4 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/02/1302/1
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 819a1ef..9a3ba88 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -2195,11 +2195,6 @@
}
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
/**
* Handle reading key data, peer-info, username/password, OCC
* from the TLS control channel (cleartext).
@@ -2530,9 +2525,9 @@
goto error;
}
/* read type */
- uint16_t type = buf_read_u16(buf);
- uint16_t len = buf_read_u16(buf);
- if (buf_len(buf) < len)
+ int type = buf_read_u16(buf);
+ int len = buf_read_u16(buf);
+ if (type < 0 || len < 0 || buf_len(buf) < len)
{
goto error;
}
@@ -2544,7 +2539,7 @@
{
goto error;
}
- uint16_t flags = buf_read_u16(buf);
+ int flags = buf_read_u16(buf);
if (flags & EARLY_NEG_FLAG_RESEND_WKC)
{
@@ -3975,10 +3970,6 @@
}
}
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
void
tls_prepend_opcode_v1(const struct tls_multi *multi, struct buffer *buf)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1302?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: Ie7ad637223c332f7611c09b20a8d7a3a92d97ec7
Gerrit-Change-Number: 1302
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
