Skip to content
This repository was archived by the owner on Jan 29, 2023. It is now read-only.

Commit 4f7a8b4

Browse files
authored
v1.9.3 to add support to Seeeduino nRF52
### Releases v1.9.3 1. Add support to Seeeduino nRF52840-based boards such as **Seeed XIAO_NRF52840 and XIAO_NRF52840_SENSE**, etc. using Seeed `mbed` or `nRF52` core 2. Add astyle using `allman` style. Restyle the library 3. Display warning only when `_ETHERNET_WEBSERVER_LOGLEVEL_` > 3 4. Update examples 5. Update `Packages' Patches` to add Seeeduino `nRF52` core
1 parent df9514b commit 4f7a8b4

File tree

90 files changed

+19919
-17950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+19919
-17950
lines changed
Lines changed: 82 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,91 @@
11
/*
2-
* Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
3-
*
4-
* Permission is hereby granted, free of charge, to any person obtaining
5-
* a copy of this software and associated documentation files (the
6-
* "Software"), to deal in the Software without restriction, including
7-
* without limitation the rights to use, copy, modify, merge, publish,
8-
* distribute, sublicense, and/or sell copies of the Software, and to
9-
* permit persons to whom the Software is furnished to do so, subject to
10-
* the following conditions:
11-
*
12-
* The above copyright notice and this permission notice shall be
13-
* included in all copies or substantial portions of the Software.
14-
*
15-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17-
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
19-
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20-
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21-
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22-
* SOFTWARE.
23-
*/
2+
Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
19+
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
2424

2525
#include "inner.h"
2626

2727
/* see inner.h */
2828
void
2929
br_tls_phash(void *dst, size_t len,
30-
const br_hash_class *dig,
31-
const void *secret, size_t secret_len, const char *label,
32-
size_t seed_num, const br_tls_prf_seed_chunk *seed)
30+
const br_hash_class *dig,
31+
const void *secret, size_t secret_len, const char *label,
32+
size_t seed_num, const br_tls_prf_seed_chunk *seed)
3333
{
34-
unsigned char *buf;
35-
unsigned char tmp[64], a[64];
36-
br_hmac_key_context kc;
37-
br_hmac_context hc;
38-
size_t label_len, hlen, u;
39-
40-
if (len == 0) {
41-
return;
42-
}
43-
buf = dst;
44-
for (label_len = 0; label[label_len]; label_len ++);
45-
hlen = br_digest_size(dig);
46-
br_hmac_key_init(&kc, dig, secret, secret_len);
47-
br_hmac_init(&hc, &kc, 0);
48-
br_hmac_update(&hc, label, label_len);
49-
for (u = 0; u < seed_num; u ++) {
50-
br_hmac_update(&hc, seed[u].data, seed[u].len);
51-
}
52-
br_hmac_out(&hc, a);
53-
for (;;) {
54-
br_hmac_init(&hc, &kc, 0);
55-
br_hmac_update(&hc, a, hlen);
56-
br_hmac_update(&hc, label, label_len);
57-
for (u = 0; u < seed_num; u ++) {
58-
br_hmac_update(&hc, seed[u].data, seed[u].len);
59-
}
60-
br_hmac_out(&hc, tmp);
61-
for (u = 0; u < hlen && u < len; u ++) {
62-
buf[u] ^= tmp[u];
63-
}
64-
buf += u;
65-
len -= u;
66-
if (len == 0) {
67-
return;
68-
}
69-
br_hmac_init(&hc, &kc, 0);
70-
br_hmac_update(&hc, a, hlen);
71-
br_hmac_out(&hc, a);
72-
}
34+
unsigned char *buf;
35+
unsigned char tmp[64], a[64];
36+
br_hmac_key_context kc;
37+
br_hmac_context hc;
38+
size_t label_len, hlen, u;
39+
40+
if (len == 0)
41+
{
42+
return;
43+
}
44+
45+
buf = dst;
46+
47+
for (label_len = 0; label[label_len]; label_len ++);
48+
49+
hlen = br_digest_size(dig);
50+
br_hmac_key_init(&kc, dig, secret, secret_len);
51+
br_hmac_init(&hc, &kc, 0);
52+
br_hmac_update(&hc, label, label_len);
53+
54+
for (u = 0; u < seed_num; u ++)
55+
{
56+
br_hmac_update(&hc, seed[u].data, seed[u].len);
57+
}
58+
59+
br_hmac_out(&hc, a);
60+
61+
for (;;)
62+
{
63+
br_hmac_init(&hc, &kc, 0);
64+
br_hmac_update(&hc, a, hlen);
65+
br_hmac_update(&hc, label, label_len);
66+
67+
for (u = 0; u < seed_num; u ++)
68+
{
69+
br_hmac_update(&hc, seed[u].data, seed[u].len);
70+
}
71+
72+
br_hmac_out(&hc, tmp);
73+
74+
for (u = 0; u < hlen && u < len; u ++)
75+
{
76+
buf[u] ^= tmp[u];
77+
}
78+
79+
buf += u;
80+
len -= u;
81+
82+
if (len == 0)
83+
{
84+
return;
85+
}
86+
87+
br_hmac_init(&hc, &kc, 0);
88+
br_hmac_update(&hc, a, hlen);
89+
br_hmac_out(&hc, a);
90+
}
7391
}
Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
/*
2-
* Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
3-
*
4-
* Permission is hereby granted, free of charge, to any person obtaining
5-
* a copy of this software and associated documentation files (the
6-
* "Software"), to deal in the Software without restriction, including
7-
* without limitation the rights to use, copy, modify, merge, publish,
8-
* distribute, sublicense, and/or sell copies of the Software, and to
9-
* permit persons to whom the Software is furnished to do so, subject to
10-
* the following conditions:
11-
*
12-
* The above copyright notice and this permission notice shall be
13-
* included in all copies or substantial portions of the Software.
14-
*
15-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17-
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
19-
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20-
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21-
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22-
* SOFTWARE.
23-
*/
2+
Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
19+
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
2424

2525
#include "inner.h"
2626

2727
/* see bearssl.h */
2828
void
2929
br_tls10_prf(void *dst, size_t len,
30-
const void *secret, size_t secret_len, const char *label,
31-
size_t seed_num, const br_tls_prf_seed_chunk *seed)
30+
const void *secret, size_t secret_len, const char *label,
31+
size_t seed_num, const br_tls_prf_seed_chunk *seed)
3232
{
33-
const unsigned char *s1;
34-
size_t slen;
33+
const unsigned char *s1;
34+
size_t slen;
3535

36-
s1 = secret;
37-
slen = (secret_len + 1) >> 1;
38-
memset(dst, 0, len);
39-
br_tls_phash(dst, len, &br_md5_vtable,
40-
s1, slen, label, seed_num, seed);
41-
br_tls_phash(dst, len, &br_sha1_vtable,
42-
s1 + secret_len - slen, slen, label, seed_num, seed);
36+
s1 = secret;
37+
slen = (secret_len + 1) >> 1;
38+
memset(dst, 0, len);
39+
br_tls_phash(dst, len, &br_md5_vtable,
40+
s1, slen, label, seed_num, seed);
41+
br_tls_phash(dst, len, &br_sha1_vtable,
42+
s1 + secret_len - slen, slen, label, seed_num, seed);
4343
}
Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
/*
2-
* Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
3-
*
4-
* Permission is hereby granted, free of charge, to any person obtaining
5-
* a copy of this software and associated documentation files (the
6-
* "Software"), to deal in the Software without restriction, including
7-
* without limitation the rights to use, copy, modify, merge, publish,
8-
* distribute, sublicense, and/or sell copies of the Software, and to
9-
* permit persons to whom the Software is furnished to do so, subject to
10-
* the following conditions:
11-
*
12-
* The above copyright notice and this permission notice shall be
13-
* included in all copies or substantial portions of the Software.
14-
*
15-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17-
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
19-
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20-
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21-
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22-
* SOFTWARE.
23-
*/
2+
Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
19+
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
2424

2525
#include "inner.h"
2626

2727
/* see bearssl.h */
2828
void
2929
br_tls12_sha256_prf(void *dst, size_t len,
30-
const void *secret, size_t secret_len, const char *label,
31-
size_t seed_num, const br_tls_prf_seed_chunk *seed)
30+
const void *secret, size_t secret_len, const char *label,
31+
size_t seed_num, const br_tls_prf_seed_chunk *seed)
3232
{
33-
memset(dst, 0, len);
34-
br_tls_phash(dst, len, &br_sha256_vtable,
35-
secret, secret_len, label, seed_num, seed);
33+
memset(dst, 0, len);
34+
br_tls_phash(dst, len, &br_sha256_vtable,
35+
secret, secret_len, label, seed_num, seed);
3636
}
Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
/*
2-
* Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
3-
*
4-
* Permission is hereby granted, free of charge, to any person obtaining
5-
* a copy of this software and associated documentation files (the
6-
* "Software"), to deal in the Software without restriction, including
7-
* without limitation the rights to use, copy, modify, merge, publish,
8-
* distribute, sublicense, and/or sell copies of the Software, and to
9-
* permit persons to whom the Software is furnished to do so, subject to
10-
* the following conditions:
11-
*
12-
* The above copyright notice and this permission notice shall be
13-
* included in all copies or substantial portions of the Software.
14-
*
15-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17-
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
19-
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20-
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21-
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22-
* SOFTWARE.
23-
*/
2+
Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
19+
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
20+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+
*/
2424

2525
#include "inner.h"
2626

2727
/* see bearssl.h */
2828
void
2929
br_tls12_sha384_prf(void *dst, size_t len,
30-
const void *secret, size_t secret_len, const char *label,
31-
size_t seed_num, const br_tls_prf_seed_chunk *seed)
30+
const void *secret, size_t secret_len, const char *label,
31+
size_t seed_num, const br_tls_prf_seed_chunk *seed)
3232
{
33-
memset(dst, 0, len);
34-
br_tls_phash(dst, len, &br_sha384_vtable,
35-
secret, secret_len, label, seed_num, seed);
33+
memset(dst, 0, len);
34+
br_tls_phash(dst, len, &br_sha384_vtable,
35+
secret, secret_len, label, seed_num, seed);
3636
}

0 commit comments

Comments
 (0)