Skip to content

Commit 9140bfb

Browse files
authored
Merge pull request adafruit#4049 from hierophect/sslsocket
Separate SSLSocket from Socket
2 parents a861498 + 66639b2 commit 9140bfb

File tree

15 files changed

+884
-374
lines changed

15 files changed

+884
-374
lines changed

locale/circuitpython.pot

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,10 @@ msgstr ""
629629
msgid "Cannot reset into bootloader because no bootloader is present."
630630
msgstr ""
631631

632+
#: ports/esp32s2/common-hal/socketpool/Socket.c
633+
msgid "Cannot set socket options"
634+
msgstr ""
635+
632636
#: shared-bindings/digitalio/DigitalInOut.c
633637
msgid "Cannot set value when direction is input."
634638
msgstr ""
@@ -865,7 +869,7 @@ msgstr ""
865869
msgid "Error in regex"
866870
msgstr ""
867871

868-
#: shared-bindings/socketpool/Socket.c
872+
#: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
869873
msgid "Error: Failure to bind"
870874
msgstr ""
871875

@@ -924,7 +928,7 @@ msgstr ""
924928
msgid "FFT is implemented for linear arrays only"
925929
msgstr ""
926930

927-
#: ports/esp32s2/common-hal/socketpool/Socket.c
931+
#: ports/esp32s2/common-hal/ssl/SSLSocket.c
928932
msgid "Failed SSL handshake"
929933
msgstr ""
930934

@@ -1295,18 +1299,14 @@ msgstr ""
12951299
msgid "Invalid size"
12961300
msgstr ""
12971301

1298-
#: ports/esp32s2/common-hal/socketpool/Socket.c
1302+
#: ports/esp32s2/common-hal/ssl/SSLContext.c
12991303
msgid "Invalid socket for TLS"
13001304
msgstr ""
13011305

13021306
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
13031307
msgid "Invalid state"
13041308
msgstr ""
13051309

1306-
#: ports/esp32s2/common-hal/socketpool/Socket.c
1307-
msgid "Invalid use of TLS Socket"
1308-
msgstr ""
1309-
13101310
#: shared-bindings/audiomixer/Mixer.c
13111311
msgid "Invalid voice"
13121312
msgstr ""
@@ -1323,10 +1323,6 @@ msgstr ""
13231323
msgid "Invalid word/bit length"
13241324
msgstr ""
13251325

1326-
#: ports/esp32s2/common-hal/socketpool/Socket.c
1327-
msgid "Issue setting SO_REUSEADDR"
1328-
msgstr ""
1329-
13301326
#: shared-bindings/aesio/aes.c
13311327
msgid "Key must be 16, 24, or 32 bytes long"
13321328
msgstr ""
@@ -1647,7 +1643,7 @@ msgstr ""
16471643
msgid "Out of memory"
16481644
msgstr ""
16491645

1650-
#: ports/esp32s2/common-hal/socketpool/Socket.c
1646+
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
16511647
msgid "Out of sockets"
16521648
msgstr ""
16531649

@@ -2167,7 +2163,7 @@ msgstr ""
21672163
msgid "Unexpected nrfx uuid type"
21682164
msgstr ""
21692165

2170-
#: ports/esp32s2/common-hal/socketpool/Socket.c
2166+
#: ports/esp32s2/common-hal/ssl/SSLSocket.c
21712167
#, c-format
21722168
msgid "Unhandled ESP TLS error %d %d %x %d"
21732169
msgstr ""
@@ -2466,7 +2462,7 @@ msgstr ""
24662462
msgid "buffer too small"
24672463
msgstr ""
24682464

2469-
#: shared-bindings/socketpool/Socket.c
2465+
#: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
24702466
msgid "buffer too small for requested bytes"
24712467
msgstr ""
24722468

0 commit comments

Comments
 (0)