Fix mixup with boolean/bitwise or for BSSL probing (#6252)

earlephilhower · web-flow · commit a0634a71a924 · 2019-07-04T09:14:50.000-07:00
Fix an error identified by -wextra where the size of the SSL extension
section in the probeMFLN call only.
diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
@@ -1500,7 +1500,7 @@ bool WiFiClientSecure::probeMaxFragmentLength(IPAddress ip, uint16_t port, uint1
 
   ret = probe.readBytes(extBytes, 2);
   handLen -= ret;
-  extLen = extBytes[1] || (extBytes[0]<<8);
+  extLen = extBytes[1] | (extBytes[0]<<8);
   if ((extLen == 0) || (ret != 2)) {
     return _SendAbort(probe, supportsLen);
   }

Original file line number	Diff line number	Diff line change
`@@ -1500,7 +1500,7 @@ bool WiFiClientSecure::probeMaxFragmentLength(IPAddress ip, uint16_t port, uint1`
`1500`	`1500`
`1501`	`1501`	`ret = probe.readBytes(extBytes, 2);`
`1502`	`1502`	`handLen -= ret;`
`1503`		`- extLen = extBytes[1] \|\| (extBytes[0]<<8);`
	`1503`	`+ extLen = extBytes[1] \| (extBytes[0]<<8);`
`1504`	`1504`	`if ((extLen == 0) \|\| (ret != 2)) {`
`1505`	`1505`	`return _SendAbort(probe, supportsLen);`
`1506`	`1506`	`}`