Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 271c54b

Browse files
author
iwahdan88
committed
Amended more MBEDTLS error codes to MicroPython
1 parent d41b229 commit 271c54b

File tree

3 files changed

+161
-0
lines changed

3 files changed

+161
-0
lines changed

‎esp32/mp_pycom_err.h

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#define ESP32_MP_PYCOM_ERR_H_
1010

1111
#include "mbedtls/net_sockets.h"
12+
#include "mbedtls/ssl.h"
1213
#include "lwip/err.h"
1314
#include "lwip/netdb.h"
1415
#include "esp_err.h"
@@ -68,4 +69,58 @@
6869
#define MP_NO_RECOVERY NO_RECOVERY
6970
#define MP_TRY_AGAIN TRY_AGAIN
7071

72+
#define MP_MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE /* < The requested feature is not available. */
73+
#define MP_MBEDTLS_ERR_SSL_BAD_INPUT_DATA MBEDTLS_ERR_SSL_BAD_INPUT_DATA /* < Bad input parameters to function. */
74+
#define MP_MBEDTLS_ERR_SSL_INVALID_MAC MBEDTLS_ERR_SSL_INVALID_MAC /* < Verification of the message MAC failed. */
75+
#define MP_MBEDTLS_ERR_SSL_INVALID_RECORD MBEDTLS_ERR_SSL_INVALID_RECORD /* < An invalid SSL record was received. */
76+
#define MP_MBEDTLS_ERR_SSL_CONN_EOF MBEDTLS_ERR_SSL_CONN_EOF /* < The connection indicated an EOF. */
77+
#define MP_MBEDTLS_ERR_SSL_UNKNOWN_CIPHER MBEDTLS_ERR_SSL_UNKNOWN_CIPHER /* < An unknown cipher was received. */
78+
#define MP_MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN /* < The server has no ciphersuites in common with the client. */
79+
#define MP_MBEDTLS_ERR_SSL_NO_RNG MBEDTLS_ERR_SSL_NO_RNG /* < No RNG was provided to the SSL module. */
80+
#define MP_MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE /* < No client certification received from the client, but required by the authentication mode. */
81+
#define MP_MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE /* < Our own certificate(s) is/are too large to send in an SSL message. */
82+
#define MP_MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED /* < The own certificate is not set, but needed by the server. */
83+
#define MP_MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED /* < The own private key or pre-shared key is not set, but needed. */
84+
#define MP_MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED /* < No CA Chain is set, but required to operate. */
85+
#define MP_MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE /* < An unexpected message was received from our peer. */
86+
#define MP_MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE /* < A fatal alert message was received from our peer. */
87+
#define MP_MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED /* < Verification of our peer failed. */
88+
#define MP_MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY /* < The peer notified us that the connection is going to be closed. */
89+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO /* < Processing of the ClientHello handshake message failed. */
90+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO /* < Processing of the ServerHello handshake message failed. */
91+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE /* < Processing of the Certificate handshake message failed. */
92+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST /* < Processing of the CertificateRequest handshake message failed. */
93+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE /* < Processing of the ServerKeyExchange handshake message failed. */
94+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE /* < Processing of the ServerHelloDone handshake message failed. */
95+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE /* < Processing of the ClientKeyExchange handshake message failed. */
96+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP /* < Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Read Public. */
97+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS /* < Processing of the ClientKeyExchange handshake message failed in DHM / ECDH Calculate Secret. */
98+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY /* < Processing of the CertificateVerify handshake message failed. */
99+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC /* < Processing of the ChangeCipherSpec handshake message failed. */
100+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_FINISHED MBEDTLS_ERR_SSL_BAD_HS_FINISHED /* < Processing of the Finished handshake message failed. */
101+
#define MP_MBEDTLS_ERR_SSL_ALLOC_FAILED MBEDTLS_ERR_SSL_ALLOC_FAILED /* < Memory allocation failed */
102+
#define MP_MBEDTLS_ERR_SSL_HW_ACCEL_FAILED MBEDTLS_ERR_SSL_HW_ACCEL_FAILED /* < Hardware acceleration function returned with error */
103+
#define MP_MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH /* < Hardware acceleration function skipped / left alone data */
104+
#define MP_MBEDTLS_ERR_SSL_COMPRESSION_FAILED MBEDTLS_ERR_SSL_COMPRESSION_FAILED /* < Processing of the compression / decompression failed */
105+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION /* < Handshake protocol not within min/max boundaries */
106+
#define MP_MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET /* < Processing of the NewSessionTicket handshake message failed. */
107+
#define MP_MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED /* < Session ticket has expired. */
108+
#define MP_MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH /* < Public key type mismatch (eg, asked for RSA key exchange and presented EC key) */
109+
#define MP_MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY /* < Unknown identity received (eg, PSK identity) */
110+
#define MP_MBEDTLS_ERR_SSL_INTERNAL_ERROR MBEDTLS_ERR_SSL_INTERNAL_ERROR /* < Internal error (eg, unexpected failure in lower-level module) */
111+
#define MP_MBEDTLS_ERR_SSL_COUNTER_WRAPPING MBEDTLS_ERR_SSL_COUNTER_WRAPPING /* < A counter would wrap (eg, too many messages exchanged). */
112+
#define MP_MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO /* < Unexpected message at ServerHello in renegotiation. */
113+
#define MP_MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED /* < DTLS client must retry for hello verification */
114+
#define MP_MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL /* < A buffer is too small to receive or write a message */
115+
#define MP_MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE /* < None of the common ciphersuites is usable (eg, no suitable certificate, see debug messages). */
116+
#define MP_MBEDTLS_ERR_SSL_WANT_READ MBEDTLS_ERR_SSL_WANT_READ /* < No data of requested type currently available on underlying transport. */
117+
#define MP_MBEDTLS_ERR_SSL_WANT_WRITE MBEDTLS_ERR_SSL_WANT_WRITE /* < Connection requires a write call. */
118+
#define MP_MBEDTLS_ERR_SSL_TIMEOUT MBEDTLS_ERR_SSL_TIMEOUT /* < The operation timed out. */
119+
#define MP_MBEDTLS_ERR_SSL_CLIENT_RECONNECT MBEDTLS_ERR_SSL_CLIENT_RECONNECT /* < The client initiated a reconnect from the same port. */
120+
#define MP_MBEDTLS_ERR_SSL_UNEXPECTED_RECORD MBEDTLS_ERR_SSL_UNEXPECTED_RECORD /* < Record header looks valid but is not expected. */
121+
#define MP_MBEDTLS_ERR_SSL_NON_FATAL MBEDTLS_ERR_SSL_NON_FATAL /* < The alert message received indicates a non-fatal error. */
122+
#define MP_MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH /* < Couldn't set the hash for verifying CertificateVerify */
123+
#define MP_MBEDTLS_ERR_SSL_CONTINUE_PROCESSING MBEDTLS_ERR_SSL_CONTINUE_PROCESSING /* < Internal-only message signaling that further message-processing should be done */
124+
#define MP_MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS /* < The asynchronous operation is not completed yet. */
125+
71126
#endif /* ESP32_MP_PYCOM_ERR_H_ */

‎esp32/mpconfigport.h

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,59 @@ extern const struct _mp_obj_module_t mp_module_uqueue;
344344
X(NO_DATA) \
345345
X(NO_RECOVERY) \
346346
X(TRY_AGAIN) \
347+
X(MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE) \
348+
X(MBEDTLS_ERR_SSL_BAD_INPUT_DATA) \
349+
X(MBEDTLS_ERR_SSL_INVALID_MAC) \
350+
X(MBEDTLS_ERR_SSL_INVALID_RECORD) \
351+
X(MBEDTLS_ERR_SSL_CONN_EOF) \
352+
X(MBEDTLS_ERR_SSL_UNKNOWN_CIPHER) \
353+
X(MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN) \
354+
X(MBEDTLS_ERR_SSL_NO_RNG) \
355+
X(MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE) \
356+
X(MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE) \
357+
X(MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED) \
358+
X(MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED) \
359+
X(MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED) \
360+
X(MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE) \
361+
X(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE) \
362+
X(MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED) \
363+
X(MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) \
364+
X(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO) \
365+
X(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO) \
366+
X(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE) \
367+
X(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST) \
368+
X(MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE) \
369+
X(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE) \
370+
X(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE) \
371+
X(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP) \
372+
X(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS) \
373+
X(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY) \
374+
X(MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC) \
375+
X(MBEDTLS_ERR_SSL_BAD_HS_FINISHED) \
376+
X(MBEDTLS_ERR_SSL_ALLOC_FAILED) \
377+
X(MBEDTLS_ERR_SSL_HW_ACCEL_FAILED) \
378+
X(MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH) \
379+
X(MBEDTLS_ERR_SSL_COMPRESSION_FAILED) \
380+
X(MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION) \
381+
X(MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET) \
382+
X(MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED) \
383+
X(MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH) \
384+
X(MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY) \
385+
X(MBEDTLS_ERR_SSL_INTERNAL_ERROR) \
386+
X(MBEDTLS_ERR_SSL_COUNTER_WRAPPING) \
387+
X(MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO) \
388+
X(MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED) \
389+
X(MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL) \
390+
X(MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE) \
391+
X(MBEDTLS_ERR_SSL_WANT_READ) \
392+
X(MBEDTLS_ERR_SSL_WANT_WRITE) \
393+
X(MBEDTLS_ERR_SSL_TIMEOUT) \
394+
X(MBEDTLS_ERR_SSL_CLIENT_RECONNECT) \
395+
X(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD) \
396+
X(MBEDTLS_ERR_SSL_NON_FATAL) \
397+
X(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH) \
398+
X(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING) \
399+
X(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS) \
347400

348401
#include "mpconfigboard.h"
349402

‎esp32/qstrdefsport.h

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,56 @@ Q(HOST_NOT_FOUND)
6262
Q(NO_DATA)
6363
Q(NO_RECOVERY)
6464
Q(TRY_AGAIN)
65+
Q(MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE)
66+
Q(MBEDTLS_ERR_SSL_BAD_INPUT_DATA)
67+
Q(MBEDTLS_ERR_SSL_INVALID_MAC)
68+
Q(MBEDTLS_ERR_SSL_INVALID_RECORD)
69+
Q(MBEDTLS_ERR_SSL_CONN_EOF)
70+
Q(MBEDTLS_ERR_SSL_UNKNOWN_CIPHER)
71+
Q(MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN)
72+
Q(MBEDTLS_ERR_SSL_NO_RNG)
73+
Q(MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE)
74+
Q(MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE)
75+
Q(MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED)
76+
Q(MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED)
77+
Q(MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED)
78+
Q(MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE)
79+
Q(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)
80+
Q(MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED)
81+
Q(MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)
82+
Q(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO)
83+
Q(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO)
84+
Q(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE)
85+
Q(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST)
86+
Q(MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE)
87+
Q(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE)
88+
Q(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE)
89+
Q(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP)
90+
Q(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS)
91+
Q(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY)
92+
Q(MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC)
93+
Q(MBEDTLS_ERR_SSL_BAD_HS_FINISHED)
94+
Q(MBEDTLS_ERR_SSL_ALLOC_FAILED)
95+
Q(MBEDTLS_ERR_SSL_HW_ACCEL_FAILED)
96+
Q(MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH)
97+
Q(MBEDTLS_ERR_SSL_COMPRESSION_FAILED)
98+
Q(MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION)
99+
Q(MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET)
100+
Q(MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED)
101+
Q(MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH)
102+
Q(MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY)
103+
Q(MBEDTLS_ERR_SSL_INTERNAL_ERROR)
104+
Q(MBEDTLS_ERR_SSL_COUNTER_WRAPPING)
105+
Q(MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO)
106+
Q(MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED)
107+
Q(MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL)
108+
Q(MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE)
109+
Q(MBEDTLS_ERR_SSL_WANT_READ)
110+
Q(MBEDTLS_ERR_SSL_WANT_WRITE)
111+
Q(MBEDTLS_ERR_SSL_TIMEOUT)
112+
Q(MBEDTLS_ERR_SSL_CLIENT_RECONNECT)
113+
Q(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD)
114+
Q(MBEDTLS_ERR_SSL_NON_FATAL)
115+
Q(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH)
116+
Q(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING)
117+
Q(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS)

0 commit comments

Comments
 (0)