Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1487597 - Used sized pointer, fix name shadowing, a=bustage
--HG--
extra : amend_source : 7531f3b583ac665b22ae38f9ccd030df211ddae6
  • Loading branch information
martinthomson committed May 2, 2019
1 parent e81e063 commit 1b1c138
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gtests/ssl_gtest/test_io.h
Expand Up @@ -33,7 +33,7 @@ class PacketFilter {
CHANGE, // change the packet to a different value
DROP // drop the packet
};
explicit PacketFilter(bool enabled = true) : enabled_(enabled) {}
explicit PacketFilter(bool on = true) : enabled_(on) {}
virtual ~PacketFilter() {}

bool enabled() const { return enabled_; }
Expand Down
4 changes: 2 additions & 2 deletions gtests/ssl_gtest/tls_filter.h
Expand Up @@ -549,9 +549,9 @@ class SelectiveDropFilter : public PacketFilter {
class SelectiveRecordDropFilter : public TlsRecordFilter {
public:
SelectiveRecordDropFilter(const std::shared_ptr<TlsAgent>& a,
uint32_t pattern, bool enabled = true)
uint32_t pattern, bool on = true)
: TlsRecordFilter(a), pattern_(pattern), counter_(0) {
if (!enabled) {
if (!on) {
Disable();
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ssl/tls13con.c
Expand Up @@ -5542,7 +5542,7 @@ tls13_MaybeDo0RTTHandshake(sslSocket *ss)
}

PRInt32
tls13_Read0RttData(sslSocket *ss, void *buf, PRInt32 len)
tls13_Read0RttData(sslSocket *ss, PRUint8 *buf, PRInt32 len)
{
PORT_Assert(!PR_CLIST_IS_EMPTY(&ss->ssl3.hs.bufferedEarlyData));
PRInt32 offset = 0;
Expand Down
2 changes: 1 addition & 1 deletion lib/ssl/tls13con.h
Expand Up @@ -104,7 +104,7 @@ SECStatus tls13_ProtectRecord(sslSocket *ss,
const PRUint8 *pIn,
PRUint32 contentLen,
sslBuffer *wrBuf);
PRInt32 tls13_Read0RttData(sslSocket *ss, void *buf, PRInt32 len);
PRInt32 tls13_Read0RttData(sslSocket *ss, PRUint8 *buf, PRInt32 len);
SECStatus tls13_HandleEarlyApplicationData(sslSocket *ss, sslBuffer *origBuf);
PRBool tls13_ClientAllow0Rtt(const sslSocket *ss, const sslSessionID *sid);
PRUint16 tls13_EncodeDraftVersion(SSL3ProtocolVersion version,
Expand Down

0 comments on commit 1b1c138

Please sign in to comment.