Skip to content

Commit 39b6d36

Browse files
earlephilhowerearlephilhower
authored
Merge branch 'master' into thunks
2 parents 0ebf6e6 + 678c7be commit 39b6d36

File tree

8 files changed

+295
-10
lines changed

8 files changed

+295
-10
lines changed

‎libraries/DNSServer/keywords.txt

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#######################################
2+
# Syntax Coloring Map For DNSServer
3+
#######################################
4+
5+
#######################################
6+
# Library (KEYWORD3)
7+
#######################################
8+
9+
DNSServer KEYWORD3 RESERVED_WORD
10+
11+
#######################################
12+
# Datatypes (KEYWORD1)
13+
#######################################
14+
15+
DNSReplyCode KEYWORD1 DATA_TYPE
16+
DNSHeader KEYWORD1 DATA_TYPE
17+
DNSServer KEYWORD1 DATA_TYPE
18+
19+
#######################################
20+
# Methods and Functions (KEYWORD2)
21+
#######################################
22+
23+
processNextRequest KEYWORD2
24+
setErrorReplyCode KEYWORD2
25+
setTTL KEYWORD2
26+
start KEYWORD2
27+
stop KEYWORD2
28+
29+
#######################################
30+
# Constants (LITERAL1)
31+
#######################################
32+
33+
DNS_QR_QUERY LITERAL1 RESERVED_WORD_2
34+
DNS_QR_RESPONSE LITERAL1 RESERVED_WORD_2
35+
DNS_OPCODE_QUERY LITERAL1 RESERVED_WORD_2
36+
NoError LITERAL1 RESERVED_WORD_2
37+
FormError LITERAL1 RESERVED_WORD_2
38+
ServerFailure LITERAL1 RESERVED_WORD_2
39+
NonExistentDomain LITERAL1 RESERVED_WORD_2
40+
NotImplemented LITERAL1 RESERVED_WORD_2
41+
Refused LITERAL1 RESERVED_WORD_2
42+
YXDomain LITERAL1 RESERVED_WORD_2
43+
YXRRSet LITERAL1 RESERVED_WORD_2
44+
NXRRSet LITERAL1 RESERVED_WORD_2

‎libraries/ESP8266AVRISP/keywords.txt

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#######################################
2+
# Syntax Coloring Map For ESP8266AVRISP
3+
#######################################
4+
5+
#######################################
6+
# Library (KEYWORD3)
7+
#######################################
8+
9+
ESP8266AVRISP KEYWORD3 RESERVED_WORD
10+
11+
#######################################
12+
# Datatypes (KEYWORD1)
13+
#######################################
14+
15+
AVRISPState_t KEYWORD1 DATA_TYPE
16+
AVRISP_parameter_t KEYWORD1 DATA_TYPE
17+
ESP8266AVRISP KEYWORD1 DATA_TYPE
18+
19+
#######################################
20+
# Methods and Functions (KEYWORD2)
21+
#######################################
22+
23+
begin KEYWORD2
24+
setSpiFrequency KEYWORD2
25+
setReset KEYWORD2
26+
update KEYWORD2
27+
serve KEYWORD2
28+
29+
#######################################
30+
# Constants (LITERAL1)
31+
#######################################
32+
33+
AVRISP_STATE_IDLE LITERAL1 RESERVED_WORD_2
34+
AVRISP_STATE_PENDING LITERAL1 RESERVED_WORD_2
35+
AVRISP_STATE_ACTIVE LITERAL1 RESERVED_WORD_2

‎libraries/ESP8266HTTPClient/keywords.txt

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
#######################################
2+
# Syntax Coloring Map For ESP8266HTTPClient
3+
#######################################
4+
5+
#######################################
6+
# Library (KEYWORD3)
7+
#######################################
8+
9+
ESP8266HTTPClient KEYWORD3 RESERVED_WORD
10+
11+
#######################################
12+
# Datatypes (KEYWORD1)
13+
#######################################
14+
15+
t_http_codes KEYWORD1 DATA_TYPE
16+
transferEncoding_t KEYWORD1 DATA_TYPE
17+
TransportTraits KEYWORD1 DATA_TYPE
18+
TransportTraitsPtr KEYWORD1 DATA_TYPE
19+
StreamString KEYWORD1 DATA_TYPE
20+
HTTPClient KEYWORD1 DATA_TYPE
21+
22+
#######################################
23+
# Methods and Functions (KEYWORD2)
24+
#######################################
25+
26+
begin KEYWORD2
27+
end KEYWORD2
28+
connected KEYWORD2
29+
setReuse KEYWORD2
30+
setUserAgent KEYWORD2
31+
setAuthorization KEYWORD2
32+
setTimeout KEYWORD2
33+
useHTTP10 KEYWORD2
34+
GET KEYWORD2
35+
POST KEYWORD2
36+
PUT KEYWORD2
37+
PATCH KEYWORD2
38+
sendRequest KEYWORD2
39+
addHeader KEYWORD2
40+
collectHeaders KEYWORD2
41+
header KEYWORD2
42+
headerName KEYWORD2
43+
headers KEYWORD2
44+
hasHeader KEYWORD2
45+
getSize KEYWORD2
46+
getStream KEYWORD2
47+
getStreamPtr KEYWORD2
48+
writeToStream KEYWORD2
49+
getString KEYWORD2
50+
errorToString KEYWORD2
51+
52+
#######################################
53+
# Constants (LITERAL1)
54+
#######################################
55+
56+
HTTPCLIENT_DEFAULT_TCP_TIMEOUT LITERAL1 RESERVED_WORD_2
57+
HTTPC_ERROR_CONNECTION_REFUSED LITERAL1 RESERVED_WORD_2
58+
HTTPC_ERROR_SEND_HEADER_FAILED LITERAL1 RESERVED_WORD_2
59+
HTTPC_ERROR_SEND_PAYLOAD_FAILED LITERAL1 RESERVED_WORD_2
60+
HTTPC_ERROR_NOT_CONNECTED LITERAL1 RESERVED_WORD_2
61+
HTTPC_ERROR_CONNECTION_LOST LITERAL1 RESERVED_WORD_2
62+
HTTPC_ERROR_NO_STREAM LITERAL1 RESERVED_WORD_2
63+
HTTPC_ERROR_NO_HTTP_SERVER LITERAL1 RESERVED_WORD_2
64+
HTTPC_ERROR_TOO_LESS_RAM LITERAL1 RESERVED_WORD_2
65+
HTTPC_ERROR_ENCODING LITERAL1 RESERVED_WORD_2
66+
HTTPC_ERROR_STREAM_WRITE LITERAL1 RESERVED_WORD_2
67+
HTTPC_ERROR_READ_TIMEOUT LITERAL1 RESERVED_WORD_2
68+
HTTP_TCP_BUFFER_SIZE LITERAL1 RESERVED_WORD_2
69+
HTTP_CODE_CONTINUE LITERAL1 RESERVED_WORD_2
70+
HTTP_CODE_SWITCHING_PROTOCOLS LITERAL1 RESERVED_WORD_2
71+
HTTP_CODE_PROCESSING LITERAL1 RESERVED_WORD_2
72+
HTTP_CODE_OK LITERAL1 RESERVED_WORD_2
73+
HTTP_CODE_CREATED LITERAL1 RESERVED_WORD_2
74+
HTTP_CODE_ACCEPTED LITERAL1 RESERVED_WORD_2
75+
HTTP_CODE_NON_AUTHORITATIVE_INFORMATION LITERAL1 RESERVED_WORD_2
76+
HTTP_CODE_NO_CONTENT LITERAL1 RESERVED_WORD_2
77+
HTTP_CODE_RESET_CONTENT LITERAL1 RESERVED_WORD_2
78+
HTTP_CODE_PARTIAL_CONTENT LITERAL1 RESERVED_WORD_2
79+
HTTP_CODE_MULTI_STATUS LITERAL1 RESERVED_WORD_2
80+
HTTP_CODE_ALREADY_REPORTED LITERAL1 RESERVED_WORD_2
81+
HTTP_CODE_IM_USED LITERAL1 RESERVED_WORD_2
82+
HTTP_CODE_MULTIPLE_CHOICES LITERAL1 RESERVED_WORD_2
83+
HTTP_CODE_MOVED_PERMANENTLY LITERAL1 RESERVED_WORD_2
84+
HTTP_CODE_FOUND LITERAL1 RESERVED_WORD_2
85+
HTTP_CODE_SEE_OTHER LITERAL1 RESERVED_WORD_2
86+
HTTP_CODE_NOT_MODIFIED LITERAL1 RESERVED_WORD_2
87+
HTTP_CODE_USE_PROXY LITERAL1 RESERVED_WORD_2
88+
HTTP_CODE_TEMPORARY_REDIRECT LITERAL1 RESERVED_WORD_2
89+
HTTP_CODE_PERMANENT_REDIRECT LITERAL1 RESERVED_WORD_2
90+
HTTP_CODE_BAD_REQUEST LITERAL1 RESERVED_WORD_2
91+
HTTP_CODE_UNAUTHORIZED LITERAL1 RESERVED_WORD_2
92+
HTTP_CODE_PAYMENT_REQUIRED LITERAL1 RESERVED_WORD_2
93+
HTTP_CODE_FORBIDDEN LITERAL1 RESERVED_WORD_2
94+
HTTP_CODE_NOT_FOUND LITERAL1 RESERVED_WORD_2
95+
HTTP_CODE_METHOD_NOT_ALLOWED LITERAL1 RESERVED_WORD_2
96+
HTTP_CODE_NOT_ACCEPTABLE LITERAL1 RESERVED_WORD_2
97+
HTTP_CODE_PROXY_AUTHENTICATION_REQUIRED LITERAL1 RESERVED_WORD_2
98+
HTTP_CODE_REQUEST_TIMEOUT LITERAL1 RESERVED_WORD_2
99+
HTTP_CODE_CONFLICT LITERAL1 RESERVED_WORD_2
100+
HTTP_CODE_GONE LITERAL1 RESERVED_WORD_2
101+
HTTP_CODE_LENGTH_REQUIRED LITERAL1 RESERVED_WORD_2
102+
HTTP_CODE_PRECONDITION_FAILED LITERAL1 RESERVED_WORD_2
103+
HTTP_CODE_PAYLOAD_TOO_LARGE LITERAL1 RESERVED_WORD_2
104+
HTTP_CODE_URI_TOO_LONG LITERAL1 RESERVED_WORD_2
105+
HTTP_CODE_UNSUPPORTED_MEDIA_TYPE LITERAL1 RESERVED_WORD_2
106+
HTTP_CODE_RANGE_NOT_SATISFIABLE LITERAL1 RESERVED_WORD_2
107+
HTTP_CODE_EXPECTATION_FAILED LITERAL1 RESERVED_WORD_2
108+
HTTP_CODE_MISDIRECTED_REQUEST LITERAL1 RESERVED_WORD_2
109+
HTTP_CODE_UNPROCESSABLE_ENTITY LITERAL1 RESERVED_WORD_2
110+
HTTP_CODE_LOCKED LITERAL1 RESERVED_WORD_2
111+
HTTP_CODE_FAILED_DEPENDENCY LITERAL1 RESERVED_WORD_2
112+
HTTP_CODE_UPGRADE_REQUIRED LITERAL1 RESERVED_WORD_2
113+
HTTP_CODE_PRECONDITION_REQUIRED LITERAL1 RESERVED_WORD_2
114+
HTTP_CODE_TOO_MANY_REQUESTS LITERAL1 RESERVED_WORD_2
115+
HTTP_CODE_REQUEST_HEADER_FIELDS_TOO_LARGE LITERAL1 RESERVED_WORD_2
116+
HTTP_CODE_INTERNAL_SERVER_ERROR LITERAL1 RESERVED_WORD_2
117+
HTTP_CODE_NOT_IMPLEMENTED LITERAL1 RESERVED_WORD_2
118+
HTTP_CODE_BAD_GATEWAY LITERAL1 RESERVED_WORD_2
119+
HTTP_CODE_SERVICE_UNAVAILABLE LITERAL1 RESERVED_WORD_2
120+
HTTP_CODE_GATEWAY_TIMEOUT LITERAL1 RESERVED_WORD_2
121+
HTTP_CODE_HTTP_VERSION_NOT_SUPPORTED LITERAL1 RESERVED_WORD_2
122+
HTTP_CODE_VARIANT_ALSO_NEGOTIATES LITERAL1 RESERVED_WORD_2
123+
HTTP_CODE_INSUFFICIENT_STORAGE LITERAL1 RESERVED_WORD_2
124+
HTTP_CODE_LOOP_DETECTED LITERAL1 RESERVED_WORD_2
125+
HTTP_CODE_NOT_EXTENDED LITERAL1 RESERVED_WORD_2
126+
HTTP_CODE_NETWORK_AUTHENTICATION_REQUIRED LITERAL1 RESERVED_WORD_2
127+
HTTPC_TE_IDENTITY LITERAL1 RESERVED_WORD_2
128+
HTTPC_TE_CHUNKED LITERAL1 RESERVED_WORD_2

‎libraries/ESP8266WebServer/examples/SimpleAuthentification/SimpleAuthentification.ino renamed to ‎libraries/ESP8266WebServer/examples/SimpleAuthentication/SimpleAuthentication.ino

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ const char* password = "........";
88
ESP8266WebServer server(80);
99

1010
//Check if header is present and correct
11-
bool is_authentified() {
12-
Serial.println("Enter is_authentified");
11+
bool is_authenticated() {
12+
Serial.println("Enter is_authenticated");
1313
if (server.hasHeader("Cookie")) {
1414
Serial.print("Found cookie: ");
1515
String cookie = server.header("Cookie");
1616
Serial.println(cookie);
1717
if (cookie.indexOf("ESPSESSIONID=1") != -1) {
18-
Serial.println("Authentification Successful");
18+
Serial.println("Authentication Successful");
1919
return true;
2020
}
2121
}
22-
Serial.println("Authentification Failed");
22+
Serial.println("Authentication Failed");
2323
return false;
2424
}
2525

@@ -59,11 +59,11 @@ void handleLogin() {
5959
server.send(200, "text/html", content);
6060
}
6161

62-
//root page can be accessed only if authentification is ok
62+
//root page can be accessed only if authentication is ok
6363
void handleRoot() {
6464
Serial.println("Enter handleRoot");
6565
String header;
66-
if (!is_authentified()) {
66+
if (!is_authenticated()) {
6767
server.sendHeader("Location", "/login");
6868
server.sendHeader("Cache-Control", "no-cache");
6969
server.send(301);
@@ -77,7 +77,7 @@ void handleRoot() {
7777
server.send(200, "text/html", content);
7878
}
7979

80-
//no need authentification
80+
//no need authentication
8181
void handleNotFound() {
8282
String message = "File Not Found\n\n";
8383
message += "URI: ";
@@ -114,7 +114,7 @@ void setup(void) {
114114
server.on("/", handleRoot);
115115
server.on("/login", handleLogin);
116116
server.on("/inline", []() {
117-
server.send(200, "text/plain", "this works without need of authentification");
117+
server.send(200, "text/plain", "this works without need of authentication");
118118
});
119119

120120
server.onNotFound(handleNotFound);

‎libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

+14-2
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,18 @@ WiFiClientSecure::WiFiClientSecure() : WiFiClient() {
102102
_clear();
103103
_clearAuthenticationSettings();
104104
_certStore = nullptr; // Don't want to remove cert store on a clear, should be long lived
105+
_ensureStackAvailable();
106+
_local_bearssl_stack = _bearssl_stack;
107+
}
108+
109+
void WiFiClientSecure::_ensureStackAvailable() {
105110
if (!_bearssl_stack) {
106111
const int stacksize = 4500; // Empirically determined stack for EC and RSA connections
107112
_bearssl_stack = std::shared_ptr<uint8_t>(new uint8_t[stacksize], std::default_delete<uint8_t[]>());
108113
unsigned int *endOfStack = (unsigned int *)_bearssl_stack.get();
109114
endOfStack += (stacksize/4) - 1;
110115
SetThunkStackEnd(endOfStack);
111116
}
112-
_local_bearssl_stack = _bearssl_stack;
113117
}
114118

115119
WiFiClientSecure::~WiFiClientSecure() {
@@ -119,7 +123,11 @@ WiFiClientSecure::~WiFiClientSecure() {
119123
}
120124
free(_cipher_list);
121125
_freeSSL();
122-
_local_bearssl_stack = nullptr; // Potentially delete it if we're the last SSL object
126+
_local_bearssl_stack = nullptr;
127+
// If there are no other uses than the initial creation, free the stack
128+
if (_bearssl_stack.use_count() == 1) {
129+
_bearssl_stack = nullptr;
130+
}
123131
if (_deleteChainKeyTA) {
124132
delete _ta;
125133
delete _chain;
@@ -132,6 +140,8 @@ WiFiClientSecure::WiFiClientSecure(ClientContext* client,
132140
int iobuf_in_size, int iobuf_out_size, const BearSSLX509List *client_CA_ta) {
133141
_clear();
134142
_clearAuthenticationSettings();
143+
_ensureStackAvailable();
144+
_local_bearssl_stack = _bearssl_stack;
135145
_iobuf_in_size = iobuf_in_size;
136146
_iobuf_out_size = iobuf_out_size;
137147
_client = client;
@@ -149,6 +159,8 @@ WiFiClientSecure::WiFiClientSecure(ClientContext *client,
149159
int iobuf_in_size, int iobuf_out_size, const BearSSLX509List *client_CA_ta) {
150160
_clear();
151161
_clearAuthenticationSettings();
162+
_ensureStackAvailable();
163+
_local_bearssl_stack = _bearssl_stack;
152164
_iobuf_in_size = iobuf_in_size;
153165
_iobuf_out_size = iobuf_out_size;
154166
_client = client;

‎libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h

+1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ class WiFiClientSecure : public WiFiClient {
229229
private:
230230
// Single memory buffer used for BearSSL auxilliary stack, insead of growing main Arduino stack for all apps
231231
static std::shared_ptr<uint8_t> _bearssl_stack;
232+
void _ensureStackAvailable(); // Allocate the stack if necessary
232233
// The local copy, only used to enable a reference count
233234
std::shared_ptr<uint8_t> _local_bearssl_stack;
234235
};

‎libraries/ESP8266httpUpdate/keywords.txt

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#######################################
2+
# Syntax Coloring Map For ESP8266httpUpdate
3+
#######################################
4+
5+
#######################################
6+
# Library (KEYWORD3)
7+
#######################################
8+
9+
ESP8266httpUpdate KEYWORD3 RESERVED_WORD
10+
11+
#######################################
12+
# Datatypes (KEYWORD1)
13+
#######################################
14+
15+
HTTPUpdateResult KEYWORD1 DATA_TYPE
16+
ESPhttpUpdate KEYWORD1 DATA_TYPE
17+
18+
#######################################
19+
# Methods and Functions (KEYWORD2)
20+
#######################################
21+
22+
rebootOnUpdate KEYWORD2
23+
update KEYWORD2
24+
updateSpiffs KEYWORD2
25+
getLastError KEYWORD2
26+
getLastErrorString KEYWORD2
27+
28+
#######################################
29+
# Constants (LITERAL1)
30+
#######################################
31+
32+
HTTP_UE_TOO_LESS_SPACE LITERAL1 RESERVED_WORD_2
33+
HTTP_UE_SERVER_NOT_REPORT_SIZE LITERAL1 RESERVED_WORD_2
34+
HTTP_UE_SERVER_FILE_NOT_FOUND LITERAL1 RESERVED_WORD_2
35+
HTTP_UE_SERVER_FORBIDDEN LITERAL1 RESERVED_WORD_2
36+
HTTP_UE_SERVER_WRONG_HTTP_CODE LITERAL1 RESERVED_WORD_2
37+
HTTP_UE_SERVER_FAULTY_MD5 LITERAL1 RESERVED_WORD_2
38+
HTTP_UE_BIN_VERIFY_HEADER_FAILED LITERAL1 RESERVED_WORD_2
39+
HTTP_UE_BIN_FOR_WRONG_FLASH LITERAL1 RESERVED_WORD_2
40+
HTTP_UPDATE_FAILED LITERAL1 RESERVED_WORD_2
41+
HTTP_UPDATE_NO_UPDATES LITERAL1 RESERVED_WORD_2
42+
HTTP_UPDATE_OK LITERAL1 RESERVED_WORD_2

‎libraries/Hash/keywords.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#######################################
2+
# Syntax Coloring Map For Hash
3+
#######################################
4+
5+
#######################################
6+
# Library (KEYWORD3)
7+
#######################################
8+
9+
Hash KEYWORD3 RESERVED_WORD
10+
11+
#######################################
12+
# Datatypes (KEYWORD1)
13+
#######################################
14+
15+
#######################################
16+
# Methods and Functions (KEYWORD2)
17+
#######################################
18+
19+
sha1 KEYWORD2
20+
21+
#######################################
22+
# Constants (LITERAL1)
23+
#######################################

0 commit comments

Comments
 (0)