arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-18 23:03:34 +03:00
Code Activity

Stream::Send fixes: doc + StreamConstPtr byte-by-byte + missing SSL availableForWrite (#7935)

Browse Source 
* StreamConstPtr: fix doc + reading flash space byte-by-byte
* add missing availableForWrite wrapper in wificlient-ssl
* WiFiClientSecure-ctx: add missing availableForWrite()
This commit is contained in:
david gauchard
2021-03-25 16:00:41 +01:00
committed by GitHub
parent 0a4fcdf090
commit c1118dfce3
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
View File

@ -263,6 +263,27 @@ uint8_t WiFiClientSecureCtx::connected() {
return false;
}
int WiFiClientSecureCtx::availableForWrite () {
// code taken from ::_write()
if (!connected() || !_handshake_done) {
return 0;
}
// Get BearSSL to a state where we can send
if (_run_until(BR_SSL_SENDAPP) < 0) {
return 0;
}
if (br_ssl_engine_current_state(_eng) & BR_SSL_SENDAPP) {
size_t sendapp_len;
(void)br_ssl_engine_sendapp_buf(_eng, &sendapp_len);
// We want to call br_ssl_engine_sendapp_ack(0) but 0 is forbidden (bssl doc).
// After checking br_ssl_engine_sendapp_buf() src code,
// it seems that it is OK to not call ack when the buffer is left untouched.
//forbidden: br_ssl_engine_sendapp_ack(_eng, 0);
return (int)sendapp_len;
}
return 0;
}
size_t WiFiClientSecureCtx::_write(const uint8_t *buf, size_t size, bool pmem) {
size_t sent_bytes = 0;

3
libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h
View File

@ -58,6 +58,8 @@ class WiFiClientSecureCtx : public WiFiClient {
void flush() override { (void)flush(0); }
void stop() override { (void)stop(0); }
int availableForWrite() override;
// Allow sessions to be saved/restored automatically to a memory area
void setSession(Session *session) { _session = session; }
@ -249,6 +251,7 @@ class WiFiClientSecure : public WiFiClient {
size_t write(Stream& stream) /* Note this is not virtual */ { return _ctx->write(stream); }
int read(uint8_t *buf, size_t size) override { return _ctx->read(buf, size); }
int available() override { return _ctx->available(); }
int availableForWrite() override { return _ctx->availableForWrite(); }
int read() override { return _ctx->read(); }
int peek() override { return _ctx->peek(); }
size_t peekBytes(uint8_t *buffer, size_t length) override { return _ctx->peekBytes(buffer, length); }